diff --git a/examples/views/formEditorConfig.vue b/examples/views/formEditorConfig.vue index 5848561..29507e0 100644 --- a/examples/views/formEditorConfig.vue +++ b/examples/views/formEditorConfig.vue @@ -55,8 +55,7 @@ const sector = computed(() => { } else { result = _.find(all.value, { id: value0.value }) } - console.log(result?.columns?.[0]) - return result?.columns?.[0] || result + return result }) const handleListener = async ({ type, data }) => { console.log(type) diff --git a/packages/formEditor/components/Panels/Config/components/CheckboxComponent.vue b/packages/formEditor/components/Panels/Config/components/CheckboxComponent.vue index ffc683b..d27d487 100644 --- a/packages/formEditor/components/Panels/Config/components/CheckboxComponent.vue +++ b/packages/formEditor/components/Panels/Config/components/CheckboxComponent.vue @@ -3,7 +3,6 @@ import utils from '@ER/utils' import hooks from '@ER/hooks' export default { name: 'ConfigCheckboxComponent', - inheritAttrs: false, customOptions: {} } diff --git a/packages/formEditor/components/Panels/Config/components/CollapseComponent.vue b/packages/formEditor/components/Panels/Config/components/CollapseComponent.vue index 577a9c6..2112def 100644 --- a/packages/formEditor/components/Panels/Config/components/CollapseComponent.vue +++ b/packages/formEditor/components/Panels/Config/components/CollapseComponent.vue @@ -4,7 +4,6 @@ import hooks from '@ER/hooks' import Icon from '@ER/icon' export default { name: 'ConfigCollapseComponent', - inheritAttrs: false, customOptions: {} } diff --git a/packages/formEditor/components/Panels/Config/components/GlobalConfigPanel.vue b/packages/formEditor/components/Panels/Config/components/GlobalConfigPanel.vue index e75cc90..2e08b8d 100644 --- a/packages/formEditor/components/Panels/Config/components/GlobalConfigPanel.vue +++ b/packages/formEditor/components/Panels/Config/components/GlobalConfigPanel.vue @@ -8,6 +8,7 @@ import { ClickOutside as vClickOutside } from 'element-plus' import CompleteButton from '@ER/formEditor/components/CompleteButton.vue' import PanelsConfigComponentsTypeComponent from './TypeComponent.vue' import PanelsConfigComponentsLogicComponent from './LogicComponent.vue' +import utils from '@ER/utils' export default { name: 'GlobalConfigPanel', inheritAttrs: false, @@ -41,7 +42,6 @@ const popperPaneRef = computed(() => { }) let handleConfirm = '' const handleBeforeChange = () => { - // visible.value = true return new Promise((resolve, reject) => { const pcObj = _.pick(unref(target).pc, compareKeys) const mobileObj = _.pick(unref(target).mobile, compareKeys) @@ -86,10 +86,6 @@ const options0 = computed(() => { } ] }) - -// {{t('er.config.globalConfig.componentSize.large')}} -// {{t('er.config.globalConfig.componentSize.default')}} -// {{t('er.config.globalConfig.componentSize.small')}} const options1 = computed(() => { return [ { @@ -128,7 +124,7 @@ const handleTypeListener = ({ property, data }) => {
- + {{ t('er.config.globalConfig.sync.warning') }}
@@ -152,8 +148,11 @@ const handleTypeListener = ({ property, data }) => {
- - + { :label="t('er.config.globalConfig.componentSize.label')" :val="target[state.platform].size" :nodes="options1" + v-bind="utils.addTestId('configPanel:size')" /> { :fontSize="80" :val="target[state.platform].labelPosition" :nodes="options0" + v-bind="utils.addTestId('configPanel:labelPosition')" /> - +
diff --git a/packages/formEditor/components/Panels/Config/components/PropsPanel.vue b/packages/formEditor/components/Panels/Config/components/PropsPanel.vue index 2a26cfa..2ecca37 100644 --- a/packages/formEditor/components/Panels/Config/components/PropsPanel.vue +++ b/packages/formEditor/components/Panels/Config/components/PropsPanel.vue @@ -14,6 +14,7 @@ import PanelsConfigComponentsDataComponent1 from './DataComponent1.jsx' import PanelsConfigComponentsDataComponent2 from './DataComponent2.jsx' import PanelsConfigComponentsDataComponent3 from './DataComponent3.vue' import Icon from '@ER/icon' +import _ from 'lodash-es' export default { name: 'ConfigPropsPanel', inheritAttrs: false, @@ -399,7 +400,7 @@ onMounted(() => { - + @@ -408,12 +409,14 @@ onMounted(() => { v-if="isSelectField" :label="t('er.config.propsPanel.title')" operationKey="options" - field="isShowLabel"> + field="isShowLabel" + v-bind="utils.addTestId('propsPanel:title')" + >