ocpview-plus 1.2.3 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-plus",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/masterplate/base.vue

@@ -77,7 +77,6 @@ export default {
             this.uiconfig = config;
             Object.assign(this,obj);
             this.init();
-            // this.loadDynamicConfig();
             if (this.customInit) {
                 this.customInit();
             }
@@ -194,10 +193,8 @@ export default {
             }
             this.setDictData();
             this.importReset = false;
-            console.log('---------- base 执行完毕')
             this.$nextTick(() => {
                 this.importReset = true;
-
             });
         },
         initUiConfig(obj,tmp) {
@@ -316,7 +313,6 @@ export default {
             });
 
         },
-
         commonUiCustomConfig(obj,items) {
             let index = items.findIndex(el => el.name === obj.fieldname || el.sname === obj.fieldname);
             if (index > -1) {
@@ -355,158 +351,6 @@ 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
-                        );
-                    }
-                    ,function(data) {
-                        console.error(data)
-                    },function(data) {
-                        console.error(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);
-                console.log(serverItem.name, localItem)
-                if (localItem) {
-                    console.log('合并前', localItem)
-                    Object.assign(localItem, serverItem);
-                    console.log('merge后', JSON.stringify(this.uiconfig))
-                    this.uiconfig = Object.assign({}, this.uiconfig);
-                }
-            });
-        },
-
-        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) {
@@ -567,6 +411,7 @@ export default {
                 return;
             }
             this.$refs.detailappendix.setData(obj.billno,obj.billmoduleid,obj.idkey);
+            this.$refs.detailappendix.setReadOnly(e.readOnly);
             this.$nextTick(() => {
                 if (e.readOnly) {
                     let data = this.$refs.detailappendix.getData();