From d7acd839f79cc786484092a6dff23d1a0cebd099 Mon Sep 17 00:00:00 2001
From: vdpAdmin <vdpadmin@163.com>
Date: Wed, 29 Sep 2021 15:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6iView?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E4=BA=9B=E8=AE=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 140 +++++-------------
 install-iview.js                              |   2 +
 install-render-iview.js                       |   1 +
 install-render.js                             |   1 +
 install.js                                    |   2 +
 package.json                                  |   8 +-
 src/components-iview/code-editor/index.vue    |   4 +-
 .../form-designer/designer.js                 |   2 +-
 src/components-iview/form-designer/index.vue  |   2 +
 .../setting-panel/option-items-setting.vue    |   2 +-
 src/components/code-editor/index.vue          |   4 +-
 src/components/form-designer/designer.js      |   2 +-
 .../form-widget/field-widget.vue              |   2 +-
 src/components/form-designer/index.vue        |   4 +-
 src/components/form-render/index.vue          |   2 +-
 src/utils/config.js                           |   2 +-
 16 files changed, 63 insertions(+), 117 deletions(-)

diff --git a/README.md b/README.md
index 661e6c9..6944e34 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Variant Form
-#### 一款高效的Vue表单，可视化设计，一键生成源码，享受更多摸鱼时间。
+#### 一款高效的Vue低代码表单，可视化设计，一键生成源码，享受更多摸鱼时间。
 
 ![image](https://ks3-cn-beijing.ksyuncs.com/vform-static/img/vform_demo.gif)
 
@@ -37,33 +37,44 @@ npm run lib-render
 
 ### 跟Vue项目集成
 
+<br/>
 
+#### 1. 安装包
+  ```bash
+  npm i vform-builds
+  ```
+或
+  ```bash
+  yarn add vform-builds
+  ```
 
-####### 打包
-```
-//VFromDesigner:
-npm run lib-iview
-//VFromRender
-npm run lib-render-iview
-```
+<br/>
+
+#### 2. 引入并全局注册VForm组件
+```javascript
+import Vue from 'vue'
+import App from './App.vue'
+
+import ElementUI from 'element-ui'  //引入element-ui库
+import VForm from 'vform-builds'  //引入VForm库
+
+import 'element-ui/lib/theme-chalk/index.css'  //引入element-ui样式
+import 'vform-builds/dist/VFormDesigner.css'  //引入VForm样式
+
+Vue.config.productionTip = false
+
+Vue.use(ElementUI)  //全局注册element-ui
+Vue.use(VForm)  //全局注册VForm(同时注册了v-form-designer和v-form-render组件)
 
-####### 使用vFormDesigner的lib包
-1. main.js全局注册
-```
-...
-import ViewUI from 'view-design';
-import VFormDesigner from './{YOURPATH}/VFormDesigner.umd.min.js'
-import './{YOURPATH}/VFormDesigner.css'
-...
-Vue.use(VFormDesigner);
-Vue.use(ViewUI, {size:'small'});
-...
 new Vue({
-  render: h => h(App)
+  render: h => h(App),
 }).$mount('#app')
 ```
-2. 在Vue模板中使用组件
-```
+
+<br/>
+
+#### 3. 在Vue模板中使用表单设计器组件
+```html
 <template>
   <v-form-designer></v-form-designer>
 </template>
@@ -81,28 +92,11 @@ new Vue({
 body {
   margin: 0;  /* 如果页面出现垂直滚动条，则加入此行CSS以消除之 */
 }
-
-
+</style>
 ```
 
-
-####### 使用vFormRender的lib包
-1. main.js全局注册
-```
-...
-import ViewUI from 'view-design';
-import VFormRender from './{YOURPATH}/VFormRender.umd.min.js'
-import './{YOURPATH}/VFormRender.css'
-...
-Vue.use(VFormRender);
-Vue.use(ViewUI, {size:'small'});
-...
-new Vue({
-  render: h => h(App)
-}).$mount('#app')
-```
-2. 在Vue模板中使用组件
-```
+#### 4. 在Vue模板中使用表单渲染器组件
+```html
 <template>
   <div>
     <v-form-render :form-json="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef">
@@ -134,66 +128,6 @@ new Vue({
 </script>
 ```
 
-
-
-<br/>
-
-#### 1. 安装包
-  ```bash
-  npm i vform-builds
-  ```
-或
-  ```bash
-  yarn add vform-builds
-  ```
-
-<br/>
-
-#### 2. 引入并全局注册VForm组件
-```
-import Vue from 'vue'
-import App from './App.vue'
-
-import ElementUI from 'element-ui'  //引入element-ui库
-import VForm from 'vform-builds'  //引入VForm库
-
-import 'element-ui/lib/theme-chalk/index.css'  //引入element-ui样式
-import 'vform-builds/dist/VFormDesigner.css'  //引入VForm样式
-
-Vue.config.productionTip = false
-
-Vue.use(ElementUI)  //全局注册element-ui
-Vue.use(VForm)  //全局注册VForm(同时注册了v-form-designer和v-form-render组件)
-
-new Vue({
-  render: h => h(App),
-}).$mount('#app')
-```
-
-<br/>
-
-#### 3. 在Vue模板中使用表单设计器组件
-```bash
-<template>
-  <v-form-designer></v-form-designer>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-body {
-  margin: 0;  /* 如果页面出现垂直滚动条，则加入此行CSS以消除之 */
-}
-</style>
-```
-
 <br/>
 
 ### 资源链接
@@ -209,6 +143,8 @@ Github仓库：<a href="https://github.com/vform666/variant-form" target="_blank
 
 Gitee备份仓库：<a href="https://gitee.com/vdpadmin/variant-form" target="_blank">https://gitee.com/vdpadmin/variant-form</a>
 
+更新日志：<a href="http://www.vform666.com/pages/changelog/" target="_blank">http://www.vform666.com/pages/changelog/</a>
+
 技术交流群：微信搜索“vformAdmin”，或者扫如下二维码加群
 
 ![image](https://ks3-cn-beijing.ksyuncs.com/vform-static/img/vx-qrcode-242.png)
\ No newline at end of file
diff --git a/install-iview.js b/install-iview.js
index 4112998..8f4e773 100644
--- a/install-iview.js
+++ b/install-iview.js
@@ -13,10 +13,12 @@ import '@/iconfont/iconfont.css'
 
 VFormDesigner.install = function (Vue) {
   Vue.component(VFormDesigner.name, VFormDesigner)
+  Vue.component('container-widget', ContainerWidget)
 }
 
 VFormRender.install = function (Vue) {
   Vue.component(VFormRender.name, VFormRender)
+  Vue.component('container-item', ContainerItem)
 }
 
 const components = [
diff --git a/install-render-iview.js b/install-render-iview.js
index ff669a1..a588f79 100644
--- a/install-render-iview.js
+++ b/install-render-iview.js
@@ -4,6 +4,7 @@ import axios from "axios";
 
 VFormRender.install = function (Vue) {
   Vue.component(VFormRender.name, VFormRender)
+  Vue.component('container-item', ContainerItem)
 }
 
 const components = [
diff --git a/install-render.js b/install-render.js
index f325b1b..fc767df 100644
--- a/install-render.js
+++ b/install-render.js
@@ -4,6 +4,7 @@ import axios from "axios";
 
 VFormRender.install = function (Vue) {
   Vue.component(VFormRender.name, VFormRender)
+  Vue.component('container-item', ContainerItem)
 }
 
 const components = [
diff --git a/install.js b/install.js
index bd8f791..6fba136 100644
--- a/install.js
+++ b/install.js
@@ -11,10 +11,12 @@ import '@/iconfont/iconfont.css'
 
 VFormDesigner.install = function (Vue) {
   Vue.component(VFormDesigner.name, VFormDesigner)
+  Vue.component('container-widget', ContainerWidget)
 }
 
 VFormRender.install = function (Vue) {
   Vue.component(VFormRender.name, VFormRender)
+  Vue.component('container-item', ContainerItem)
 }
 
 const components = [
diff --git a/package.json b/package.json
index 89fe21b..601bb5a 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,16 @@
 {
   "name": "variant-form",
-  "version": "1.1.2",
+  "version": "2.0.0",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve --open src/main.js",
     "serve-iview": "vue-cli-service serve --open src/main-iview.js",
     "build": "vue-cli-service build --report --dest dist/build",
-	  "build-iview": "vue-cli-service build --report --dest dist/build-iview",
+    "build-iview": "vue-cli-service build --report --dest dist/build-iview",
     "lib": "vue-cli-service build --report --target lib --dest dist/lib --name VFormDesigner install.js",
     "lib-render": "vue-cli-service build --report --target lib --dest dist/lib-render --name VFormRender install-render.js",
-    "lib-iview": "vue-cli-service build --report --target lib --dest dist/lib-iview --name VFormDesigner install-iview.js",
-    "lib-render-iview": "vue-cli-service build --report --target lib --dest dist/lib-render-iview --name VFormRender install-render-iview.js",
+    "lib-iview": "vue-cli-service build --report --target lib --dest dist/lib-iview --name VFormDesigner-iView install-iview.js",
+    "lib-render-iview": "vue-cli-service build --report --target lib --dest dist/lib-render-iview --name VFormRender-iView install-render-iview.js",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
diff --git a/src/components-iview/code-editor/index.vue b/src/components-iview/code-editor/index.vue
index 0e7f14a..aa877bd 100644
--- a/src/components-iview/code-editor/index.vue
+++ b/src/components-iview/code-editor/index.vue
@@ -113,11 +113,11 @@
       },
 
       setJsonMode() {
-        this.aceEditor?.getSession().setMode('ace/mode/json')
+        this.aceEditor.getSession().setMode('ace/mode/json')
       },
 
       setCssMode() {
-        this.aceEditor?.getSession().setMode('ace/mode/css')
+        this.aceEditor.getSession().setMode('ace/mode/css')
       },
 
     }
diff --git a/src/components-iview/form-designer/designer.js b/src/components-iview/form-designer/designer.js
index 11bc755..12eb976 100644
--- a/src/components-iview/form-designer/designer.js
+++ b/src/components-iview/form-designer/designer.js
@@ -1,7 +1,7 @@
 /**
  * author: vformAdmin
  * email: vdpadmin@163.com
- * website: https://www.yuque.com/variantdev/vform
+ * website: http://www.vform666.com/
  * date: 2021.08.18
  * remark: 如果要分发VForm源码，需在本文件顶部保留此文件头信息！！
  */
diff --git a/src/components-iview/form-designer/index.vue b/src/components-iview/form-designer/index.vue
index 55900c8..c198fb3 100644
--- a/src/components-iview/form-designer/index.vue
+++ b/src/components-iview/form-designer/index.vue
@@ -187,6 +187,8 @@
 	
 	  img {
 	    cursor: pointer;
+		width: 36px;
+      	height: 36px;
 	  }
 	
 	  span.bold {
diff --git a/src/components-iview/form-designer/setting-panel/option-items-setting.vue b/src/components-iview/form-designer/setting-panel/option-items-setting.vue
index 81fe85a..8493426 100644
--- a/src/components-iview/form-designer/setting-panel/option-items-setting.vue
+++ b/src/components-iview/form-designer/setting-panel/option-items-setting.vue
@@ -69,7 +69,7 @@
 			v-model="showImportDialogFlag" :closable="true" class="small-padding-dialog" draggable
 			:mask-closable="false" >
 			<FormItem :label-width="0">
-				<el-input type="textarea" rows="10" v-model="optionLines"></el-input>
+				<Input type="textarea" :rows="10" v-model="optionLines"></Input>
 			</FormItem>
 			<div slot="footer" class="dialog-footer">
 				<Button size="default" type="primary" @click="saveOptions">{{i18nt('designer.hint.confirm')}}
diff --git a/src/components/code-editor/index.vue b/src/components/code-editor/index.vue
index 7505e8f..a99a042 100644
--- a/src/components/code-editor/index.vue
+++ b/src/components/code-editor/index.vue
@@ -112,11 +112,11 @@
       },
 
       setJsonMode() {
-        this.aceEditor?.getSession().setMode('ace/mode/json')
+        this.aceEditor.getSession().setMode('ace/mode/json')
       },
 
       setCssMode() {
-        this.aceEditor?.getSession().setMode('ace/mode/css')
+        this.aceEditor.getSession().setMode('ace/mode/css')
       },
 
     }
diff --git a/src/components/form-designer/designer.js b/src/components/form-designer/designer.js
index 11bc755..12eb976 100644
--- a/src/components/form-designer/designer.js
+++ b/src/components/form-designer/designer.js
@@ -1,7 +1,7 @@
 /**
  * author: vformAdmin
  * email: vdpadmin@163.com
- * website: https://www.yuque.com/variantdev/vform
+ * website: http://www.vform666.com/
  * date: 2021.08.18
  * remark: 如果要分发VForm源码，需在本文件顶部保留此文件头信息！！
  */
diff --git a/src/components/form-designer/form-widget/field-widget.vue b/src/components/form-designer/form-widget/field-widget.vue
index 22852f5..4ec4ef0 100644
--- a/src/components/form-designer/form-widget/field-widget.vue
+++ b/src/components/form-designer/form-widget/field-widget.vue
@@ -2,7 +2,7 @@
 /**
  * author: vformAdmin
  * email: vdpadmin@163.com
- * website: https://www.yuque.com/variantdev/vform
+ * website: http://www.vform666.com/
  * date: 2021.08.18
  * remark: 如果要分发VForm源码，需在本文件顶部保留此文件头信息！！
  */
diff --git a/src/components/form-designer/index.vue b/src/components/form-designer/index.vue
index b7dca4e..138744a 100644
--- a/src/components/form-designer/index.vue
+++ b/src/components/form-designer/index.vue
@@ -2,7 +2,7 @@
 /**
  * author: vformAdmin
  * email: vdpadmin@163.com
- * website: https://www.yuque.com/variantdev/vform
+ * website: http://www.vform666.com/
  * date: 2021.08.18
  * remark: 如果要分发VForm源码，需在本文件顶部保留此文件头信息！！
  */
@@ -206,6 +206,8 @@
 
     img {
       cursor: pointer;
+      width: 36px;
+      height: 36px;
     }
 
     span.bold {
diff --git a/src/components/form-render/index.vue b/src/components/form-render/index.vue
index 31e6e12..6173414 100644
--- a/src/components/form-render/index.vue
+++ b/src/components/form-render/index.vue
@@ -2,7 +2,7 @@
 /**
  * author: vformAdmin
  * email: vdpadmin@163.com
- * website: https://www.yuque.com/variantdev/vform
+ * website: http://www.vform666.com/
  * date: 2021.08.18
  * remark: 如果要分发VForm源码，需在本文件顶部保留此文件头信息！！
  */
diff --git a/src/utils/config.js b/src/utils/config.js
index 8de5eab..e30fa8f 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -8,7 +8,7 @@ export const DESIGNER_OPTIONS = {
 
 }
 
-export const VARIANT_FORM_VERSION = '1.1.2'
+export const VARIANT_FORM_VERSION = '2.0.0'
 
 //export const ACE_BASE_PATH = 'public/lib/ace/src-min-noconflict'
 export const ACE_BASE_PATH = 'https://ks3-cn-beijing.ksyun.com/vform2021/ace-mini'