Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

pages/account/login/index.vue

@@ -31,8 +31,8 @@
           </div>
           <h3 class="mb20">用户登陆</h3>
           <Login @on-submit="handleSubmit">
-            <UserName name="username" value="13211111111" />
-            <Password name="password" value="1" enter-to-submit />
+            <UserName name="username" value="" />
+            <Password name="password" value="" enter-to-submit />
             <div class="page-account-auto-login mb20">
               <Checkbox v-model="autoLogin">{{ $t('page.login.remember') }}</Checkbox>
               <a href>{{ $t('page.login.forgot') }}</a>

pages/test/view/index.vue

 <template>
-    <div class="flex view">
-        <div class="item">
-            aaa
+  <div class="flex">
+    <div class="fg1">
+      <Form ref="form" :model="entity" :rules="rules" :label-width="110">
+        <Row class="view">
+          <Col :span="12" class="item" v-for="(li,i) in items" :key="i" v-dragging="{ item: li, list: items}">
+            <FormItem :label="li.key" :prop="li.key">
+              <component :is="li.control" :value="entity[li.key]" />
+            </FormItem>
+          </Col>
+        </Row>
+        <div>
+          {{
+          entity
+          }}
+          <Button type="primary" @click="con">conso</Button>
         </div>
+      </Form>
     </div>
-</template>
+    <div v-width="25">
+        <ul>
+            <li>
+                名称
+                控件
+                显示
 
+            </li>
+        </ul>
+    </div>
+  </div>
+</template>
 <script>
-    export default {
-        name: '',
-        data() {
-            return {
-                items:[]
-            }
-        },
-        methods:{
-            init(){
-                var items=[];
-                for (let i = 0; i <30; i++) {
-                    items.push({
-                        key:"I"+i,
-                        name:"Item"+v,
-                        width:4,
-                        height:1
-                    })
-                    
-                }
-            }
-        }
+export default {
+  name: "",
+  data() {
+    return {
+      items: [],
+      entity: {},
+      rules: null
+    };
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    con() {
+      console.warn("entity", this.entity);
+    },
+    init() {
+      let items = [];
+      let controls = ["Input", "InputNumber", "Dictionary", "DatePicker"];
+      for (let i = 0; i < 5; i++) {
+        this.entity["I" + i] = i;
+        items.push({
+          key: "I" + i,
+          name: "Item" + i,
+          width: 4,
+          control: controls[i % 4],
+          height: 1
+        });
+      }
+      this.items = items;
     }
+  }
+};
 </script>
 
 <style lang="less" >
-    @line-height:40px;
-    @item-width:12.5%;
-    .view{
-        
-    }
+@line-height: 40px;
+@item-width: 12.5%;
+.view {
+  margin: 30px;
+  border: 1px solid #ddd;
+  line-height: @line-height;
+  background-color: white;
+  .item {
+    border-right: 1px solid #ddd;
+    border-top: 1px solid #ddd;
+    margin-right: -1px;
+    margin-top: -1px;
+    border-bottom: 1px solid #ddd;
+    text-align: center;
+    box-sizing: border-box;
+  }
+}
 </style>
\ No newline at end of file