From bcc8d8abb2b8b89b6f44f3b5604e1cfd76e7ccb0 Mon Sep 17 00:00:00 2001
From: justin <computer1024@163.com>
Date: Thu, 30 Sep 2021 00:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20iview=E5=BC=B9=E5=87=BAmes?=
 =?UTF-8?q?sage=E6=8F=90=E7=A4=BA=E6=A1=86=20=E5=87=BA=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form-designer/designer.js                 |  4 +-
 .../form-widget/field-widget.vue              | 42 ---------------
 .../form-designer/form-widget/index.vue       |  2 +-
 .../form-designer/setting-panel/index.vue     |  8 +--
 .../setting-panel/option-items-setting.vue    |  2 +-
 .../form-designer/toolbar-panel/index.vue     | 30 +++++------
 .../widget-panel/widgetsConfig.js             | 54 +------------------
 .../form-render/container-item.vue            |  2 +-
 src/components-iview/form-render/index.vue    |  2 +-
 src/components-iview/form-render/refMixin.js  |  2 +-
 src/components-iview/utils/code-generator.js  |  2 +-
 11 files changed, 28 insertions(+), 122 deletions(-)

diff --git a/src/components-iview/form-designer/designer.js b/src/components-iview/form-designer/designer.js
index 12eb976..3bdb58b 100644
--- a/src/components-iview/form-designer/designer.js
+++ b/src/components-iview/form-designer/designer.js
@@ -135,7 +135,7 @@ export function createDesigner(vueInstance) {
         let wgCategory = evt.draggedContext.element.category
         if (!!evt.to) {
           if ((evt.to.className === 'sub-form-table') && (wgCategory === 'container')) {
-            //this.$message.info(this.vueInstance.i18nt('designer.hint.onlyFieldWidgetAcceptable'))
+            //this.$Message.info(this.vueInstance.i18nt('designer.hint.onlyFieldWidgetAcceptable'))
             return false
           }
         }
@@ -650,7 +650,7 @@ export function createDesigner(vueInstance) {
         })
 
         if (spanSum >= 24) {
-          //this.$message.info('列栅格之和超出24')
+          //this.$Message.info('列栅格之和超出24')
           console.log('列栅格之和超出24')
           gridWidget.cols.push(newGridCol)
         } else {
diff --git a/src/components-iview/form-designer/form-widget/field-widget.vue b/src/components-iview/form-designer/form-widget/field-widget.vue
index ac6f45d..0c7868a 100644
--- a/src/components-iview/form-designer/form-widget/field-widget.vue
+++ b/src/components-iview/form-designer/form-widget/field-widget.vue
@@ -48,48 +48,6 @@
 					</Input>
 			</template>
 			
-			<template v-if="field.type === 'input-composite'">
-					<Input ref="fieldEditor" 
-						v-model="fieldModel" 
-						:disabled="field.options.disabled"
-						:readonly="field.options.readonly" 
-						:size="field.options.size||'default'" 
-						 class="hide-spin-button"
-						
-						:type="inputType" 
-						:password ="field.options.showPassword"
-						:placeholder="field.options.placeholder" 
-						:clearable="field.options.clearable"
-						:maxlength="field.options.maxLength"
-						:show-word-limit="field.options.showWordLimit" 
-						
-						:minlength="field.options.minLength"
-						@change="handleChangeEvent" 
-						@focus="handleFocusCustomEvent"
-						@blur="handleBlurCustomEvent" 
-						@input="handleInputCustomEvent">
-						
-						<div slot="prepend" v-if="field.options.prependControl&&field.options.prependControlType=='div'">
-							<Icon :type="field.options.prependControlIcon" />{{field.options.prependControlText}}
-						</div>
-						<div slot="append" v-if="field.options.appendControl&&field.options.appendControlType=='div'">
-							<Icon :type="field.options.appendControlIcon" />{{field.options.appendControlText}}
-						</div>
-						<Button slot="prepend"
-							v-if="field.options.prependControl&&field.options.prependControlType==='button'"
-							type="primary"
-							:disabled="field.options.disabled || field.options.prependControlDisabled"
-							:icon="field.options.prependControlIcon" 
-							@click.native="emitPrependButtonClick">{{field.options.prependControlText}}</Button>
-						<Button slot="append"
-							v-if="field.options.appendControl&&field.options.appendControlType==='button'"
-							type="primary"
-							:disabled="field.options.disabled || field.options.appendButtonDisabled"
-							:icon="field.options.appendControlIcon" 
-							@click.native="emitAppendButtonClick">{{field.options.appendControlText}}</Button>
-					</Input>
-			</template>
-
 			<template v-if="field.type === 'textarea'">
 				<Input type="textarea" ref="fieldEditor" v-model="fieldModel" :disabled="field.options.disabled"
 					:readonly="field.options.readonly" :size="field.options.size||'default'"
diff --git a/src/components-iview/form-designer/form-widget/index.vue b/src/components-iview/form-designer/form-widget/index.vue
index aa3ea01..7258e0d 100644
--- a/src/components-iview/form-designer/form-widget/index.vue
+++ b/src/components-iview/form-designer/form-widget/index.vue
@@ -161,7 +161,7 @@
 			getWidgetRef(widgetName, showError) {
 				let foundRef = this.widgetRefList[widgetName]
 				if (!foundRef && !!showError) {
-					this.$message.error(this.i18nt('designer.hint.refNotFound') + widgetName)
+					this.$Message.error(this.i18nt('designer.hint.refNotFound') + widgetName)
 				}
 				return foundRef
 			},
diff --git a/src/components-iview/form-designer/setting-panel/index.vue b/src/components-iview/form-designer/setting-panel/index.vue
index cd5986f..7fbbed2 100644
--- a/src/components-iview/form-designer/setting-panel/index.vue
+++ b/src/components-iview/form-designer/setting-panel/index.vue
@@ -1554,7 +1554,7 @@
 				let oldName = this.designer.selectedWidgetName
 				if (isEmptyStr(newName)) {
 					this.selectedWidget.options.name = oldName
-					this.$message.info(this.i18nt('designer.hint.nameRequired'))
+					this.$Message.info(this.i18nt('designer.hint.nameRequired'))
 					return
 				}
 
@@ -1563,7 +1563,7 @@
 					let foundRef = this.designer.formWidget.getWidgetRef(newName)
 					if (!!foundRef) {
 						this.selectedWidget.options.name = oldName
-						this.$message.info(this.i18nt('designer.hint.duplicateName') + newName)
+						this.$Message.info(this.i18nt('designer.hint.duplicateName') + newName)
 						return
 					}
 
@@ -1581,7 +1581,7 @@
 					spanSum += colItem.options.span
 				})
 				if (spanSum > 24) {
-					//this.$message.info('列栅格之和超出24')
+					//this.$Message.info('列栅格之和超出24')
 					console.log('列栅格之和超出24')
 					//TODO: 语言字符串资源化
 				}
@@ -1639,7 +1639,7 @@
 
 			deleteTabPane(curTabs, tpIdx) {
 				if (curTabs.tabs.length === 1) {
-					this.$message.info(this.i18nt('designer.hint.lastPaneCannotBeDeleted'))
+					this.$Message.info(this.i18nt('designer.hint.lastPaneCannotBeDeleted'))
 					return
 				}
 
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 8493426..1ad3e2d 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
@@ -234,7 +234,7 @@
 
 					this.showImportCascaderDialogFlag = false
 				} catch (ex) {
-					this.$message.error(this.i18nt('designer.hint.invalidOptionsData') + ex.message)
+					this.$Message.error(this.i18nt('designer.hint.invalidOptionsData') + ex.message)
 				}
 			},
 
diff --git a/src/components-iview/form-designer/toolbar-panel/index.vue b/src/components-iview/form-designer/toolbar-panel/index.vue
index db6264e..020c46d 100644
--- a/src/components-iview/form-designer/toolbar-panel/index.vue
+++ b/src/components-iview/form-designer/toolbar-panel/index.vue
@@ -311,11 +311,11 @@
 					this.designer.loadFormJson(importObj)
 
 					this.showImportJsonDialogFlag = false
-					this.$message.success(this.i18nt('designer.hint.importJsonSuccess'))
+					this.$Message.success(this.i18nt('designer.hint.importJsonSuccess'))
 
 					this.designer.emitHistoryChange()
 				} catch (ex) {
-					this.$message.error(ex + '')
+					this.$Message.error(ex + '')
 				}
 			},
 
@@ -337,11 +337,11 @@
 				this.$nextTick(() => {
 					let copyClipboard = new Clipboard('.copy-json-btn')
 					copyClipboard.on('success', e => {
-						this.$message.success(this.i18nt('designer.hint.copyJsonSuccess'))
+						this.$Message.success(this.i18nt('designer.hint.copyJsonSuccess'))
 						copyClipboard.destroy() // 释放内存
 					})
 					copyClipboard.on('error', e => { // 不支持复制
-						this.$message.error(this.i18nt('designer.hint.copyJsonFail'))
+						this.$Message.error(this.i18nt('designer.hint.copyJsonFail'))
 						copyClipboard.destroy()
 					})
 				})
@@ -354,21 +354,21 @@
 				this.$nextTick(() => {
 					let vueClipboard = new Clipboard('.copy-vue-btn')
 					vueClipboard.on('success', e => {
-						this.$message.success(this.i18nt('designer.hint.copyVueCodeSuccess'))
+						this.$Message.success(this.i18nt('designer.hint.copyVueCodeSuccess'))
 						vueClipboard.destroy() // 释放内存
 					})
 					vueClipboard.on('error', e => { // 不支持复制
-						this.$message.error(this.i18nt('designer.hint.copyVueCodeFail'))
+						this.$Message.error(this.i18nt('designer.hint.copyVueCodeFail'))
 						vueClipboard.destroy()
 					})
 
 					let htmlClipboard = new Clipboard('.copy-html-btn')
 					htmlClipboard.on('success', e => {
-						this.$message.success(this.i18nt('designer.hint.copyHtmlCodeSuccess'))
+						this.$Message.success(this.i18nt('designer.hint.copyHtmlCodeSuccess'))
 						htmlClipboard.destroy() // 释放内存
 					})
 					htmlClipboard.on('error', e => { // 不支持复制
-						this.$message.error(this.i18nt('designer.hint.copyHtmlCodeFail'))
+						this.$Message.error(this.i18nt('designer.hint.copyHtmlCodeFail'))
 						htmlClipboard.destroy()
 					})
 				})
@@ -376,7 +376,7 @@
 
 			  copyVueCode(e) {
 				copyToClipboard(this.vueCode, e,
-					this.$message,
+					this.$Message,
 					this.i18nt('designer.hint.copyVueCodeSuccess'),
 					this.i18nt('designer.hint.copyVueCodeFail')
 				)
@@ -384,7 +384,7 @@
 
 			  copyHtmlCode(e) {
 				copyToClipboard(this.htmlCode, e,
-					this.$message,
+					this.$Message,
 					this.i18nt('designer.hint.copyHtmlCodeSuccess'),
 					this.i18nt('designer.hint.copyHtmlCodeFail')
 				)
@@ -410,7 +410,7 @@
 
 			  copyV2SFC(e) {
 				copyToClipboard(this.sfcCode, e,
-					this.$message,
+					this.$Message,
 					this.i18nt('designer.hint.copySFCSuccess'),
 					this.i18nt('designer.hint.copySFCFail')
 				)
@@ -418,7 +418,7 @@
 
 			  copyV3SFC(e) {
 				copyToClipboard(this.sfcCodeV3, e,
-					this.$message,
+					this.$Message,
 					this.i18nt('designer.hint.copySFCSuccess'),
 					this.i18nt('designer.hint.copySFCFail')
 				)
@@ -447,16 +447,16 @@
 					this.$nextTick(() => {
 						let copyClipboard = new Clipboard('.copy-form-data-json-btn')
 						copyClipboard.on('success', e => {
-							this.$message.success(this.i18nt('designer.hint.copyJsonSuccess'))
+							this.$Message.success(this.i18nt('designer.hint.copyJsonSuccess'))
 							copyClipboard.destroy() // 释放内存
 						})
 						copyClipboard.on('error', e => { // 不支持复制
-							this.$message.error(this.i18nt('designer.hint.copyJsonFail'))
+							this.$Message.error(this.i18nt('designer.hint.copyJsonFail'))
 							copyClipboard.destroy()
 						})
 					})
 				}).catch(error => {
-					this.$message.error(error)
+					this.$Message.error(error)
 				})
 			},
 
diff --git a/src/components-iview/form-designer/widget-panel/widgetsConfig.js b/src/components-iview/form-designer/widget-panel/widgetsConfig.js
index 492398b..9c199cf 100644
--- a/src/components-iview/form-designer/widget-panel/widgetsConfig.js
+++ b/src/components-iview/form-designer/widget-panel/widgetsConfig.js
@@ -138,59 +138,7 @@ export const basicFields = [
       onBlur: '',
       onValidate: '',
     },
-  },
- {
-    type: 'input-composite',
-    icon: 'text-field',
-    formItemFlag: true,
-    options: {
-      name: '',
-      label: '',
-      labelAlign: '',
-      type: 'text',
-      defaultValue: '',
-      placeholder: '',
-      columnWidth: '200px',
-      size: '',
-      labelWidth: null,
-      labelHidden: false,
-      readonly: false,
-      disabled: false,
-      hidden: false,
-      clearable: true,
-      showPassword: false,
-      required: false,
-      validation: '',
-      validationHint: '',
-      //-------------------
-      customClass: '',  //自定义css类名
-      labelIconClass: null,
-      labelIconPosition: 'rear',
-      labelTooltip: null,
-      // minLength: null,
-      maxLength: null,
-      showWordLimit: false,
-	  prependControl: true,
-	  prependControlDisabled: false,
-	  prependControlText:"",			//后置按钮文字
-	  prependControlIcon: 'ios-person',		//后置按钮文字
-      prependControlType: 'button',
-      appendControl: true,
-      appendControlDisabled: false,
-	  appendControlText:"",			//后置按钮文字
-      appendControlIcon: 'ios-search',			//后置按钮文字
-      appendControlType: 'button',
-	  
-      //-------------------
-      onCreated: '',
-      onMounted: '',
-      onInput: '',
-      onChange: '',
-      onFocus: '',
-      onBlur: '',
-      onValidate: '',
-    },
-  },
+  }, 
   {
     type: 'textarea',
     icon: 'textarea-field',
diff --git a/src/components-iview/form-render/container-item.vue b/src/components-iview/form-render/container-item.vue
index c46b8cf..15c02c3 100644
--- a/src/components-iview/form-render/container-item.vue
+++ b/src/components-iview/form-render/container-item.vue
@@ -472,7 +472,7 @@
 					//TODO: 逐行校验子表单！！
 					return this.formModel[this.widget.options.name]
 				} else {
-					this.$message.error(this.i18nt('render.hint.nonSubFormType'))
+					this.$Message.error(this.i18nt('render.hint.nonSubFormType'))
 				}
 			},
 
diff --git a/src/components-iview/form-render/index.vue b/src/components-iview/form-render/index.vue
index bd41b03..789e2db 100644
--- a/src/components-iview/form-render/index.vue
+++ b/src/components-iview/form-render/index.vue
@@ -288,7 +288,7 @@
 			getWidgetRef(widgetName, showError = false) {
 				let foundRef = this.widgetRefList[widgetName]
 				if (!foundRef && !!showError) {
-					this.$message.error(this.i18nt('render.hint.refNotFound') + widgetName)
+					this.$Message.error(this.i18nt('render.hint.refNotFound') + widgetName)
 				}
 				return foundRef
 			},
diff --git a/src/components-iview/form-render/refMixin.js b/src/components-iview/form-render/refMixin.js
index cddfbcf..81316c5 100644
--- a/src/components-iview/form-render/refMixin.js
+++ b/src/components-iview/form-render/refMixin.js
@@ -9,7 +9,7 @@ export default {
     getWidgetRef(widgetName, showError) {
       let foundRef = this.refList[widgetName]
       if (!foundRef && !!showError) {
-        this.$message.error(this.i18nt('render.hint.refNotFound') + widgetName)
+        this.$Message.error(this.i18nt('render.hint.refNotFound') + widgetName)
       }
       return foundRef
     },
diff --git a/src/components-iview/utils/code-generator.js b/src/components-iview/utils/code-generator.js
index e566960..7cba2c4 100644
--- a/src/components-iview/utils/code-generator.js
+++ b/src/components-iview/utils/code-generator.js
@@ -80,7 +80,7 @@ export const generateCode = function(formJson, codeType= 'vue') {
           alert( JSON.stringify(formData) )
         }).catch(error => {
           // Form Validation failed
-          this.$message.error(error)
+          this.$Message.error(error)
         })
       }
     }