From 6f312ccbc03ee5d640a871f8a91c68bae295d03d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=A7=80=E6=89=8D?= <hxl_apple@163.com>
Date: Mon, 21 Apr 2025 17:28:13 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feature:=20=E8=A1=A8=E5=8D=95=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E6=97=B6=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-class-editor.component.tsx         | 21 +++++++++++++++++--
 .../form-designer/form-designer.component.tsx |  6 +++---
 .../designer/src/components/types/metadata.ts |  2 ++
 packages/renderer/src/preview.vue             | 18 +++++++++++++++-
 .../component/src/component.component.tsx     |  2 +-
 .../component/src/component.props.ts          |  3 ++-
 .../src/schema/component.schema.json          |  4 ++++
 .../src/dynamic-view.component.tsx            |  7 +++++++
 8 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/packages/designer/src/components/components/form-designer/components/custom-class-editor/custom-class-editor.component.tsx b/packages/designer/src/components/components/form-designer/components/custom-class-editor/custom-class-editor.component.tsx
index 880b947369..d582aaba69 100644
--- a/packages/designer/src/components/components/form-designer/components/custom-class-editor/custom-class-editor.component.tsx
+++ b/packages/designer/src/components/components/form-designer/components/custom-class-editor/custom-class-editor.component.tsx
@@ -5,6 +5,7 @@ import { useViewModelNavigation } from "../../../view-model-designer/method-mana
 import MonacoEditor from '../../../monaco-editor/monaco-editor.component';
 import './custom-class-editor.scss';
 import { CustomClassEditorProps, customClassEditorProps } from "./custom-class-editor.props";
+import { useLocation } from "../../../../composition/use-location";
 
 export default defineComponent({
     name: 'FCustomClassEditor',
@@ -27,10 +28,13 @@ export default defineComponent({
         const monacoEditorRef = ref();
         /** 自定义样式Dom */
         formSchema.module.customClass ??= {};
+
         const { customClass } = formSchema.module;
         /** 当前编辑器内的样式代码 */
         const currentClassCode = ref();
 
+        const { getUrlParam } = useLocation();
+
         /** 视图模型页签的样式 */
         const viewModelTabClass = computed(() => (viewModelTabId: string) => {
             const showActiceClass = activeViewModel.value?.id === viewModelTabId;
@@ -100,8 +104,17 @@ export default defineComponent({
             updateCurrentClassCode();
         }
 
+        function customStyleFilePath() {
+            const {code:formCode, projectName} = formSchema.module;
+            const basePath = getUrlParam('id').split('/').slice(0,3).join('/');
+            return `/apps${basePath}/web/${projectName}/${formCode}/${formCode}.css`;
+        }
+
         onBeforeMount(() => {
             updateCurrentClassCode();
+            if (!formSchema.module.customStyleFile) {
+                formSchema.module.customStyleFile = customStyleFilePath();
+            }
         });
 
         context.expose({
@@ -136,15 +149,19 @@ export default defineComponent({
             return (
                 <div class="f-custom-class-editor">
                     <FSplitter class="f-designer-page-content">
-                        <FSplitterPane class="f-designer-page-content-nav" width={200} position="left" resizable={true}>
+                        <FSplitterPane class="f-designer-page-content-nav" width={200} position="left" resizable={true} style="background: #fff">
                             <div class="view-model-list">
                                 {renderViewModelNavgation()}
                             </div>
                         </FSplitterPane>
                         <FSplitterPane class="f-designer-page-content-main" position="center">
-                            <MonacoEditor ref={monacoEditorRef} v-model={currentClassCode.value} language={"css"}></MonacoEditor>
+                            <MonacoEditor ref={monacoEditorRef} v-model={currentClassCode.value} language={"scss"}></MonacoEditor>
                         </FSplitterPane>
                     </FSplitter>
+                    <div class="d-flex align-items-center px-2" style="height: 42px;">
+                        <span style="width: 80px;">部署路径：</span>
+                        <input type="text" class="form-control" v-model={formSchema.module.customStyleFile} />
+                    </div>
                 </div >
             );
         };
diff --git a/packages/designer/src/components/components/form-designer/form-designer.component.tsx b/packages/designer/src/components/components/form-designer/form-designer.component.tsx
index 96f444f883..f6a4178787 100644
--- a/packages/designer/src/components/components/form-designer/form-designer.component.tsx
+++ b/packages/designer/src/components/components/form-designer/form-designer.component.tsx
@@ -128,7 +128,7 @@ export default defineComponent({
 
         const customClassEditorClass = computed(() => {
             return {
-                'pl-2 pr-2 d-flex': true,
+                'pl-2 pr-2 d-flex ml-2': true,
                 'f-designer-view-tabs-item': true,
                 'active': activeDesignerView.value === 'customClassEditor'
             };
@@ -265,8 +265,8 @@ export default defineComponent({
                                     class={formDesignerViewClass.value}>可视化设计器</div>
                                 <div onClick={() => onChangeDesignerView('formDesignerCode')}
                                     class={formDesignerCodeViewClass.value}>设计时代码</div>
-                                {/* <div onClick={() => onChangeDesignerView('customClassEditor')}
-                                    class={customClassEditorClass.value}>自定义样式</div> */}
+                                {<div onClick={() => onChangeDesignerView('customClassEditor')}
+                                    class={customClassEditorClass.value}>自定义样式</div>}
                             </div>
                         </div>
                     </FSplitterPane>
diff --git a/packages/designer/src/components/types/metadata.ts b/packages/designer/src/components/types/metadata.ts
index a73a962a3e..e7048c8bb1 100644
--- a/packages/designer/src/components/types/metadata.ts
+++ b/packages/designer/src/components/types/metadata.ts
@@ -84,6 +84,8 @@ export interface FormMetaDataModule {
     // 自定义样式
     customClass: any;
 
+    customStyleFile?: string;
+
     // 外部模块声明
     extraImports: Array<{ name: string; path: string }>;
 
diff --git a/packages/renderer/src/preview.vue b/packages/renderer/src/preview.vue
index 466b497f82..b8842d6681 100644
--- a/packages/renderer/src/preview.vue
+++ b/packages/renderer/src/preview.vue
@@ -1,7 +1,7 @@
 <!-- eslint-disable import/no-import-module-exports -->
 <!-- eslint-disable max-len -->
 <script setup lang="ts">
-import { inject, Ref, ref } from 'vue';
+import { inject, onMounted, Ref, ref } from 'vue';
 import { useEvent, useModuleConfig, useParamPersistence, useComponentProviders, useLookupProvide, useUIBinding, useEventEmitter, useNavigation, usePagination, useMetadataRefine, useFormInjector, useEventHandlers, useModuleCreator, useModelValue, useSession, useCallbackHandlerRegistry, useHtmlTemplateTransformer, useComponentConfigDependencyResolver } from './composition';
 
 const render = ref();
@@ -36,6 +36,22 @@ function callback(type: string, args: any[]) {
     }
     return handler.handle(type, args);
 }
+
+function addStyleFile() {
+    const styleFilePath = metadata.value?.form.content?.module?.customStyleFile;
+    if (styleFilePath) {
+        const link = document.createElement('link');
+        link.rel = 'stylesheet';
+        link.href = styleFilePath;
+        document.head.appendChild(link);
+    }
+}
+
+onMounted(() => {
+    addStyleFile();
+});
+
+
 </script>
 <template>
     <f-dynamic-view :schema="schema" :model-value="modelValue" @event="onEventHandler" :callback="callback"
diff --git a/packages/ui-vue/components/component/src/component.component.tsx b/packages/ui-vue/components/component/src/component.component.tsx
index 079d6a38cf..2b18800f62 100644
--- a/packages/ui-vue/components/component/src/component.component.tsx
+++ b/packages/ui-vue/components/component/src/component.component.tsx
@@ -13,7 +13,7 @@ export default defineComponent({
             context.emit('afterViewInit', props.id);
         });
         return () => {
-            return <div class={props.customClass}>{context.slots.default && context.slots.default()}</div>;
+            return <div formcode={props.formCode} class={props.id + ' ' +  props.customClass}>{context.slots.default && context.slots.default()}</div>;
         };
     }
 });
diff --git a/packages/ui-vue/components/component/src/component.props.ts b/packages/ui-vue/components/component/src/component.props.ts
index d681b0fcf6..f7d9c42beb 100644
--- a/packages/ui-vue/components/component/src/component.props.ts
+++ b/packages/ui-vue/components/component/src/component.props.ts
@@ -10,7 +10,8 @@ export const componentProps = {
     customClass: { type: String, default: '' },
     customStyle: { type: String, default: '' },
     componentType: { type: String, default: '' },
-    formColumns: { type: Number, default: 4 }
+    formColumns: { type: Number, default: 4 },
+    formCode: { type: String, default: '' }
 } as Record<string, any>;
 
 export type ComponentPropsType = ExtractPropTypes<typeof componentProps>;
diff --git a/packages/ui-vue/components/component/src/schema/component.schema.json b/packages/ui-vue/components/component/src/schema/component.schema.json
index 85176eecdd..be3c90f471 100644
--- a/packages/ui-vue/components/component/src/schema/component.schema.json
+++ b/packages/ui-vue/components/component/src/schema/component.schema.json
@@ -22,6 +22,10 @@
             "description": "The viewModel string of component",
             "type": "string"
         },
+        "formCode": {
+            "description": "The formCode string of component",
+            "type": "string"
+        },
         "appearance": {
             "description": "",
             "type": "object",
diff --git a/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx b/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
index e4f6f8848e..645c90b9ea 100644
--- a/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
+++ b/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
@@ -127,6 +127,11 @@ const FDynamicView = defineComponent({
                 ...resolveModels(viewSchema),
                 ...resolveExtraProps(viewSchema)
             };
+
+            if (componentKey === 'component') {
+                viewProps['formCode'] = schema.value?.module?.code;
+            }
+
             const props = {
                 ...viewProps,
                 key: viewSchema.id,
@@ -343,6 +348,8 @@ const FDynamicView = defineComponent({
             if (!frameComponent) {
                 return null;
             }
+
+            frameComponent['formCode'] =  schema.value?.module?.code;
             return frameComponent;
         }
 
-- 
Gitee


From 5df0e8c88391145751737a271f5b479fbf206aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=A7=80=E6=89=8D?= <hxl_apple@163.com>
Date: Tue, 22 Apr 2025 12:12:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=A1=A8=E5=8D=95=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89CSS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/component/src/component.component.tsx      | 8 ++++++--
 .../ui-vue/components/component/src/component.props.ts    | 2 +-
 .../components/component/src/schema/component.schema.json | 4 ----
 .../dynamic-view/src/dynamic-view.component.tsx           | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/ui-vue/components/component/src/component.component.tsx b/packages/ui-vue/components/component/src/component.component.tsx
index 2b18800f62..4f080d68e8 100644
--- a/packages/ui-vue/components/component/src/component.component.tsx
+++ b/packages/ui-vue/components/component/src/component.component.tsx
@@ -1,4 +1,4 @@
-import { SetupContext, defineComponent, onBeforeMount, onMounted } from 'vue';
+import { SetupContext, defineComponent, onBeforeMount, onMounted, ref } from 'vue';
 import { ComponentPropsType, componentProps } from './component.props';
 
 export default defineComponent({
@@ -6,14 +6,18 @@ export default defineComponent({
     props: componentProps,
     emits: ['init', 'afterViewInit'],
     setup(props: ComponentPropsType, context) {
+        const elementRef = ref<HTMLElement>();
         onBeforeMount(() => {
             context.emit('init', props.id);
         });
         onMounted(() => {
+            if (elementRef.value && props.code) {
+               elementRef.value.setAttribute('scope-'+ props.code.toLowerCase(), '');
+            }
             context.emit('afterViewInit', props.id);
         });
         return () => {
-            return <div formcode={props.formCode} class={props.id + ' ' +  props.customClass}>{context.slots.default && context.slots.default()}</div>;
+            return <div ref={elementRef} class={props.id + ' ' +  props.customClass}>{context.slots.default && context.slots.default()}</div>;
         };
     }
 });
diff --git a/packages/ui-vue/components/component/src/component.props.ts b/packages/ui-vue/components/component/src/component.props.ts
index f7d9c42beb..d8db90857f 100644
--- a/packages/ui-vue/components/component/src/component.props.ts
+++ b/packages/ui-vue/components/component/src/component.props.ts
@@ -11,7 +11,7 @@ export const componentProps = {
     customStyle: { type: String, default: '' },
     componentType: { type: String, default: '' },
     formColumns: { type: Number, default: 4 },
-    formCode: { type: String, default: '' }
+    code: { type: String, default: '' }
 } as Record<string, any>;
 
 export type ComponentPropsType = ExtractPropTypes<typeof componentProps>;
diff --git a/packages/ui-vue/components/component/src/schema/component.schema.json b/packages/ui-vue/components/component/src/schema/component.schema.json
index be3c90f471..85176eecdd 100644
--- a/packages/ui-vue/components/component/src/schema/component.schema.json
+++ b/packages/ui-vue/components/component/src/schema/component.schema.json
@@ -22,10 +22,6 @@
             "description": "The viewModel string of component",
             "type": "string"
         },
-        "formCode": {
-            "description": "The formCode string of component",
-            "type": "string"
-        },
         "appearance": {
             "description": "",
             "type": "object",
diff --git a/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx b/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
index 645c90b9ea..1d3cb3f0ac 100644
--- a/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
+++ b/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
@@ -129,7 +129,7 @@ const FDynamicView = defineComponent({
             };
 
             if (componentKey === 'component') {
-                viewProps['formCode'] = schema.value?.module?.code;
+                viewProps['code'] = schema.value?.module?.code;
             }
 
             const props = {
-- 
Gitee


From 0fe21ab993c1148923dcb621bf025ef360db4b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=A7=80=E6=89=8D?= <hxl_apple@163.com>
Date: Tue, 22 Apr 2025 17:18:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dynamic-view/src/dynamic-view.component.tsx       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx b/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
index 1d3cb3f0ac..4cfb17800e 100644
--- a/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
+++ b/packages/ui-vue/components/dynamic-view/src/dynamic-view.component.tsx
@@ -349,7 +349,6 @@ const FDynamicView = defineComponent({
                 return null;
             }
 
-            frameComponent['formCode'] =  schema.value?.module?.code;
             return frameComponent;
         }
 
-- 
Gitee


From 58247f26e44e9c83eb09af8fd280764cea6d511f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=A7=80=E6=89=8D?= <hxl_apple@163.com>
Date: Wed, 23 Apr 2025 10:16:22 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feature:=20=E8=A1=A8=E5=8D=95=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E6=97=B6lookup=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=85=8D=E7=BD=AE=E6=98=A0=E5=B0=84=E5=88=B0?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../combo-tree/src/combo-tree.component.tsx      |  3 ++-
 .../src/components/tree-container.component.tsx  | 16 ++++++++++++++--
 .../combo-tree/src/schema/combo-tree.schema.json | 10 ++++++++++
 .../property-config/lookup.property-config.ts    |  4 ++--
 .../src/mapping-editor.component.tsx             |  1 +
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx b/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx
index 4881cf5a63..ee0ce30277 100644
--- a/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx
+++ b/packages/ui-vue/components/combo-tree/src/combo-tree.component.tsx
@@ -89,7 +89,7 @@ export default defineComponent({
                     tabIndex={props.tabIndex}
                     enableTitle={props.enableTitle}
                     multiSelect={props.multiSelect}
-                    inputType={props.multiSelect ? 'tag' : 'text'}
+                    inputType={props.viewType}
                     popupOnClick={true}
                     v-model={displayText.value}
                     onClear={onClear}
@@ -109,6 +109,7 @@ export default defineComponent({
                         selectedValues={modelValue.value}
                         onSelectionChange={onSelectionChange}
                         formatter={props.formatter}
+                        multiSelect={props.multiSelect}
                         editorParams={props.editorParams}
                         repositoryToken={props.repositoryToken}
                         customRowStatus={props.customRowStatus}
diff --git a/packages/ui-vue/components/combo-tree/src/components/tree-container.component.tsx b/packages/ui-vue/components/combo-tree/src/components/tree-container.component.tsx
index 5daf4d1b45..2faa7a7786 100644
--- a/packages/ui-vue/components/combo-tree/src/components/tree-container.component.tsx
+++ b/packages/ui-vue/components/combo-tree/src/components/tree-container.component.tsx
@@ -20,6 +20,13 @@ export default defineComponent({
             customRowStatus: props.customRowStatus
         };
 
+        const selectionOptions = {
+            enableSelectRow: true,
+            multiSelect: props.multiSelect, 
+            showCheckbox: props.multiSelect,
+            multiSelectMode: 'OnCheckAndClick'
+        };
+
         let repository: any = null;
         if (props.repositoryToken) {
             repository = inject<ComboTreeHttpService>(props.repositoryToken);
@@ -63,8 +70,12 @@ export default defineComponent({
                 });
             }
             // 打开下拉面板 默认选中当前行
-            if(selectionValues.value){
-                treeViewRef.value.activeRowById(selectionValues.value[0]);
+            if(selectionValues.value && selectionValues.value.length) {
+                if (props.multiSelect) {
+                    treeViewRef.value.selectItemByIds(selectionValues.value);
+                } else {
+                    treeViewRef.value.activeRowById(selectionValues.value[0]);
+                }
             }
         });
 
@@ -82,6 +93,7 @@ export default defineComponent({
                         columnOption={{ fitColumns: true, fitMode: 'expand' }}
                         rowOption={rowOption}
                         rowNumber={{enable:false}}
+                        selection={selectionOptions}
                     ></FTreeView>
                 </div>
             );
diff --git a/packages/ui-vue/components/combo-tree/src/schema/combo-tree.schema.json b/packages/ui-vue/components/combo-tree/src/schema/combo-tree.schema.json
index f2cf9285a5..bc1b4f86a6 100644
--- a/packages/ui-vue/components/combo-tree/src/schema/combo-tree.schema.json
+++ b/packages/ui-vue/components/combo-tree/src/schema/combo-tree.schema.json
@@ -127,6 +127,16 @@
             "description": "",
             "type": "number",
             "default": 160
+        },
+        "multiSelect": {
+            "description": "",
+            "type": "boolean",
+            "default": false
+        },
+        "idField": {
+            "description": "",
+            "type": "string",
+            "default": "id"
         }
     },
     "required": [
diff --git a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts
index 474aa68545..eae13f01b2 100644
--- a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts
+++ b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts
@@ -389,13 +389,13 @@ export class LookupPropertyConfig extends InputBaseProperty {
                             formatter: (cell, data) => {
                                 return `${data.raw['name']} [${data.raw['bindingPath']}]`;
                             },
-                            idField: 'id',
+                            idField: 'bindingPath',
                             textField: 'bindingPath',
                             valueField: 'bindingPath',
                             repositoryToken: FieldSelectorRepositoryToken
                         },
                         toData: {
-                            idField: 'id',
+                            idField: 'bindingPath',
                             textField: 'bindingPath',
                             valueField: 'bindingPath',
                             dataSource: this.designViewModelUtils.getAllFields2TreeByVMId(this.viewModelId),
diff --git a/packages/ui-vue/components/mapping-editor/src/mapping-editor.component.tsx b/packages/ui-vue/components/mapping-editor/src/mapping-editor.component.tsx
index fb7ec0f506..788f9c7e55 100644
--- a/packages/ui-vue/components/mapping-editor/src/mapping-editor.component.tsx
+++ b/packages/ui-vue/components/mapping-editor/src/mapping-editor.component.tsx
@@ -58,6 +58,7 @@ export default defineComponent({
                     formatter: props.toData.formatter,
                     editorParams: props.toData.editorParams,
                     editable: false,
+                    multiSelect: true,
                     customRowStatus: treeNodeStatus
                 }
             }
-- 
Gitee