修复 #47和验证字段问题

Author: GavinZhuLei

dist/FormMaking.common.js

@@ -1,7 +1,7 @@
 {
   "name": "form-making",
   "description": "基于Vue,ElementUI开发的一款表单设计器，提高表单开发效率的利器，让开发者从枯燥的表单代码编写中解放出来",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "author": "GavinZhulei",
   "license": "MIT",
   "keywords": [
@@ -53,6 +53,7 @@
     "rollup-plugin-uglify-es": "0.0.1",
     "rollup-plugin-vue": "^3.0.0",
     "sass-loader": "^7.0.1",
+    "terser-webpack-plugin": "^1.2.4",
     "uglifyjs-webpack-plugin": "^2.0.1",
     "vue-template-compiler": "^2.6.5"
   },

dist/FormMaking.umd.js

@@ -5,6 +5,7 @@
       <div class="fm-title" @click="handleHome">表单设计器</div>
 
       <div class="fm-link">
+        <a target="_blank" href="https://www.yuque.com/zhulei-sbpfz/ua9nar">开始使用</a>
         <a target="_blank" href="#/price">商业授权</a>
         <a href="https://github.com/GavinZhuLei/vue-form-making">GitHub</a>
         <a href="https://gitee.com/gavinzhulei/vue-form-making">码云</a>

dist/FormMaking.umd.min.js

@@ -415,20 +415,9 @@ export default {
         }
         
       }
-    }
-  },
-  watch: {
-    'data.options.isRange': function(val) {
-      if (typeof val !== 'undefined') {
-        if (val) {
-          this.data.options.defaultValue = null
-        } else {
-          if (Object.keys(this.data.options).indexOf('defaultValue')>=0) 
-            this.data.options.defaultValue = ''
-        }
-      }
     },
-    'data.options.required': function(val) {
+
+    validateRequired (val) {
       if (val) {
         this.validator.required = {required: true, message: `${this.data.name}必须填写`}
       } else {
@@ -439,7 +428,8 @@ export default {
         this.generateRule()
       })
     },
-    'data.options.dataType': function (val) {
+
+    validateDataType (val) {
       if (!this.show) {
         return false
       }
@@ -452,7 +442,7 @@ export default {
 
       this.generateRule()
     },
-    'data.options.pattern': function (val) {
+    valiatePattern (val) {
       if (!this.show) {
         return false
       }
@@ -465,6 +455,32 @@ export default {
 
       this.generateRule()
     }
+  },
+  watch: {
+    'data.options.isRange': function(val) {
+      if (typeof val !== 'undefined') {
+        if (val) {
+          this.data.options.defaultValue = null
+        } else {
+          if (Object.keys(this.data.options).indexOf('defaultValue')>=0) 
+            this.data.options.defaultValue = ''
+        }
+      }
+    },
+    'data.options.required': function(val) {
+      this.validateRequired(val)
+    },
+    'data.options.dataType': function (val) {
+      this.validateDataType(val)
+    },
+    'data.options.pattern': function (val) {
+      this.valiatePattern(val)
+    },
+    'data.name': function (val) {
+      this.validateRequired(this.data.options.required)
+      this.validateDataType(this.data.options.dataType)
+      this.valiatePattern(this.data.options.pattern)
+    }
   }
 }
 </script>

package-lock.json

@@ -167,7 +167,7 @@ export default {
         rules: []
       })
 
-      if (row.columns[colIndex].list[newIndex].type === 'radio' || row.columns[colIndex].list[newIndex].type === 'checkbox' || this.data.list[newIndex].type === 'select') {
+      if (row.columns[colIndex].list[newIndex].type === 'radio' || row.columns[colIndex].list[newIndex].type === 'checkbox' || row.columns[colIndex].list[newIndex].type === 'select') {
         this.$set(row.columns[colIndex].list, newIndex, {
           ...row.columns[colIndex].list[newIndex],
           options: {

package.json

@@ -1,12 +1,13 @@
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+const TerserPlugin = require('terser-webpack-plugin')
 
 module.exports = {
   productionSourceMap: false,
   publicPath: './',
   configureWebpack: config => {
     let plugins = [
-      new UglifyJsPlugin({
-        uglifyOptions: {
+      new TerserPlugin({
+        terserOptions: {
           compress: {
             warnings: false,
             drop_debugger: false,