Merge branch 'master' of github.com:elunez/eladmin-web

package.json

@@ -60,18 +60,19 @@
     "vue-cropper": "0.4.9",
     "vue-cropper": "0.4.9",
     "vue-echarts": "^5.0.0-beta.0",
     "vue-echarts": "^5.0.0-beta.0",
     "vue-highlightjs": "^1.3.3",
     "vue-highlightjs": "^1.3.3",
+    "vue-image-crop-upload": "^2.5.0",
     "vue-router": "3.0.2",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
     "vue-splitpane": "1.0.4",
     "vuedraggable": "2.20.0",
     "vuedraggable": "2.20.0",
     "vuex": "3.1.0",
     "vuex": "3.1.0",
     "wangeditor": "^3.1.1",
     "wangeditor": "^3.1.1",
-    "xlsx": "^0.14.1",
-    "vue-image-crop-upload": "^2.5.0"
+    "xlsx": "^0.14.1"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@babel/core": "7.0.0",
     "@babel/core": "7.0.0",
     "@babel/parser": "^7.7.4",
     "@babel/parser": "^7.7.4",
     "@babel/register": "7.0.0",
     "@babel/register": "7.0.0",
+    "@vue/babel-plugin-transform-vue-jsx": "^1.2.1",
     "@vue/cli-plugin-babel": "3.5.3",
     "@vue/cli-plugin-babel": "3.5.3",
     "@vue/cli-plugin-eslint": "^3.9.1",
     "@vue/cli-plugin-eslint": "^3.9.1",
     "@vue/cli-plugin-unit-jest": "3.5.3",
     "@vue/cli-plugin-unit-jest": "3.5.3",

src/components/Crud/crud.js

@@ -406,6 +406,10 @@ function CRUD(options) {
           Vue.set(crudFrom, key, form[key])
           Vue.set(crudFrom, key, form[key])
         }
         }
       }
       }
+      // add by ghl 2020-10-04  页面重复添加信息时，下拉框的校验会存在，需要找工取消
+      if (crud.findVM('form').$refs['form']) {
+        crud.findVM('form').$refs['form'].clearValidate()
+      }
     },
     },
     /**
     /**
      * 重置数据状态
      * 重置数据状态