From a21ca4e982afb7ebeff4c26d1bc698dcf38aec81 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Thu, 8 Aug 2024 10:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A1=B5=E9=9D=A2=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/formControlAttr.vue | 37 +- .../DesignForm/formControlAttr_2024024.vue | 38 +- .../DesignForm/formControlAttres.vue | 35 +- .../DesignForm/formControlPropertiNew.vue | 405 +++++++++--------- .../DesignForm/formControlProperties.vue | 80 ++-- .../DesignForm/public/form/formGroup.vue | 3 +- .../DesignForm/tableListPage/formPageCont.vue | 106 ++++- src/widget/baidumap/indexLook.vue | 2 +- src/widget/systemunit/founder.vue | 7 +- 9 files changed, 415 insertions(+), 298 deletions(-) diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index 285e39e..95329ff 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/src/components/DesignForm/formControlAttr.vue @@ -220,6 +220,24 @@ } const temp =reactive([ + { + label: 'label值', + value: item.label, + path: 'item.label', + vHide: [ + 'table', + 'grid', + 'tabs', + 'title', + 'gridChild', + 'div', + 'inputSlot', + 'flex', + 'button', + 'txt' + ], + eventName: 'labelNameVal' + }, { label: '自定义Class', value: config.className, @@ -312,24 +330,7 @@ }, vShow: ['button', 'div'] }, - { - label: 'label值', - value: item.label, - path: 'item.label', - vHide: [ - 'table', - 'grid', - 'tabs', - 'title', - 'gridChild', - 'div', - 'inputSlot', - 'flex', - 'button', - 'txt' - ], - eventName: 'labelNameVal' - }, + { label: '隐藏label', value: item.showLabel, diff --git a/src/components/DesignForm/formControlAttr_2024024.vue b/src/components/DesignForm/formControlAttr_2024024.vue index 2a21e87..29b78b2 100644 --- a/src/components/DesignForm/formControlAttr_2024024.vue +++ b/src/components/DesignForm/formControlAttr_2024024.vue @@ -205,6 +205,24 @@ const attrList = computed(() => { } const temp =reactive([ + { + label: 'label值', + value: item.label, + path: 'item.label', + vHide: [ + 'table', + 'grid', + 'tabs', + 'title', + 'gridChild', + 'div', + 'inputSlot', + 'flex', + 'button', + 'txt' + ], + eventName: 'labelNameVal' + }, { label: '自定义Class', value: config.className, @@ -251,6 +269,7 @@ const attrList = computed(() => { 'treeSelect' ] }, + { label: '按钮类型', value: control.type, @@ -297,24 +316,7 @@ const attrList = computed(() => { }, vShow: ['button', 'div'] }, - { - label: 'label值', - value: item.label, - path: 'item.label', - vHide: [ - 'table', - 'grid', - 'tabs', - 'title', - 'gridChild', - 'div', - 'inputSlot', - 'flex', - 'button', - 'txt' - ], - eventName: 'labelNameVal' - }, + { label: '隐藏label', value: item.showLabel, diff --git a/src/components/DesignForm/formControlAttres.vue b/src/components/DesignForm/formControlAttres.vue index 2514a64..b6c8b72 100644 --- a/src/components/DesignForm/formControlAttres.vue +++ b/src/components/DesignForm/formControlAttres.vue @@ -152,6 +152,23 @@ const attrList = computed(() => { } } const temp= reactive([ + { + label: 'label值', + value: item.label, + path: 'item.label', + vHide: [ + 'table', + 'grid', + 'tabs', + 'title', + 'gridChild', + 'div', + 'inputSlot', + 'flex', + 'button', + 'txt' + ] + }, { label: '自定义Class', value: config.className, @@ -244,23 +261,7 @@ const attrList = computed(() => { }, vShow: ['button', 'div'] }, - { - label: 'label值', - value: item.label, - path: 'item.label', - vHide: [ - 'table', - 'grid', - 'tabs', - 'title', - 'gridChild', - 'div', - 'inputSlot', - 'flex', - 'button', - 'txt' - ] - }, + { label: '隐藏label', value: item.showLabel, diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 1c04e41..4afc65c 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -230,17 +230,35 @@ const attrList = computed(() => { const temp =reactive([ { + label: '标签名称', + value: item.label, + path: 'item.label', + vHide: [ + 'table', + 'grid', + 'tabs', + 'title', + 'gridChild', + 'div', + 'inputSlot', + 'flex', + 'button', + 'txt' + ], + eventName: 'labelNameVal' + }, + { label: '组件类型', value: unitName, placeholder: '组件类型', path: 'unitName' }, - { - label: '自定义Class', - value: config.className, - placeholder: '样式类名', - path: 'config.className' - }, + // { + // label: '自定义Class', + // value: config.className, + // placeholder: '样式类名', + // path: 'config.className' + // }, { label: '字段标识', value: name, @@ -281,6 +299,23 @@ const attrList = computed(() => { 'treeSelect', 'digitpage' ] + }, + { + label: '帮助信息', + value: config.help, + path: 'config.help', + vHide: [ + 'table', + 'grid', + 'tabs', + 'gridChild', + 'divider', + 'div', + 'inputSlot', + 'flex', + 'button', + 'txt' + ] }, { label: '按钮类型', @@ -328,26 +363,9 @@ const attrList = computed(() => { }, vShow: ['button', 'div'] }, + { - label: 'label值', - value: item.label, - path: 'item.label', - vHide: [ - 'table', - 'grid', - 'tabs', - 'title', - 'gridChild', - 'div', - 'inputSlot', - 'flex', - 'button', - 'txt' - ], - eventName: 'labelNameVal' - }, - { - label: '隐藏label', + label: '隐藏标签', value: item.showLabel, path: 'item.showLabel', type: 'switch', @@ -366,23 +384,7 @@ const attrList = computed(() => { 'txt' ] }, - { - label: '帮助信息', - value: config.help, - path: 'config.help', - vHide: [ - 'table', - 'grid', - 'tabs', - 'gridChild', - 'divider', - 'div', - 'inputSlot', - 'flex', - 'button', - 'txt' - ] - }, + { label: '表单栅格', value: config.span, @@ -498,76 +500,76 @@ const attrList = computed(() => { type: 'switch', vShow: ['select'] }, - { - label: '是否禁用', - value: control.disabled, - path: 'control.disabled', - type: 'switch', - vShow: [ - 'input', - 'password', - 'textarea', - 'radio', - 'checkbox', - 'select', - 'date', - 'switch', - 'number', - 'cascader', - 'upload', - 'rate', - 'tinymce', - 'treeSelect' - ], - vIf: state.isSearch - }, - { - label: '是否禁用编辑', - value: config.editDisabled, - path: 'config.editDisabled', - type: 'switch', - vShow: [ - 'input', - 'password', - 'textarea', - 'radio', - 'checkbox', - 'select', - 'date', - 'switch', - 'number', - 'cascader', - 'upload', - 'treeSelect', - 'table', - 'flex' - ], - vIf: state.isSearch - }, - { - label: '添加页隐藏', - value: config.disabledAdd, - path: 'config.disabledAdd', - type: 'switch', - vIf: state.isSearch, - vHide: ['inputSlot'] - }, - { - label: '编辑页隐藏', - value: config.disabledEdit, - path: 'config.disabledEdit', - type: 'switch', - vIf: state.isSearch, - vHide: ['inputSlot'] - }, - { - label: '详情页隐藏', - value: config.disabledDetail, - path: 'config.disabledDetail', - type: 'switch', - vIf: state.isSearch, - vHide: ['inputSlot'] - }, + // { + // label: '是否禁用', + // value: control.disabled, + // path: 'control.disabled', + // type: 'switch', + // vShow: [ + // 'input', + // 'password', + // 'textarea', + // 'radio', + // 'checkbox', + // 'select', + // 'date', + // 'switch', + // 'number', + // 'cascader', + // 'upload', + // 'rate', + // 'tinymce', + // 'treeSelect' + // ], + // vIf: state.isSearch + // }, + // { + // label: '是否禁用编辑', + // value: config.editDisabled, + // path: 'config.editDisabled', + // type: 'switch', + // vShow: [ + // 'input', + // 'password', + // 'textarea', + // 'radio', + // 'checkbox', + // 'select', + // 'date', + // 'switch', + // 'number', + // 'cascader', + // 'upload', + // 'treeSelect', + // 'table', + // 'flex' + // ], + // vIf: state.isSearch + // }, + // { + // label: '添加页隐藏', + // value: config.disabledAdd, + // path: 'config.disabledAdd', + // type: 'switch', + // vIf: state.isSearch, + // vHide: ['inputSlot'] + // }, + // { + // label: '编辑页隐藏', + // value: config.disabledEdit, + // path: 'config.disabledEdit', + // type: 'switch', + // vIf: state.isSearch, + // vHide: ['inputSlot'] + // }, + // { + // label: '详情页隐藏', + // value: config.disabledDetail, + // path: 'config.disabledDetail', + // type: 'switch', + // vIf: state.isSearch, + // vHide: ['inputSlot'] + // }, { label: '设为Input输入框的前/后缀', value: type === 'inputSlot', @@ -3104,9 +3106,9 @@ const disabledIstrue = (val:string) => { - {{sonCentor.value}} + +
+ +
+
+ + + + + +
+
+ +
+
+
+
+
+ +
+
+ +
+
+ + + + + + + + +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ + + + + @@ -415,5 +516,6 @@ const jsuanKuandu = () => { .biankuang{ border: 1px solid #D4D7DE; padding:10px 10px; + } diff --git a/src/widget/baidumap/indexLook.vue b/src/widget/baidumap/indexLook.vue index 21d55e8..191cd2a 100644 --- a/src/widget/baidumap/indexLook.vue +++ b/src/widget/baidumap/indexLook.vue @@ -16,7 +16,7 @@ const props = withDefaults( }>(), {} ) -let mapId = "baiduMapView"+ Math.ceil(Math.random()); +let mapId = "baiduMapView"+ Math.ceil(Math.random()*100000000000000); const mapObject = ref() const mapShow = ref(false) const address = ref(); //行政组织树数据 diff --git a/src/widget/systemunit/founder.vue b/src/widget/systemunit/founder.vue index fc7f6e4..54d68c1 100644 --- a/src/widget/systemunit/founder.vue +++ b/src/widget/systemunit/founder.vue @@ -197,6 +197,11 @@ const getFormFounder = (val: any) => {