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 @@ - - - - - {{field.options.prependControlText}} - - - {{field.options.appendControlText}} - - {{field.options.prependControlText}} - {{field.options.appendControlText}} - - - 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) }) } }