ocpview-plus 1.1.8 → 1.2.0

package/src/components/masterplate/lefttreerightdetails.vue

@@ -18,10 +18,10 @@
                         <Row v-if="showCondition">
                           <ControlBox  ref="condition"   style="width: 100%;margin-top:10xp;margin-bottom:10px" :config="conditionConfig"  ></ControlBox>
                         </Row>
-                        <Row>  
+                        <Row>
                             <Input  :placeholder="searchPlaceholder"  v-model="searchValue"  search style="width: 100%;margin-top:10xp;margin-bottom:10px" @on-search="search" @on-enter="search"/>
-                        </Row>    
-                     </div>   
+                        </Row>
+                     </div>
                       <TreeBox v-show="showTree" ref="tree" :config="myConfig.treeConfig"   @onSelectChange="selectChange" />
                       <SimpleViewGrid  v-show="!showTree"  ref="grid" :config="myConfig.gridConfig" :dictData="dictData" @rowclick="gridClick"/>
                 </Card>
@@ -87,7 +87,7 @@ export default {
         moduleMethod:{
             type:Array,
             default: () => {
-                return [];      
+                return [];
             }
         }
     },
@@ -161,7 +161,7 @@ export default {
             this.setCustomTreeNodeIcon = this.myConfig.treeConfig.setTreeNodeIcon;
         }
         this.myConfig.treeConfig.setTreeNodeIcon = this.setTreeNodeIcon;
-      
+
         // 处理按钮
         if (this.myConfig.menuToolbar !== undefined) {
           this.menuToolbar = Object.assign({}, this.menuToolbar, this.myConfig.menuToolbar);
@@ -173,13 +173,13 @@ export default {
         this.myConfig.detailConfig.showAnchorLink = false;
         this.myConfig.detailConfig.response = this.myConfig.response;
         this.myConfig.detailConfig.adjustHeight = 0;
-        this.myConfig.detailConfig.resources = this.myConfig.resources; 
+        this.myConfig.detailConfig.resources = this.myConfig.resources;
     },
     methods:{
         selectChange (e) {
             let obj = {};
             let self = this;
-            obj.onOk = () => {    
+            obj.onOk = () => {
                 if (e && e.length > 0) {
                     self.$refs.menutoolbar.setAllReadOnly(true);
                     self.treeSeletedNode = self.$Method.copy(e);
@@ -256,7 +256,7 @@ export default {
                 this.$refs.form.setReadOnly(true);
                 this.$refs.menutoolbar.setAllReadOnly(true);
             }
-           
+
             return data;
         },
         gridClick(e) {
@@ -327,7 +327,7 @@ export default {
             let rootNode = this.$refs.tree.getRootNode();
             if (para[this.myConfig.treeConfig.idField]  === rootNode[this.myConfig.treeConfig.idField]) {
                 data = this.$Method.copy(rootNode);
-                this.$refs.menutoolbar.setReadOnly(['addChildData'], false); 
+                this.$refs.menutoolbar.setReadOnly(['addChildData'], false);
             } else {
                 data = this.getFormData(para);
                 if (this.$refs.tree.isChildren(para)) {
@@ -339,7 +339,7 @@ export default {
             if (this.$parent.setBillData) {
                 data = this.$parent.setBillData(data);
             }
-            this.$refs.form.setData(data); 
+            this.$refs.form.setData(data);
             this.$nextTick(() => {
                 this.$refs.form.setReadOnly(true);
             });
@@ -394,13 +394,13 @@ export default {
                             this.alert('当前节点不允许修改');
                             return false;
                         }
-                        
+
                         this.$refs.form.setReadOnly(false);
-                        
+
                         this.$refs.menutoolbar.setReadOnly('editData', true);
                         this.$refs.menutoolbar.setReadOnly('saveData', false);
                     }
-                     
+
                     if (this.$parent[methodAfter]) {
                         this.$parent[methodAfter]();
                     }
@@ -415,12 +415,12 @@ export default {
                     flag = this.$refs.form.isEdit();
                     if (flag) {
                         this.alert('存在数据未确认');
-                        return false; 
+                        return false;
                     }
                     let data = this.$refs.form.getChangeData();
                     obj.para = [];
                     obj.para.push(data);
-                    
+
                 }
                 if (obj.name === 'delData') {
                     let tempData = this.$refs.form.getData();
@@ -531,20 +531,27 @@ export default {
             let height2 = this.$refs.head.offsetHeight;
             this.$refs.form.setOutsideHeight(height2);
         },
-        setTreeNodeIcon(params,obj) {
-            if (params.node && params.node.children && params.node.children.length > 0) {
+        setTreeNodeIcon(params, obj) {
+
+            const hasChildren =
+                params.data.children &&
+                params.data.children.length > 0
+
+            if (hasChildren) {
                 if (params.data.expand) {
-                    obj.type = '_custom-wenjianzhankai';
+                    obj.type = '_custom-wenjianzhankai'
                 } else {
-                    obj.type = '_custom-wenjianshouqi';
+                    obj.type = '_custom-wenjianshouqi'
                 }
             } else {
-                obj.type = '_custom-yemian';
+                obj.type = '_custom-yemian'
             }
-            if (this.setCustomTreeNodeIcon){
-                obj = this.setCustomTreeNodeIcon(params,obj)
+
+            if (this.setCustomTreeNodeIcon) {
+                obj = this.setCustomTreeNodeIcon(params, obj)
             }
-            return obj;
+
+            return obj
         },
         getSelectedNode() {
             let obj = {};
@@ -567,7 +574,7 @@ export default {
             if (this.conditionConfig.onChange) flag = this.conditionConfig.onChange(e);
             if (flag === undefined) flag = true;
             if (!flag) return flag;
-            
+
             this.$nextTick(() => {
                 let tmp = {};
                 let self = this;
@@ -622,4 +629,4 @@ export default {
 
 <style>
 
-</style>
+</style>

package/src/components/masterplate/listdetails.vue

@@ -68,7 +68,7 @@ export default {
         moduleMethod:{
             type:Array,
             default: () => {
-                return [];      
+                return [];
             }
         }
     },
@@ -112,7 +112,7 @@ export default {
             }
         });
 
-       
+
 
         // 处理详情
         if (this.myConfig.detailConfig.showAnchorLink === undefined) {
@@ -126,8 +126,8 @@ export default {
         this.myConfig.detailConfig.billKey = this.billKey;
         this.myConfig.detailConfig.adjustHeight = 0;
         this.myConfig.detailConfig.modulecode = this.myConfig.modulecode;
-        this.myConfig.detailConfig.resources = this.myConfig.resources; 
-        this.myConfig.detailConfig.response = this.myConfig.response; 
+        this.myConfig.detailConfig.resources = this.myConfig.resources;
+        this.myConfig.detailConfig.response = this.myConfig.response;
         this.menuToolbar = Object.assign({},this.menutoolbar,this.myConfig.menuToolbar);
         this.menuToolbar.billisworkflow = this.myConfig.billisworkflow;
         if (this.myConfig.detailConfig.billapproveurl) {
@@ -152,10 +152,10 @@ export default {
         }
         if (this.myConfig.billPrintConfig) {
             if (this.myConfig.billPrintConfig.showPrint) {
-                this.menuToolbar.printmodel = this.myConfig.billPrintConfig.showPrint; 
+                this.menuToolbar.printmodel = this.myConfig.billPrintConfig.showPrint;
             }
             if (this.myConfig.billPrintConfig.showContPrint) {
-                this.menuToolbar.contprintmodel = this.myConfig.billPrintConfig.showContPrint; 
+                this.menuToolbar.contprintmodel = this.myConfig.billPrintConfig.showContPrint;
             }
         }
 
@@ -165,8 +165,149 @@ export default {
 
         this.billApprovalConfig.resources = this.myConfig.resources;
         this.billApprovalConfig.classPrefix = this.myConfig.classPrefix;
+        // this.loadDynamicConfig();
+
     },
     methods:{
+        loadDynamicConfig() {
+            try {
+                const modulecode = this.$Method.getUrlParam("modulecode")
+                const postData = {
+                    modulecode: modulecode,
+                    moduleid: modulecode
+                };
+
+                this.asyncPost(
+                    this.myConfig.resources,
+                    "uiconfigs.getPageConfig",
+                    postData,
+                    (data) => {
+                        if (!data || !this.myConfig) {
+                            console.log('1 没有配置数据')
+                            return;
+                        }
+
+                        this.mergeDynamicConfig(
+                            this.myConfig,
+                            data
+                        );
+                    }
+                );
+            } catch (e) {
+                console.error('动态配置加载失败', e);
+            }
+        },
+        mergeDynamicConfig(localConfig, serverConfig) {
+            if (!localConfig || !serverConfig) {
+                console.log('1 没有配置数据')
+                return;
+            }
+
+            // ✅ 1️⃣ 处理 billQueryConfig
+            if (
+                localConfig.billQueryConfig.gridConfig.items &&
+                serverConfig.billQueryConfig.gridConfig.items
+            ) {
+                this.mergeFlatItems(
+                    localConfig.billQueryConfig.gridConfig.items,
+                    serverConfig.billQueryConfig.gridConfig.items
+                );
+            }
+
+            // ✅ 2️⃣ 处理 detailConfig
+            if (localConfig.detailConfig && serverConfig.detailConfig) {
+                this.mergeDetailConfig(
+                    localConfig.detailConfig,
+                    serverConfig.detailConfig
+                );
+            }
+        },
+
+        mergeDetailConfig(localDetail, serverDetail) {
+
+            // ✅ formsConfig
+            if (
+                localDetail.formsConfig.items &&
+                serverDetail.formsConfig.items
+            ) {
+                this.mergeContainerItems(
+                    localDetail.formsConfig.items,
+                    serverDetail.formsConfig.items
+                );
+            }
+
+            // ✅ billDetailConfig
+            if (
+                localDetail.billDetailConfig.items &&
+                serverDetail.billDetailConfig.items
+            ) {
+                this.mergeContainerItems(
+                    localDetail.billDetailConfig.items,
+                    serverDetail.billDetailConfig.items
+                );
+            }
+        },
+
+        mergeContainerItems(localContainers, serverContainers) {
+
+            const containerMap = this.buildItemMap(localContainers);
+
+            serverContainers.forEach(serverContainer => {
+
+                const localContainer = containerMap.get(serverContainer.name);
+                if (!localContainer) {
+                    console.log('2 没有配置localcontainer')
+                    return;
+                }
+
+                // ✅ 合并容器自身属性
+                Object.assign(localContainer, serverContainer);
+
+                // ✅ 如果有子字段
+                if (
+                    Array.isArray(localContainer.items) &&
+                    Array.isArray(serverContainer.items)
+                ) {
+                    this.mergeFlatItems(
+                        localContainer.items,
+                        serverContainer.items
+                    );
+                }
+            });
+        },
+
+        mergeFlatItems(localItems, serverItems) {
+            const fieldMap = this.buildItemMap(localItems);
+
+            serverItems.forEach(serverItem => {
+                const localItem = fieldMap.get(serverItem.name);
+                if (localItem) {
+                    console.log('合并', localItem)
+                    Object.assign(localItem, serverItem);
+                }
+            });
+        },
+
+        buildItemMap(items, map = new Map()) {
+            if (!Array.isArray(items)) return map;
+
+            items.forEach(item => {
+                if (!item) {
+                    console.log('3 没有配置数据')
+                    return;
+                }
+
+                if (item.name) {
+                    map.set(item.name, item);
+                }
+
+                if (Array.isArray(item.items)) {
+                    this.buildItemMap(item.items, map);
+                }
+            });
+
+            return map;
+        },
         setLogName() {
             this.logName.push({code:this.myConfig.detailConfig.response,name:'主表'});
             this.myConfig.detailConfig.formsConfig.items.forEach(el => {
@@ -287,11 +428,11 @@ export default {
                         this.ph_key = '';
                         this.$refs.billqureygrid.refurbish();
                         */
-                    } 
+                    }
                     // 重置
                     if (obj.name === 'resetData') {
                         this.$refs.billqureygrid.getQuick().clearData();
-                    }  
+                    }
 
                     // 编辑
                     if (obj.name === 'editData') {
@@ -328,15 +469,15 @@ export default {
                             this.logData = null;
                         }
                     }
-                    // 上一单 
+                    // 上一单
                     if (obj.name === 'preBill') {
                         this.preBill();
                     }
-                    // 下一单 
+                    // 下一单
                     if (obj.name === 'nextBill') {
                         this.nextBill();
                     }
-    
+
                     if (this.$parent[methodAfter]) {
                         this.$parent[methodAfter]();
                     }
@@ -352,14 +493,14 @@ export default {
                     flag = this.$refs.form.isEdit();
                     if (flag) {
                         this.alert('存在数据未确认');
-                        return false; 
+                        return false;
                     }
                     obj.para = this.$refs.form.getChangeData();
-                } 
+                }
                 if (obj.name === 'saveDetails') {
                     obj.para = this.$refs.form.getChangeData(obj.detailsname);
                     obj.name = 'saveData';
-                } 
+                }
                 if (obj.name === 'delData') {
                     if (this.showHead) {
                         obj.para = data;
@@ -375,7 +516,7 @@ export default {
                             obj.para = temp;
                         }
                     }
-                }  
+                }
                 if (obj.name === 'copyData') {
                     if (!obj.para) {
                         obj.para = {};
@@ -400,7 +541,7 @@ export default {
                         text = '作废';
                         obj.para ={billno:data.billno};
                     }
-                   
+
                     if (obj.name === 'revokeData') {
                         text = '撤回';
                         obj.para ={billno:data.billno};
@@ -410,7 +551,7 @@ export default {
                         if (name) {
                             text = name;
                         }
-                    }   
+                    }
                     let info = '确定是否' + text + '数据？';
                     let self = this;
                     self.$Modal.confirm({
@@ -432,7 +573,7 @@ export default {
             } else {
                 if (this.$refs.form) {
                     this.$resfs.form.doAnchorClick();
-                }   
+                }
             }
         },
         setRowBtnVisible(value) {
@@ -490,7 +631,7 @@ export default {
                     if (this.$parent.setBillData) {
                         data = this.$parent.setBillData(data);
                     }
-                    this.$refs.form.setData(data); 
+                    this.$refs.form.setData(data);
                     this.customPrintData = this.$Method.copy(data);
                     this.$nextTick(() => {
                         this.$refs.form.setReadOnly(true);
@@ -512,7 +653,7 @@ export default {
                             this.getMenuToolbar().setReadOnly(['addData'], false);
                         }
                     }
-                
+
                     if (this.$parent.initFormAfter) {
                         this.$parent.initFormAfter(data);
                     }
@@ -522,9 +663,9 @@ export default {
                     this.$nextTick(() => {
                         this.showHead = true;
                     });
-                },20); 
+                },20);
             });
-           
+
         },
         getMenuToolbar() {
             return this.$refs.menutoolbar;
@@ -569,7 +710,7 @@ export default {
                     formdata = data[self.config.response];
                 });
             }
-          
+
             result.billkey  = para[this.billKey];
             result.formdata = formdata;
             return result;
@@ -629,9 +770,9 @@ export default {
                 }
             } else {
                 this.setPhkey(this.ph_key);
-                this.$refs.billqureygrid.refurbish();  
+                this.$refs.billqureygrid.refurbish();
             }
-           
+
         },
         checkData (obj) {
             let tempflag = false;
@@ -751,6 +892,7 @@ export default {
         }
     },
     mounted () {
+        this.loadDynamicConfig();
         let billno = this.$Method.getUrlParam('billno');
         if (billno) {
             let para = {};
@@ -766,4 +908,4 @@ export default {
 
 <style>
 
-</style>
+</style>

package/src/components/masterplate/simpletree.vue

@@ -4,7 +4,7 @@
          <Input ref="condition" :placeholder="searchPlaceholder"  v-model="searchValue"  search style="width: 100%;margin-top:10xp;margin-bottom:10px" @on-search="search" @on-enter="search"/>
     </div>
     <div class="customLayout" :style="style">
-        <Tree ref="tree" v-show="showTree" :data="treeData" :class="myConfig.className" :show-checkbox="myConfig.showCheckBox"  @on-select-change="onSelectChange" @on-check-change="onCheckChange" @on-toggle-expand="onToggleExpand" :load-data="loadData"/>
+        <CompatTree ref="tree" v-show="showTree" :data="treeData" :class="myConfig.className" :show-checkbox="myConfig.showCheckBox"  @on-select-change="onSelectChange" @on-check-change="onCheckChange" @on-toggle-expand="onToggleExpand" :load-data="loadData"/>
         <SimpleViewGrid v-show="!showTree" v-if="gridReset" ref="grid"  :config="gridConfig"  :dictData="dictData" @dbclick="dbclick"/>
     </div>
 </Card>
@@ -12,8 +12,10 @@
 <script>
     import Base from '@/components/tree/treedatabase.vue';
     import elementResizeDetectorMaker from 'element-resize-detector';
+    import CompatTree from "@/components/tree/CompatTree.vue";
     export default {
         name:'mtreedata',
+        components: {CompatTree},
         extends: Base,
         data () {
             return {
@@ -25,7 +27,7 @@
         created () {
             this.init();
             if (!this.gridConfig) {
-               this.gridConfig = {};     
+               this.gridConfig = {};
             }
             if (this.myConfig.multiSelect !== undefined) {
                 this.gridConfig.multiSelect = this.myConfig.multiSelect;
@@ -39,7 +41,7 @@
                 this.gridConfig.items = this.$Method.copy(this.myConfig.items);
             } else {
                 if (!this.gridConfig.items) {
-                   this.gridConfig.items = []; 
+                   this.gridConfig.items = [];
                 }
                 let code = {
                     label:'编码',
@@ -74,14 +76,14 @@
                            tmp = data;
                            flag = false;
                        }
-                    } 
+                    }
                     if (flag) {
                         data.forEach(el => {
                             if(el[this.myConfig.responseCode].indexOf(this.searchValue) > -1 || el[this.myConfig.responseName].indexOf(this.searchValue) > -1) {
                                 tmp.push(el);
                             }
                         });
-                    }    
+                    }
                     this.gridReset = false;
                     this.$nextTick(() => {
                         this.gridReset = true;
@@ -90,20 +92,26 @@
                             this.showTree = false;
                         });
                     });
-                   
+
                 }
             },
-            setTreeNodeIcon(params,obj) {
-                if (params.node.children.length > 0) {
+            setTreeNodeIcon(params, obj) {
+
+                const hasChildren =
+                    params.data.children &&
+                    params.data.children.length > 0
+
+                if (hasChildren) {
                     if (params.data.expand) {
-                        obj.type = '_custom-wenjianzhankai';
+                        obj.type = '_custom-wenjianzhankai'
                     } else {
-                        obj.type = '_custom-wenjianshouqi';
+                        obj.type = '_custom-wenjianshouqi'
                     }
                 } else {
-                    obj.type = '_custom-yemian';
+                    obj.type = '_custom-yemian'
                 }
-                return obj;
+
+                return obj
             }
         },
         mounted () {
@@ -122,7 +130,7 @@
 
 <style>
 .customLayout{
-    OVERFLOW-Y: auto; 
+    OVERFLOW-Y: auto;
     /*background: url('./images/bg.jpg') no-repeat 4px 5px;*/
 }
 </style>

package/src/components/tree/CompatTree.vue

@@ -0,0 +1,52 @@
+<script>
+import { h } from 'vue'
+import { Tree } from 'view-ui-plus'
+
+export default {
+    name: 'CompatTree',
+
+    components: {
+        Tree
+    },
+
+    props: {
+        data: {
+            type: Array,
+            required: true
+        },
+        render: {
+            type: Function,
+            default: null
+        }
+    },
+
+    methods: {
+
+        // 👇 renderWrapper 就放在这里（methods 里）
+        renderWrapper(slotProps) {
+            const nodeRender =
+                slotProps.data.render || this.render
+
+            if (!nodeRender) {
+                return slotProps.data.title
+            }
+
+            return nodeRender(h, slotProps)
+        }
+
+    }
+}
+</script>
+
+<template>
+    <Tree :data="data">
+        <template #title="slotProps">
+            <!-- 这里调用 renderWrapper -->
+            <component
+                :is="{
+          render: () => renderWrapper(slotProps)
+        }"
+            />
+        </template>
+    </Tree>
+</template>