From 3b45fa7a17cc53448271f9c25c6eb74de2eaae82 Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Wed, 2 Feb 2022 15:19:09 +0800
Subject: [PATCH] =?UTF-8?q?Variant=20Form3(for=20Vue=203.x)=E6=AD=A3?=
 =?UTF-8?q?=E5=BC=8F=E7=89=883.0.1=E5=8F=91=E5=B8=83=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 package.json                                  |  2 +-
 .../container-widget/grid-col-widget.vue      |  2 +-
 src/utils/config.js                           |  2 +-
 vite.config.js                                | 22 +++----------------
 5 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 81f039d..3f787ac 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@
      <el-button type="primary" @click="submitForm">Submit</el-button>
    </div>
  </template>
- <script>
+ <script setup>
    import { ref, reactive } from 'vue'
    import { ElMessage } from 'element-plus'
  
diff --git a/package.json b/package.json
index 23365bb..27335fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "variant-form3",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "private": false,
   "scripts": {
     "serve": "vite",
diff --git a/src/components/form-designer/form-widget/container-widget/grid-col-widget.vue b/src/components/form-designer/form-widget/container-widget/grid-col-widget.vue
index a537126..f49f7dc 100644
--- a/src/components/form-designer/form-widget/container-widget/grid-col-widget.vue
+++ b/src/components/form-designer/form-widget/container-widget/grid-col-widget.vue
@@ -267,7 +267,7 @@
 
 <style lang="scss" scoped>
   .grid-cell {
-    min-height: 38px;
+    min-height: 38px !important;
     //margin: 6px 0;  /* 设置了margin，栅格列的offset、push、pull会失效！！ */
     padding: 3px;
     outline: 1px dashed #336699;
diff --git a/src/utils/config.js b/src/utils/config.js
index 2aeddc3..e7f4998 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -8,7 +8,7 @@ export const DESIGNER_OPTIONS = {
 
 }
 
-export const VARIANT_FORM_VERSION = '3.0.0'
+export const VARIANT_FORM_VERSION = '3.0.1'
 
 //export const MOCK_CASE_URL = 'https://www.fastmock.site/mock/2de212e0dc4b8e0885fea44ab9f2e1d0/vform/'
 export const MOCK_CASE_URL = 'https://ks3-cn-beijing.ksyuncs.com/vform-static/vcase/'
diff --git a/vite.config.js b/vite.config.js
index 519d545..7ffcf75 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -15,23 +15,6 @@ export default defineConfig({
     //添加jsx/tsx支持
     vueJsx({}),
 
-    //解决引入commonjs模块后打包出现的{'default' is not exported by XXX}错误!!
-    // commonjs(),
-    // commonjs({
-    //   //exclude: ['node_modules/vue/dist/*.js'],
-    //   requireReturnsDefault: true
-    // }),
-
-    // commonjs({requireReturnsDefault: (id) => {
-    //     //console.log('aaa', id)
-    //     if (!!id && id.indexOf('/sortablejs/') > -1) {
-    //       return false
-    //     } else {
-    //       return (!!id && id.indexOf('/axios/') > -1)
-    //     }
-    //   }
-    // }),
-
     /* 开启externalGlobals后，
        报错：TypeError: Cannot read properties of null (reading 'nodeType')，不知何故？？ */
     // externalGlobals({
@@ -72,8 +55,9 @@ export default defineConfig({
     minify: false,
     commonjsOptions: {
       exclude: [
-          'lib/vuedraggable/dist/vuedraggable.umd.js,',  //引号前的逗号不能删，不知何故？？
-        'vue/dist/*.js'],
+        'lib/vuedraggable/dist/vuedraggable.umd.js,',  //引号前的逗号不能删，不知何故？？
+        //'vue/dist/*.js'
+      ],
       include: []
       //requireReturnsDefault: true
     },