ocpview-plus 1.1.9 → 1.2.0

package/src/components/grid/basegrid.vue

@@ -10,7 +10,7 @@ export default {
                 cellbeginedit:'',
                 showHeader: true,
                 showIndex: true,
-                showStripe:false, 
+                showStripe:false,
                 showBorder: true,
                 showCheckBox: false,
                 showCondition:false,
@@ -89,7 +89,7 @@ export default {
         config: {
             type: Object,
             default: () => {
-                return {};          
+                return {};
             }
         },
         dictData: {
@@ -99,7 +99,7 @@ export default {
         toolConfig: {
             type: Object,
             default: () => {
-                return {};          
+                return {};
             }
         },
         isPop:{
@@ -128,7 +128,7 @@ export default {
                     currentHeight =  currentHeight - Number(this.outsideHeight);
                 }
                 if (this.myConfig.showSummary) {
-                    currentHeight = currentHeight  - 50; 
+                    currentHeight = currentHeight  - 50;
                 }
                 return currentHeight;
             } else {
@@ -139,14 +139,14 @@ export default {
             if (this.myConfig.dynamicHeight) {
                 let currentHeight = this.currentHeight - this.extraHeight - this.outsideHeight;
                 if (this.myConfig.showSummary) {
-                    currentHeight = currentHeight  - 50; 
+                    currentHeight = currentHeight  - 50;
                 }
                 return currentHeight;
             } else {
                 return null;
             }
         }
-        
+
     },
     methods: {
         init() {
@@ -209,7 +209,7 @@ export default {
                     }
                 }
             }
-            
+
             this.operFixedFlag = this.myConfig.operFixedFlag;
             if (this.myConfig.items && this.myConfig.items.length > 0) {
                 this.myConfig.items.some(el => {
@@ -293,7 +293,7 @@ export default {
                 action.width = 120;
                 if (this.myToolConfig.items.length  === 1) {
                     action.width = 80;
-                } 
+                }
                 action.align = 'center';
                 if (this.customInitOperColumn) {
                     this.customInitOperColumn(action, columns);
@@ -353,7 +353,7 @@ export default {
             const length = this.myConfig.items.length;
             for (let i = 0; i < length; i++) {
                 if (this.myConfig.items[i].visible !== false) {
-                    //this.setColumn(i); 
+                    //this.setColumn(i);
                     // 添加复杂列项的支持
                     this.initCommonColumn(this.myConfig.items[i],columns,summaryColumn,newRow);
                 } else {
@@ -382,6 +382,11 @@ export default {
             if (!column.contentAlign) {
                 column.contentAlign = column.align;
             }
+            // column.label 判空
+            /*if (column.label && column.label.trim() !== '') {
+                column.label += ":::";
+            }*/
+
             column.title = column.label;
             if (!column.headClassName) {
                 if (this.myConfig.headClassName !== undefined) {
@@ -390,7 +395,7 @@ export default {
             } else {
                 column.className = column.headClassName;
             }
-            
+
             if (obj.children && obj.children.length > 0) {
                 column.children = [];
                 for (let i=0;i<obj.children.length; i++) {
@@ -415,7 +420,7 @@ export default {
             }
 
             this.setColumnPro(column,type,summaryColumn,newRow);
-          
+
             if (type !== 'render') {
                 if (column.render === undefined)  {
                     if (this.setCustomColumn) {
@@ -430,13 +435,13 @@ export default {
                 if (type === 'picturebox') {
                     if (column.height === undefined) {
                         column.height = 40;
-                    } 
+                    }
                     column.isGrid = true;
                 }
                 if (type === 'videobox') {
                     if (column.height === undefined) {
                         column.height = 60;
-                    } 
+                    }
                 }
                 if (this.myConfig.readOnly) {
                     column.readOnly = true;
@@ -445,14 +450,14 @@ export default {
                         column.readOnly = false;
                     }
                 }
-               
+
             }
             if (column.required) {
                 if (!column.className) {
                     column.className = 'efuture-grid-head-required';
                 }
             }
-           
+
             // 事件绑定
             if (column.valueChanged) {
                 column.valueChanged = this.valueChanged;
@@ -473,7 +478,7 @@ export default {
         },
         setColumn(i) {
             let  column = this.$Method.copy(this.myConfig.items[i]);
-            
+
             column.title = column.label;
             let type = '';
             if (column.type) {
@@ -482,7 +487,7 @@ export default {
             if (!type) {
                 return;
             }
-          
+
             column.key = column.name;
             if (Number(column.width)) {
                 column.width = Number(column.width);
@@ -491,7 +496,7 @@ export default {
             }
 
             this.setColumnPro(column,type);
-          
+
             if (type !== 'render') {
                 if (column.render === undefined)  {
                     if (this.setCustomColumn) {
@@ -506,31 +511,31 @@ export default {
                 if (type === 'picturebox') {
                     if (column.height === undefined) {
                         column.height = 40;
-                    } 
+                    }
                 }
                 if (type === 'videobox') {
                     if (column.height === undefined) {
                         column.height = 60;
-                    } 
+                    }
                 }
                 if (this.myConfig.readOnly) {
                     column.readOnly = true;
                 } else {
                     column.readOnly = false;
                 }
-               
+
             }
             if (column.required) {
                 if (!column.className) {
                     column.className = 'efuture-grid-head-required';
                 }
             }
-            
+
             if (!column.contentAlign) {
                 if (!column.align) {
                     column.contentAlign = column.align;
                 }
-               
+
             }
             // 事件绑定
             if (this.myConfig.items[i].valueChanged) {
@@ -580,13 +585,13 @@ export default {
                     }
                  } else {
                     if (!column.contentAlign) {
-                        column.contentAlign = 'center'; 
+                        column.contentAlign = 'center';
                     }
                     if (!column.align) {
                         column.align = 'center';
                     }
                  }
-                
+
             } else {
                 if (!column.contentAlign) {
                     column.contentAlign = 'left';
@@ -602,9 +607,9 @@ export default {
                         dictkey = column.customDictkey;
                     }
                     column.data = this.currentDictData[dictkey];
-                } 
+                }
             }
-           
+
             //  处理默认值
             if (column.defaultValue !== undefined) {
                 newRow[column.name] = column.defaultValue;
@@ -613,7 +618,7 @@ export default {
                     let min = '';
                     if (column.min !== undefined) {
                         min = column.min;
-                    } 
+                    }
                     if (column.smin !== undefined) {
                         min = column.smin;
                     }
@@ -628,7 +633,7 @@ export default {
                             column.defaultValue = '';
                         }
                     }
-                  
+
                 } else {
                     if (newRow !== undefined) {
                         if (column.type === 'poptagbox') {
@@ -638,7 +643,7 @@ export default {
                         }
                     }
                 }
-            }  
+            }
         },
         expandRendel(h, params) {
             return h('div', [
@@ -651,7 +656,7 @@ export default {
                         this.editIndex = params.index;
                         this.input(val);
                         //this.editValueChanged(params,val);
-                    } 
+                    }
                 })
             ]);
         },
@@ -664,7 +669,7 @@ export default {
                 return this.myConfig.indexMethod(row, index);
             } else {
                 return index;
-            }           
+            }
         },
         actionRender (h, params) {
             return h('div', [
@@ -673,7 +678,7 @@ export default {
                         tooltype:'row',
                         moduleMethod:this.globalConfig.moduleMethod,
                         row:params.row,
-                        onDoAction:(val) => {                       
+                        onDoAction:(val) => {
                             val.rowinfo = params;
                             if (val.name === 'editRowForm') {
                                 if (this.initRowForm) {
@@ -699,7 +704,7 @@ export default {
                 if (this.data[_index].flag === undefined || this.data[_index].flag === 'U') {
                     this.data[_index].flag = 'D';
                     const row = this.$Method.copy(this.data[_index]);
-                    this.delData.push(row); 
+                    this.delData.push(row);
                 }
                 this.data.splice(_index, 1);
             }
@@ -767,7 +772,7 @@ export default {
                 if (btnList) {
                     this.globalConfig.moduleMethod = btnList.modulemethod;
                 }
-            } 
+            }
         },
         getSelection() {
             return  this.$refs.table.getSelection();
@@ -794,11 +799,11 @@ export default {
             if (obj.evalue !== undefined) {
                 tempRow[obj.ename] = obj.evalue;
             }
-           
+
             if (this.data[index].flag === undefined) {
                 tempRow.flag = 'U';
             }
-           
+
             if (obj.customRows && obj.customRows.length > 0){
                 let self = this;
                 // 处理更新行
@@ -822,9 +827,9 @@ export default {
             } else {
                 let newRow = Object.assign({},this.data[index],tempRow);
                 this.$nextTick(() => {
-                    this.data.splice(index,1,newRow); 
+                    this.data.splice(index,1,newRow);
                 });
-                
+
             }
 
         },
@@ -853,14 +858,14 @@ export default {
                             if (this.myConfig.checkByHighlight) {
                                 el._highlight = flag;
                             }
-                        } 
+                        }
                     } else {
                         el._checked = false;
                         el._highlight = false;
-                    } 
+                    }
                 });
                 this.$nextTick(() => {
-                    this.data = data; 
+                    this.data = data;
                 });
             // 多选
             } else {
@@ -873,16 +878,16 @@ export default {
                     if (this.myConfig.onSetRowCheckBefore) {
                         if (this.myConfig.onSetRowCheckBefore(index,flag)) {
                             this.$nextTick(() => {
-                                this.data.splice(index,1,newRow); 
+                                this.data.splice(index,1,newRow);
                                 this.tempData.splice(index,1,newRow);
                             });
                         }
                     } else {
                         this.$nextTick(() => {
-                            this.data.splice(index,1,newRow); 
+                            this.data.splice(index,1,newRow);
                             this.tempData.splice(index,1,newRow);
                         });
-                    } 
+                    }
                 }
             }
         },
@@ -895,7 +900,7 @@ export default {
                 }
             });
             this.$nextTick(() => {
-                this.data = data; 
+                this.data = data;
             });
         },
         setRowDisabled(index , flag) {
@@ -903,8 +908,8 @@ export default {
                 let newRow = Object.assign({},this.data[index],{});
                 newRow._disabled = flag;
                 this.$nextTick(() => {
-                    this.data.splice(index,1,newRow); 
-                    this.tempData.splice(index,1,newRow); 
+                    this.data.splice(index,1,newRow);
+                    this.tempData.splice(index,1,newRow);
                 });
             }
         },
@@ -914,7 +919,7 @@ export default {
                 el._disabled = flag;
             });
             this.$nextTick(() => {
-                this.data = data; 
+                this.data = data;
             });
         },
         setRowHighlight(index , flag) {
@@ -922,7 +927,7 @@ export default {
                 let newRow = Object.assign({},this.data[index],{});
                 newRow._highlight = flag;
                 this.$nextTick(() => {
-                    this.data.splice(index,1,newRow); 
+                    this.data.splice(index,1,newRow);
                     this.tempData.splice(index,1,newRow);
                 });
             }
@@ -933,7 +938,7 @@ export default {
                 el._highlight = flag;
             });
             this.$nextTick(() => {
-                this.data = data; 
+                this.data = data;
             });
         },
         commonRendel(h, params) {
@@ -950,11 +955,11 @@ export default {
                     },
                     onDoAction:(val) =>{
                         this.doAction(val);
-                    }     
+                    }
                 })
             ]);
         },
-       
+
         setExtraHeight () {
             let height = 0;
             if (this.$refs.head) {
@@ -986,7 +991,7 @@ export default {
                         }
                     }
                 }
-            }  
+            }
         },
         findColumnConfig(name,config) {
             if (name) {
@@ -1031,7 +1036,7 @@ export default {
                         }
                     }
                 }
-            }  
+            }
         },
         openHelp () {
             window.open(this.curHelpUrl);
@@ -1048,16 +1053,16 @@ export default {
         },
         makeTableColumns(val) {
             this.total_summary = {};
-            this.newRow = deepCopy(val.newRow); 
-            this.summaryColumn = deepCopy(val.summaryColumn); 
+            this.newRow = deepCopy(val.newRow);
+            this.summaryColumn = deepCopy(val.summaryColumn);
             this.tableColumns = deepCopy(val.columns);
             let soltTableColumns = [];
             this.getSoltTableColumns(val.columns, soltTableColumns);
             this.soltTableColumns = soltTableColumns;
         }
     },
-    mounted () { 
-        
+    mounted () {
+
     }
 };
-</script>
+</script>

package/src/components/masterplate/base.vue

@@ -193,8 +193,10 @@ export default {
             }
             this.setDictData();
             this.importReset = false;
+            // this.loadDynamicConfig();
             this.$nextTick(() => {
                 this.importReset = true;
+
             });
         },
         initUiConfig(obj,tmp) {
@@ -313,6 +315,7 @@ export default {
             });
 
         },
+
         commonUiCustomConfig(obj,items) {
             let index = items.findIndex(el => el.name === obj.fieldname || el.sname === obj.fieldname);
             if (index > -1) {
@@ -351,6 +354,151 @@ export default {
                 Object.assign(items[index], tmp);
             }
         },
+        loadDynamicConfig() {
+            try {
+                const postData = {
+                    modulecode: this.globalConfig.modulecode,
+                    moduleid: this.globalConfig.modulecode
+                };
+
+                this.asyncPost(
+                    this.uiconfig.resources,
+                    "uiconfigs.getPageConfig",
+                    postData,
+                    (data) => {
+                        if (!data || !this.uiconfig) {
+                            console.log('1 没有配置数据')
+                            return;
+                        }
+
+                        this.mergeDynamicConfig(
+                            this.uiconfig,
+                            data
+                        );
+                    }
+                );
+            } catch (e) {
+                console.error('动态配置加载失败', e);
+            }
+        },
+
+        /**
+         * 通用递归合并配置
+         * @param {Object} localConfig 本地 config（this.uiconfig）
+         * @param {Object} serverConfig 接口返回 config
+         */
+
+        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;
+        },
         _isFun (pro) {
             let index = this.eventObject.findIndex(el => el === pro);
             if (index > -1) {