ocpview-plus 1.2.8 → 1.3.0

package/package.json

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

package/src/components/masterplate/RewriteListdetails/indexV3.vue

@@ -17,6 +17,7 @@
             :config="myConfig.detailConfig"
             :dictData="dictData"
             :moduleMethod="moduleMethod"
+            @handleSuccessAfter="handleSuccessAfter"
             @doAction="doAction"
         >
             <template #toolbar>
@@ -312,6 +313,9 @@ export default {
                 }
             }
         },
+        handleSuccessAfter(response, file, fileList) {
+            this.$emit('handleSuccessAfter' , response, file, fileList);
+        }
     },
     mounted() {},
 };

package/src/components/masterplate/base.vue

@@ -1008,6 +1008,9 @@ export default {
         },
         setHideDividerValue(value) {
             this.$refs.layout.setHideDividerValue(value);
+        },
+        handleSuccessAfter(response, file, fileList) {
+            this.$emit('handleSuccessAfter' , response, file, fileList);
         }
     },
     watch: {

package/src/components/masterplate/billdetailform.vue

@@ -19,7 +19,7 @@
                 <DetailsBoxs  v-if="temp2.type === 'DetailsBox'" :ref="temp2.name"      :config="temp2" :dictData="dictData" @doAction="doAction"/>
                 <FormCardBox  v-if="temp2.type === 'FormCardBox'" :ref="temp2.name"     :config="temp2" :dictData="dictData"/>
                 <AppendixBoxs  v-if="temp2.type === 'AppendixBox'" :ref="temp2.name"   :config="temp2" :modulecode="modulecode" @doAction="doAction"/>
-                <AppendixBoxs2 v-if="temp2.type === 'AppendixBox2'" :ref="temp2.name"   :config="temp2" :dictData="dictData" :modulecode="modulecode" @doAction="doAction"/>
+                <AppendixBoxs2 v-if="temp2.type === 'AppendixBox2'" :ref="temp2.name"   :config="temp2" :dictData="dictData" :modulecode="modulecode" @handleSuccessAfter="handleSuccessAfter" @doAction="doAction"/>
             </div>
         </div>
     </Card>
@@ -219,159 +219,6 @@ export default {
     },
 
     methods:{
-        loadDynamicConfig() {
-            try {
-                const postData = {
-                    modulecode: this.myConfig.modulecode,
-                    moduleid: this.myConfig.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;
-        },
-
         getCurlAnchorData() {
             let tmp = [];
             this.anchorData.forEach(el => {
@@ -1140,6 +987,9 @@ export default {
                     });
                 });
             }
+        },
+        handleSuccessAfter(response, file, fileList) {
+            this.$emit('handleSuccessAfter' , response, file, fileList);
         }
     },
     props:{

package/src/components/masterplate/billquerygrid.vue

@@ -118,13 +118,10 @@ export default {
         this.myConfig.gridConfig.showCondition = false;
         this.myConfig.gridConfig.overrideData = this.gridOverrideData;
         this.myConfig.gridConfig.onSelectionChange = this.gridOnSelectionChange;
-        this.myConfig.gridConfig.resources = this.config.resources;
         this.myConfig.gridConfig.height = 1;
         this.myConfig.gridConfig.adjustHeight = 5;
         this.myConfig.gridConfig.showBorder = true;
         this.myConfig.gridConfig.showStripe = true;
-        this.myConfig.gridConfig.method = this.config.classPrefix + ".search";
-        this.myConfig.gridConfig.response = this.config.response;
         this.myConfig.gridConfig.generalOrientation = true;
         this.myConfig.gridConfig.pageSize = "small";
         this.myConfig.gridConfig.items.forEach((el) => {
@@ -147,6 +144,15 @@ export default {
         if (this.myConfig.gridConfig.initRefresh !== undefined) {
             this.initRefresh = this.myConfig.gridConfig.initRefresh;
         }
+        if (!this.myConfig.gridConfig.method) {
+            this.myConfig.gridConfig.method = this.myConfig.classPrefix + '.search';
+        }
+        if (!this.myConfig.gridConfig.resources) {
+            this.myConfig.gridConfig.resources = this.config.resources;
+        }
+        if (!this.myConfig.gridConfig.response) {
+            this.myConfig.gridConfig.response = this.config.response;
+        }
         if (this.myConfig.enablePermissions !== undefined) {
             this.enablePermissions = this.myConfig.enablePermissions;
         }

package/src/components/masterplate/contractappendix.vue

@@ -90,7 +90,11 @@ export default {
                     name: 'filememo',
                     type: 'ComboBox',
                     dictkey: 'CUSTFILETYPE',
-                    codeWithName: false,
+                    visible: false,
+                }, {
+                    label: '附件类型',
+                    name: 'filemode',
+                    type: 'TextBox',
                     width: 300,
                 }, {
                     label: '文件名称',
@@ -268,7 +272,9 @@ export default {
                 if (this.myConfig.readOnly) {
                     del.readOnly = true;
                 }
-                btnConfig.items.push(del);
+                if (params.row.scenetype !== '0') {
+                    btnConfig.items.push(del);
+                }
             } else {
                 let up = this.$Method.copy(this.rowBtnData[0]);
                 if (this.myConfig.readOnly) {
@@ -398,7 +404,7 @@ export default {
                 this.showPdf(params);
             }
         },
-        handleSuccess (res) {
+        handleSuccess (response, file, fileList) {
             this.getFilesInfo(this.billno, this.modulecode, this.myConfig.notdelfile, this.myConfig.scenetype, this.doInitData);
             this.flag = false;
             if (this.myConfig.scenetype === '4') {
@@ -406,6 +412,7 @@ export default {
             } else {
                 this.hideLoading();
             }
+            this.$emit('handleSuccessAfter' , response, file, fileList);
         },
         handleMaxSize (file) {
             this.alert('文件[' + file.name + ']的文件大小不允许超过' + this.myConfig.fileSize + 'M');

package/src/components/masterplate/layouttemplate.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-   <component ref="layout" :is="uiLayoutType" :config="uiconfig" :dictData="globalConfig.dictData" :moduleMethod="globalConfig.userModuleMethod"  @doAction="doAction" />
+   <component ref="layout" :is="uiLayoutType" :config="uiconfig" :dictData="globalConfig.dictData" :moduleMethod="globalConfig.userModuleMethod" @handleSuccessAfter="handleSuccessAfter" @doAction="doAction" />
    <Modal title="附件" v-model="showDetailAppendix" :width="appendixCurrentWidth" :footer-hide="true">
         <AppendixBoxs v-if="detalAppendixFlag" ref="detailappendix" :config="billDetailAppendixConfig"  @doAction="doAction"/>
     </Modal>

package/src/components/masterplate/lefttreerightdetails.vue

@@ -460,7 +460,7 @@ export default {
                 this.$refs.form.setReadOnly(true);
                 let temp = this.$refs.form.getData();
                 this.treeSeletedNode =[temp];
-                // this.initTree(true);
+                //this.initTree(true);
                 this.$refs.tree.updateNode(temp,'U');
                 if (!this.showTree) {
                     this.$refs.grid.refurbish();

package/src/components/tree/basetree.vue

@@ -799,7 +799,39 @@ export default {
 
         },
 
-        setNodes(data = [], name, value) {
+        setNodes(data, name, value) {
+            let tempName = name;
+            if (name === 'readOnly') {
+                tempName = 'disabled';
+            } else if (name === 'selected') {
+                if (this.myConfig.multiSelect &&  this.myConfig.showCheckBox) {
+                    tempName ='checked';
+                } else {
+                    tempName = 'selected';
+                }
+            }
+            let responseId = this.myConfig.responseId;
+            this.$refs.tree.flatState.forEach(el => {
+                let index = data.findIndex(
+                    el2 => el.node[responseId] === el2[responseId]
+                );
+                if (index > -1) {
+                    if (el.node[tempName] !== value) {
+                        let obj ={};
+                        obj[tempName] = value;
+                        Object.assign(el.node,obj);
+                    }
+                } else {
+                    if (el.node[tempName] !== !value) {
+                        let obj ={};
+                        obj[tempName] = !value;
+                        Object.assign(el.node,obj);
+                    }
+                }
+            });
+        },
+
+        setNodese(data = [], name, value) {
             let tempName = name;
             if (name === 'readOnly') {
                 tempName = 'disabled';