From 61f53108b93e2bd6428525cde8845e84495ca4ce Mon Sep 17 00:00:00 2001
From: BoBoooooo <17746714@qq.com>
Date: Wed, 31 Oct 2018 22:19:53 +0800
Subject: [PATCH] .

---
 src/App.vue                       |  2 +
 src/views/Archive/person.vue      |  2 +-
 src/views/login/index.vue         | 11 +++--
 src/views/system/formdesigner.vue | 81 +++++++++++++++++++++++++++++--
 4 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e7079da..7a58ed3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,3 +23,5 @@ export default {
 }
 
 </style>
+
+
diff --git a/src/views/Archive/person.vue b/src/views/Archive/person.vue
index 7ed3ffe..5b44841 100644
--- a/src/views/Archive/person.vue
+++ b/src/views/Archive/person.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" id="person">
 
-<el-button @click="test()"></el-button>
+<el-button @click="test()">测试保存表单</el-button>
 
 <generate-form
     :data="jsonData"
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3576068..52fdb38 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -32,6 +32,7 @@
       </el-form-item>
     </el-form>
   </div>
+
 </template>
 
 <script>
@@ -46,8 +47,10 @@ export default {
       pwdType: 'password',
 
       loading: false
-    };
+    }
   },
+
+  
   methods: {
        showPwd() {
       if (this.pwdType === 'password') {
@@ -114,12 +117,14 @@ $light_gray:white;
 $bg:#2d3a4b;
 $dark_gray:#fff;
 $light_gray:#fff;
+
+
 .login-container {
   position: fixed;
   height: 100%;
   width: 100%;
-      background: url('~@/assets/loginbg.jpg') center center no-repeat;
-background-size:100% 100%;
+  background: url('~@/assets/loginbg.jpg') center center no-repeat;
+  background-size:100% 100%;
   // background-color: $bg;
   .login-form {
     position: absolute;
diff --git a/src/views/system/formdesigner.vue b/src/views/system/formdesigner.vue
index bc98576..a98ed6d 100644
--- a/src/views/system/formdesigner.vue
+++ b/src/views/system/formdesigner.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container" ref="container" id="formdesigner">
-<making-form preview generate-json ref="form" >
+<making-form preview generate-json ref="form">
     <template slot="action">
       <el-button @click="test">保存</el-button>
     </template>
@@ -18,11 +18,84 @@ export default {
 
     }
   },
+  mounted(){
+
+    let obj = {
+  "list": [
+    {
+      "type": "input",
+      "name": "单行文本",
+      "icon": "regular/keyboard",
+      "options": {
+        "width": "100%",
+        "defaultValue": "",
+        "required": false,
+        "dataType": "string",
+        "pattern": "",
+        "placeholder": "",
+        "remoteFunc": "func_1540898325000_60519"
+      },
+      "key": "1540898325000_60519",
+      "model": "input_1540898325000_60519",
+      "rules": [
+        {
+          "type": "string",
+          "message": "单行文本格式不正确"
+        }
+      ]
+    },
+    {
+      "type": "textarea",
+      "name": "多行文本",
+      "icon": "regular/keyboard",
+      "options": {
+        "width": "100%",
+        "defaultValue": "",
+        "required": false,
+        "pattern": "",
+        "placeholder": "",
+        "remoteFunc": "func_1540898327000_70367"
+      },
+      "key": "1540898327000_70367",
+      "model": "textarea_1540898327000_70367",
+      "rules": []
+    },
+    {
+      "type": "time",
+      "name": "时间选择器",
+      "icon": "regular/clock",
+      "options": {
+        "defaultValue": "",
+        "readonly": false,
+        "disabled": false,
+        "editable": true,
+        "clearable": true,
+        "placeholder": "",
+        "startPlaceholder": "",
+        "endPlaceholder": "",
+        "isRange": false,
+        "arrowControl": true,
+        "format": "HH:mm:ss",
+        "required": false,
+        "width": "",
+        "remoteFunc": "func_1540898328000_61326"
+      },
+      "key": "1540898328000_61326",
+      "model": "time_1540898328000_61326",
+      "rules": []
+    }
+  ],
+  "config": {
+    "labelWidth": 100,
+    "labelPosition": "left",
+    "size": "small"
+  }
+}
+    this.$refs.form.setJSON(obj)
+  },
   methods:{
       test(){
-        this.$refs.form.getJSON().then(data=>{
-            console.log(data)
-        })
+       console.log(this.$refs.form.getJSON())
       }
   },
   components:{