ocpview-plus 1.2.1 → 1.2.3

package/README.md

@@ -47,3 +47,6 @@ PopTextBox 精灵多级参数透传
 
 ### 1.2.0 更新说明
 tree vue3 升级
+
+### 1.2.2 更新说明
+datebox format 修复

package/dist/ocpviewplus.min.esm.js

@@ -453,7 +453,7 @@ common.initEview = function(ViewUI2) {
   common.initAnchor(ViewUI2.Anchor);
 };
 const name = "ocpview-plus";
-const version$2 = "1.2.0";
+const version$2 = "1.2.2";
 const title = "ocpviewPlus";
 const description = "A high quality Service UI components Library with Vue.js";
 const homepage = "";
@@ -26208,7 +26208,7 @@ const _sfc_main$1A = {
           para.value = this.$Method.formatDate(this.culValue, "yyyy-MM-dd");
         } else {
           if (this.myConfig.format === "MM-dd") {
-            para.value = this.$Method.formatDate(this.culValue, "yyyy-MM-dd");
+            para.value = this.$Method.formatDate(this.culValue, "MM-dd");
           } else {
             para.value = this.$Method.formatDate(this.culValue, this.myConfig.format);
           }
@@ -28969,7 +28969,10 @@ const _sfc_main$1n = {
 };
 function _sfc_render$1f(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Tree = resolveComponent("Tree");
-  return openBlock(), createBlock(_component_Tree, { data: $props.data }, {
+  return openBlock(), createBlock(_component_Tree, {
+    data: $props.data,
+    selectable: ""
+  }, {
     title: withCtx((slotProps) => [
       (openBlock(), createBlock(resolveDynamicComponent({
         render: () => $options.renderWrapper(slotProps)
@@ -29455,7 +29458,8 @@ function _sfc_render$1e(_ctx, _cache, $props, $setup, $data, $options) {
       key: 0,
       data: $data.data,
       render: $options.renderContent,
-      class: "demo-tree-render"
+      class: "demo-tree-render",
+      "onUpdate:data": _cache[0] || (_cache[0] = ($event) => _ctx.treeData = $event)
     }, null, 8, ["data", "render"])) : createCommentVNode("", true)
   ]);
 }
@@ -34218,7 +34222,8 @@ const _sfc_main$16 = {
       extraHeight: 0,
       outsideHeight: 0,
       treeData: [],
-      asyncLoad: false
+      asyncLoad: false,
+      _autoExpandId: ""
     };
   },
   created() {
@@ -34438,10 +34443,26 @@ const _sfc_main$16 = {
         ]
       );
     },
-    toTreeData() {
+    toTreeData(expandMap = /* @__PURE__ */ new Set(), selectedId = null) {
       let pos = {};
       let tree = [];
       let i = 0;
+      let autoExpandId = this._autoExpandId;
+      let autoExpandParents = /* @__PURE__ */ new Set();
+      if (autoExpandId) {
+        let current = this.data.find(
+          (item) => item[this.myConfig.idField] === autoExpandId
+        );
+        while (current) {
+          autoExpandParents.add(current[this.myConfig.idField]);
+          const parentId = current[this.myConfig.parentField];
+          if (!parentId)
+            break;
+          current = this.data.find(
+            (item) => item[this.myConfig.idField] === parentId
+          );
+        }
+      }
       let data = this.$Method.copy(this.data);
       data.forEach((el2) => {
         this.setSelected(el2);
@@ -34449,7 +34470,12 @@ const _sfc_main$16 = {
       let tempData = this.$Method.copy(data);
       while (data.length !== 0) {
         const index = tempData.findIndex((item) => item[this.myConfig.idField] === data[i][this.myConfig.parentField]);
+        const currentId = data[i][this.myConfig.idField];
         if (data[i][this.myConfig.parentField] === this.rootNode[this.myConfig.idField] || index < 0) {
+          if (expandMap.has(currentId)) {
+            data[i].expand = true;
+          }
+          data[i].selected = currentId === selectedId;
           tree.push(data[i]);
           pos[data[i][this.myConfig.idField]] = [tree.length - 1];
           data.splice(i, 1);
@@ -34461,6 +34487,10 @@ const _sfc_main$16 = {
             for (var j10 = 1; j10 < posArr.length; j10++) {
               obj = obj.children[posArr[j10]];
             }
+            if (expandMap.has(currentId)) {
+              data[i].expand = true;
+            }
+            data[i].selected = currentId === selectedId;
             obj.children.push(data[i]);
             pos[data[i][this.myConfig.idField]] = posArr.concat([obj.children.length - 1]);
             data.splice(i, 1);
@@ -34495,8 +34525,10 @@ const _sfc_main$16 = {
         } else {
           root.render = this.iconRender;
         }
+        this._autoExpandId = null;
         return [root];
       } else {
+        this._autoExpandId = null;
         return tree;
       }
     },
@@ -34825,7 +34857,56 @@ const _sfc_main$16 = {
       };
       updateNode(this.data);
     },
+    saveExpandState() {
+      const expandSet = /* @__PURE__ */ new Set();
+      const loop = (nodes) => {
+        if (!nodes)
+          return;
+        nodes.forEach((node) => {
+          if (node.expand) {
+            expandSet.add(node[this.myConfig.idField]);
+          }
+          if (node.children && node.children.length) {
+            loop(node.children);
+          }
+        });
+      };
+      loop(this.treeData);
+      return expandSet;
+    },
     updateNode(data, flag) {
+      const idField = this.myConfig.idField;
+      const parentField = this.myConfig.parentField;
+      const targetId = data[idField];
+      const expandSet = this.saveExpandState();
+      const index = this.data.findIndex(
+        (el2) => el2[idField] === targetId
+      );
+      if (flag === "U") {
+        if (index > -1) {
+          Object.assign(this.data[index], data);
+        } else {
+          this.data.push(data);
+          let parentId = data[parentField];
+          while (parentId) {
+            expandSet.add(parentId);
+            const parent = this.data.find(
+              (el2) => el2[idField] === parentId
+            );
+            if (!parent)
+              break;
+            parentId = parent[parentField];
+          }
+        }
+      }
+      if (flag === "D") {
+        if (index > -1) {
+          this.data.splice(index, 1);
+        }
+      }
+      this.treeData = this.toTreeData(expandSet, targetId);
+    },
+    updateNodeod(data, flag) {
       let tmp = data;
       if (flag !== "D") {
         tmp = this.setSelected(data);
@@ -34870,6 +34951,7 @@ const _sfc_main$16 = {
           }
         }
       }
+      this.treeData = [...this.treeData];
     },
     setExpend(data) {
       let index = this.$refs.tree.flatState.findIndex((el2) => el2.node[this.myConfig.idField] === data[this.myConfig.idField]);
@@ -38073,6 +38155,7 @@ function _sfc_render$J(_ctx, _cache, $props, $setup, $data, $options) {
           ref: "tree",
           data: _ctx.treeData,
           class: normalizeClass(_ctx.myConfig.className),
+          "onUpdate:data": _cache[1] || (_cache[1] = ($event) => _ctx.treeData = $event),
           "show-checkbox": _ctx.myConfig.showCheckBox,
           onOnSelectChange: _ctx.onSelectChange,
           onOnCheckChange: _ctx.onCheckChange,
@@ -39011,6 +39094,7 @@ const _sfc_main$K = {
       }
       this.setDictData();
       this.importReset = false;
+      console.log("---------- base \u6267\u884C\u5B8C\u6BD5");
       this.$nextTick(() => {
         this.importReset = true;
       });
@@ -39179,6 +39263,12 @@ const _sfc_main$K = {
               this.uiconfig,
               data
             );
+          },
+          function(data) {
+            console.error(data);
+          },
+          function(data) {
+            console.error(data);
           }
         );
       } catch (e10) {
@@ -39238,9 +39328,12 @@ const _sfc_main$K = {
       const fieldMap = this.buildItemMap(localItems);
       serverItems.forEach((serverItem) => {
         const localItem = fieldMap.get(serverItem.name);
+        console.log(serverItem.name, localItem);
         if (localItem) {
-          console.log("\u5408\u5E76", localItem);
+          console.log("\u5408\u5E76\u524D", localItem);
           Object.assign(localItem, serverItem);
+          console.log("merge\u540E", JSON.stringify(this.uiconfig));
+          this.uiconfig = Object.assign({}, this.uiconfig);
         }
       });
     },
@@ -46413,6 +46506,116 @@ const _sfc_main$u = {
     }
   },
   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 \u6CA1\u6709\u914D\u7F6E\u6570\u636E");
+              return;
+            }
+            this.mergeDynamicConfig(
+              this.uiconfig,
+              data
+            );
+          },
+          function(data) {
+            console.error(data);
+          },
+          function(data) {
+            console.error(data);
+          }
+        );
+      } catch (e10) {
+        console.error("\u52A8\u6001\u914D\u7F6E\u52A0\u8F7D\u5931\u8D25", e10);
+      }
+    },
+    mergeDynamicConfig(localConfig, serverConfig) {
+      if (!localConfig || !serverConfig) {
+        console.log("1 \u6CA1\u6709\u914D\u7F6E\u6570\u636E");
+        return;
+      }
+      if (localConfig.billQueryConfig.gridConfig.items && serverConfig.billQueryConfig.gridConfig.items) {
+        this.mergeFlatItems(
+          localConfig.billQueryConfig.gridConfig.items,
+          serverConfig.billQueryConfig.gridConfig.items
+        );
+      }
+      if (localConfig.detailConfig && serverConfig.detailConfig) {
+        this.mergeDetailConfig(
+          localConfig.detailConfig,
+          serverConfig.detailConfig
+        );
+      }
+    },
+    mergeDetailConfig(localDetail, serverDetail) {
+      if (localDetail.formsConfig.items && serverDetail.formsConfig.items) {
+        this.mergeContainerItems(
+          localDetail.formsConfig.items,
+          serverDetail.formsConfig.items
+        );
+      }
+      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 \u6CA1\u6709\u914D\u7F6Elocalcontainer");
+          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("\u5408\u5E76\u524D", localItem);
+          Object.assign(localItem, serverItem);
+          console.log("merge\u540E", JSON.stringify(this.uiconfig));
+          this.uiconfig = Object.assign({}, this.uiconfig);
+        }
+      });
+    },
+    buildItemMap(items, map2 = /* @__PURE__ */ new Map()) {
+      if (!Array.isArray(items))
+        return map2;
+      items.forEach((item) => {
+        if (!item) {
+          console.log("3 \u6CA1\u6709\u914D\u7F6E\u6570\u636E");
+          return;
+        }
+        if (item.name) {
+          map2.set(item.name, item);
+        }
+        if (Array.isArray(item.items)) {
+          this.buildItemMap(item.items, map2);
+        }
+      });
+      return map2;
+    },
     getCurlAnchorData() {
       let tmp = [];
       this.anchorData.forEach((el2) => {
@@ -49016,110 +49219,9 @@ const _sfc_main$r = {
     }
     this.billApprovalConfig.resources = this.myConfig.resources;
     this.billApprovalConfig.classPrefix = this.myConfig.classPrefix;
+    console.log("------------- listdetail\u6267\u884C\u5B8C\u6BD5");
   },
   methods: {
-    loadDynamicConfig() {
-      try {
-        const modulecode = this.$Method.getUrlParam("modulecode");
-        const postData = {
-          modulecode,
-          moduleid: modulecode
-        };
-        this.asyncPost(
-          this.myConfig.resources,
-          "uiconfigs.getPageConfig",
-          postData,
-          (data) => {
-            if (!data || !this.myConfig) {
-              console.log("1 \u6CA1\u6709\u914D\u7F6E\u6570\u636E");
-              return;
-            }
-            this.mergeDynamicConfig(
-              this.myConfig,
-              data
-            );
-          }
-        );
-      } catch (e10) {
-        console.error("\u52A8\u6001\u914D\u7F6E\u52A0\u8F7D\u5931\u8D25", e10);
-      }
-    },
-    mergeDynamicConfig(localConfig, serverConfig) {
-      if (!localConfig || !serverConfig) {
-        console.log("1 \u6CA1\u6709\u914D\u7F6E\u6570\u636E");
-        return;
-      }
-      if (localConfig.billQueryConfig.gridConfig.items && serverConfig.billQueryConfig.gridConfig.items) {
-        this.mergeFlatItems(
-          localConfig.billQueryConfig.gridConfig.items,
-          serverConfig.billQueryConfig.gridConfig.items
-        );
-      }
-      if (localConfig.detailConfig && serverConfig.detailConfig) {
-        this.mergeDetailConfig(
-          localConfig.detailConfig,
-          serverConfig.detailConfig
-        );
-      }
-    },
-    mergeDetailConfig(localDetail, serverDetail) {
-      if (localDetail.formsConfig.items && serverDetail.formsConfig.items) {
-        this.mergeContainerItems(
-          localDetail.formsConfig.items,
-          serverDetail.formsConfig.items
-        );
-      }
-      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 \u6CA1\u6709\u914D\u7F6Elocalcontainer");
-          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("\u5408\u5E76", localItem);
-          Object.assign(localItem, serverItem);
-        }
-      });
-    },
-    buildItemMap(items, map2 = /* @__PURE__ */ new Map()) {
-      if (!Array.isArray(items))
-        return map2;
-      items.forEach((item) => {
-        if (!item) {
-          console.log("3 \u6CA1\u6709\u914D\u7F6E\u6570\u636E");
-          return;
-        }
-        if (item.name) {
-          map2.set(item.name, item);
-        }
-        if (Array.isArray(item.items)) {
-          this.buildItemMap(item.items, map2);
-        }
-      });
-      return map2;
-    },
     setLogName() {
       this.logName.push({ code: this.myConfig.detailConfig.response, name: "\u4E3B\u8868" });
       this.myConfig.detailConfig.formsConfig.items.forEach((el2) => {