From c98ef87a9b5579d64fd51b8b42635168c5d99e4d Mon Sep 17 00:00:00 2001
From: kokoro <8462304@qq.com>
Date: Mon, 9 Nov 2020 20:03:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=E6=8A=A5=E9=94=99(=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91@vue/babel-plugin-transform-vue-jsx)=20(#105)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

From 1cedcf59d8d3abad3b8051358e06f6a187aa5de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=BC=E5=8F=A4=E6=8B=89=E6=96=AF=E5=BE=B7=E5=BD=AA?=
 <ghl_116@qq.com>
Date: Mon, 9 Nov 2020 20:04:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8A=9F=E8=83=BD=20(#104)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 尼古拉斯德彪 <gaohailong@nigulasideMacBook-Pro.local>
---
 src/components/Crud/crud.js | 4 ++++
 1 file changed, 4 insertions(+)

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