ocpview-plus 1.2.7 → 1.2.9

package/README.md

@@ -7,24 +7,6 @@ ListDetail 模板 EditGrid 屏蔽键盘导航
 
 ### 1.1.0 更新说明
 支持单据明细导出
-用例简介：
-```
-// 按钮配置
-{
-    icon: "custom-export",
-    name: "billExport",
-    text: "导出",
-}
-
-
-// 多明细导出配置，若非多明细可不配置
-billImportConfig: {
-  typeData: [
-    { code: 'goods_1', name: '单品' },
-    { code: 'comb_2', name: '组合' },
-  ],
-}
-```
 
 ### 1.1.1 更新说明
 导出默认加mktcode

package/dist/ocpviewplus.min.esm.js

@@ -6,7 +6,7 @@ import md5 from "js-md5";
 import * as XLSX from "xlsx";
 import * as XLSXS from "xlsx-style-vite";
 import { saveAs } from "file-saver";
-import { watch, effectScope, reactive, computed, resolveComponent, openBlock, createElementBlock, normalizeStyle, createVNode, withCtx, withDirectives, createTextVNode, toDisplayString, vShow, createCommentVNode, Fragment, createBlock, renderList, createElementVNode, withKeys, withModifiers, renderSlot, createSlots, normalizeClass, defineComponent, onMounted, onBeforeUnmount, ref, nextTick, h as h$1, toRaw, unref, resolveDynamicComponent, shallowRef, watchEffect, inject, createApp, Teleport, provide, onUnmounted, TransitionGroup, getCurrentInstance, onActivated, onDeactivated } from "vue";
+import { watch, effectScope, reactive, computed, resolveComponent, openBlock, createElementBlock, normalizeStyle, createVNode, withCtx, withDirectives, createTextVNode, toDisplayString, vShow, createCommentVNode, Fragment, createBlock, renderList, createElementVNode, withKeys, withModifiers, renderSlot, createSlots, normalizeClass, defineComponent, onMounted, onBeforeUnmount, ref, nextTick, h as h$1, toRaw, unref, resolveDynamicComponent, mergeProps, shallowRef, watchEffect, inject, createApp, Teleport, provide, onUnmounted, TransitionGroup, getCurrentInstance, onActivated, onDeactivated } from "vue";
 import elementResizeDetectorMaker from "element-resize-detector";
 import pako, { gzip } from "pako";
 import Viewer from "viewerjs";
@@ -453,7 +453,7 @@ common.initEview = function(ViewUI2) {
   common.initAnchor(ViewUI2.Anchor);
 };
 const name = "ocpview-plus";
-const version$2 = "1.2.6";
+const version$2 = "1.2.8";
 const title = "ocpviewPlus";
 const description = "A high quality Service UI components Library with Vue.js";
 const homepage = "";
@@ -28944,42 +28944,148 @@ function _sfc_render$1h(_ctx, _cache, $props, $setup, $data, $options) {
 var ConditionSelectorBox = /* @__PURE__ */ _export_sfc$1(_sfc_main$1p, [["render", _sfc_render$1h]]);
 const _sfc_main$1o = {
   name: "CompatTree",
-  components: {
-    Tree
-  },
+  components: { Tree },
   props: {
     data: {
       type: Array,
-      required: true
+      default: () => []
     },
     render: {
       type: Function,
       default: null
     }
   },
+  data() {
+    return {
+      innerData: []
+    };
+  },
+  watch: {
+    data: {
+      immediate: true,
+      handler(val2) {
+        if (Array.isArray(val2)) {
+          console.log("watch data triggered");
+          this.innerData = [...val2];
+        } else {
+          this.innerData = [];
+        }
+      }
+    }
+  },
+  computed: {
+    flatState() {
+      const list = [];
+      console.log("flatState computing");
+      const walk = (nodes) => {
+        if (!Array.isArray(nodes))
+          return;
+        for (const n10 of nodes) {
+          list.push({ node: n10 });
+          if (Array.isArray(n10.children)) {
+            walk(n10.children);
+          }
+        }
+      };
+      walk(this.innerData);
+      return list;
+    }
+  },
   methods: {
     renderWrapper(slotProps) {
       const nodeRender = slotProps.data.render || this.render;
       if (!nodeRender) {
         return slotProps.data.title;
       }
-      return nodeRender(h$1, slotProps);
+      return nodeRender(h$1, {
+        root: slotProps.root,
+        node: slotProps.node,
+        data: slotProps.data
+      });
+    },
+    getSelectedNodes() {
+      var _a2, _b2;
+      return ((_b2 = (_a2 = this.$refs.tree) == null ? void 0 : _a2.getSelectedNodes) == null ? void 0 : _b2.call(_a2)) || [];
+    },
+    getCheckedNodes() {
+      var _a2, _b2;
+      return ((_b2 = (_a2 = this.$refs.tree) == null ? void 0 : _a2.getCheckedNodes) == null ? void 0 : _b2.call(_a2)) || [];
+    },
+    expandAll() {
+      var _a2, _b2;
+      (_b2 = (_a2 = this.$refs.tree) == null ? void 0 : _a2.expandAll) == null ? void 0 : _b2.call(_a2);
+    },
+    collapseAll() {
+      var _a2, _b2;
+      (_b2 = (_a2 = this.$refs.tree) == null ? void 0 : _a2.collapseAll) == null ? void 0 : _b2.call(_a2);
+    },
+    setData(data) {
+      this.innerData = Array.isArray(data) ? [...data] : [];
+    },
+    refurbish() {
+      const tmp = [...this.innerData];
+      this.innerData = [];
+      this.$nextTick(() => {
+        this.innerData = tmp;
+      });
+    },
+    getRootNodes() {
+      return this.innerData;
+    },
+    updateNode(data, flag) {
+      const idField = "id";
+      console.log("updateNode called", data, flag);
+      const findNode = (list, id2) => {
+        for (const node of list) {
+          if (node[idField] === id2) {
+            return node;
+          }
+          if (Array.isArray(node.children)) {
+            const res = findNode(node.children, id2);
+            if (res)
+              return res;
+          }
+        }
+        return null;
+      };
+      if (flag === "U") {
+        const node = findNode(this.innerData, data[idField]);
+        if (node) {
+          Object.assign(node, data);
+        }
+      }
+      if (flag === "D") {
+        const removeNode2 = (list, id2) => {
+          const index = list.findIndex(
+            (n10) => n10[idField] === id2
+          );
+          if (index > -1) {
+            list.splice(index, 1);
+            return true;
+          }
+          for (const n10 of list) {
+            if (Array.isArray(n10.children) && removeNode2(n10.children, id2)) {
+              return true;
+            }
+          }
+          return false;
+        };
+        removeNode2(this.innerData, data[idField]);
+      }
     }
   }
 };
 function _sfc_render$1g(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Tree = resolveComponent("Tree");
-  return openBlock(), createBlock(_component_Tree, {
-    data: $props.data,
-    selectable: ""
-  }, {
+  return openBlock(), createBlock(_component_Tree, mergeProps({
+    ref: "tree",
+    data: $data.innerData
+  }, _ctx.$attrs), {
     title: withCtx((slotProps) => [
-      (openBlock(), createBlock(resolveDynamicComponent({
-        render: () => $options.renderWrapper(slotProps)
-      })))
+      (openBlock(), createBlock(resolveDynamicComponent({ render: () => $options.renderWrapper(slotProps) })))
     ]),
     _: 1
-  }, 8, ["data"]);
+  }, 16, ["data"]);
 }
 var CompatTree = /* @__PURE__ */ _export_sfc$1(_sfc_main$1o, [["render", _sfc_render$1g]]);
 var conditionfilterbox_vue_vue_type_style_index_0_lang = "";
@@ -34447,20 +34553,26 @@ const _sfc_main$17 = {
       let pos = {};
       let tree = [];
       let i = 0;
-      let autoExpandId = this._autoExpandId;
+      const idField = this.myConfig.idField;
+      const parentField = this.myConfig.parentField;
+      const rootId = this.rootNode[idField];
+      const focusId = selectedId !== null && selectedId !== void 0 ? selectedId : this._autoExpandId;
       let autoExpandParents = /* @__PURE__ */ new Set();
-      if (autoExpandId) {
-        let current = this.data.find(
-          (item) => item[this.myConfig.idField] === autoExpandId
-        );
+      if (focusId !== null && focusId !== void 0) {
+        let current = this.data.find((item) => item[idField] === focusId);
+        const visited = /* @__PURE__ */ new Set();
         while (current) {
-          autoExpandParents.add(current[this.myConfig.idField]);
-          const parentId = current[this.myConfig.parentField];
-          if (!parentId)
+          const cid = current[idField];
+          if (visited.has(cid)) {
+            console.warn("[toTreeData] parent chain cycle detected:", cid);
             break;
-          current = this.data.find(
-            (item) => item[this.myConfig.idField] === parentId
-          );
+          }
+          visited.add(cid);
+          autoExpandParents.add(cid);
+          const pid = current[parentField];
+          if (pid == null)
+            break;
+          current = this.data.find((item) => item[idField] === pid);
         }
       }
       let data = this.$Method.copy(this.data);
@@ -34468,38 +34580,63 @@ const _sfc_main$17 = {
         this.setSelected(el2);
       });
       let tempData = this.$Method.copy(data);
+      const applyNodeState = (node) => {
+        const nid = node[idField];
+        if (expandMap.has(nid) || autoExpandParents.has(nid)) {
+          node.expand = true;
+        }
+        node.selected = focusId !== null && focusId !== void 0 && nid === focusId;
+      };
+      let guard = 0;
+      const maxGuard = data.length * 5 + 20;
+      let movedInRound = 0;
       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];
+        const current = data[i];
+        const currentId = current[idField];
+        const parentId = current[parentField];
+        const index = tempData.findIndex((item) => item[idField] === parentId);
+        if (parentId === rootId || index < 0) {
+          applyNodeState(current);
+          tree.push(current);
+          pos[currentId] = [tree.length - 1];
           data.splice(i, 1);
           i--;
+          movedInRound++;
         } else {
-          let posArr = pos[data[i][this.myConfig.parentField]];
+          const posArr = pos[parentId];
           if (posArr) {
             let obj = tree[posArr[0]];
-            for (var j10 = 1; j10 < posArr.length; j10++) {
+            for (let 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]);
+            applyNodeState(current);
+            obj.children.push(current);
+            pos[currentId] = posArr.concat([obj.children.length - 1]);
             data.splice(i, 1);
             i--;
+            movedInRound++;
           }
         }
         i++;
         if (i > data.length - 1) {
+          if (movedInRound === 0 && data.length > 0) {
+            console.warn("[toTreeData] unresolved/cyclic nodes, force attach to root level:", data);
+            data.forEach((node) => {
+              applyNodeState(node);
+              const nid = node[idField];
+              tree.push(node);
+              pos[nid] = [tree.length - 1];
+            });
+            data = [];
+            break;
+          }
+          movedInRound = 0;
           i = 0;
+          guard++;
+          if (guard > maxGuard) {
+            console.warn("[toTreeData] safety break triggered");
+            break;
+          }
         }
       }
       if (this.myConfig.showRootNode) {
@@ -34520,11 +34657,7 @@ const _sfc_main$17 = {
             root = this.setIcon(root);
           }
         }
-        if (this.myConfig.nodeRender) {
-          root.render = this.myConfig.nodeRender;
-        } else {
-          root.render = this.iconRender;
-        }
+        root.render = this.myConfig.nodeRender ? this.myConfig.nodeRender : this.iconRender;
         this._autoExpandId = null;
         return [root];
       } else {
@@ -34838,6 +34971,81 @@ const _sfc_main$17 = {
         }
       }
       let responseId = this.myConfig.responseId;
+      this.$refs.tree.flatState.forEach((el2) => {
+        let index = data.findIndex(
+          (el22) => el2.node[responseId] === el22[responseId]
+        );
+        if (index > -1) {
+          if (el2.node[tempName] !== value) {
+            let obj = {};
+            obj[tempName] = value;
+            Object.assign(el2.node, obj);
+          }
+        } else {
+          if (el2.node[tempName] !== !value) {
+            let obj = {};
+            obj[tempName] = !value;
+            Object.assign(el2.node, obj);
+          }
+        }
+      });
+    },
+    setNodese(data = [], name2, value) {
+      let tempName = name2;
+      if (name2 === "readOnly") {
+        tempName = "disabled";
+      } else if (name2 === "selected") {
+        tempName = this.myConfig.multiSelect && this.myConfig.showCheckBox ? "checked" : "selected";
+      }
+      const responseId = this.myConfig.idField || this.myConfig.responseId;
+      const idSet = new Set(
+        (data || []).map((item) => String(item == null ? void 0 : item[responseId]))
+      );
+      const source = Array.isArray(this.data) ? this.data : Array.isArray(this.treeData) ? this.treeData : [];
+      let hitCount = 0;
+      const updateNode = (nodes) => {
+        if (!Array.isArray(nodes))
+          return;
+        nodes.forEach((node) => {
+          const exists = idSet.has(String(node == null ? void 0 : node[responseId]));
+          if (exists)
+            hitCount++;
+          let newValue;
+          if (name2 === "selected" && value === true) {
+            newValue = exists;
+          } else if (exists) {
+            newValue = value;
+          } else {
+            newValue = node[tempName];
+          }
+          if (node[tempName] !== newValue) {
+            node[tempName] = newValue;
+          }
+          if (node.children && node.children.length > 0) {
+            updateNode(node.children);
+          }
+        });
+      };
+      updateNode(source);
+      if (source === this.data)
+        this.data = [...source];
+      if (source === this.treeData)
+        this.treeData = [...source];
+      console.log("[setNodes]", { tempName, responseId, targetIds: [...idSet], hitCount });
+      return hitCount;
+    },
+    setNodes2(data, name2, value) {
+      let tempName = name2;
+      if (name2 === "readOnly") {
+        tempName = "disabled";
+      } else if (name2 === "selected") {
+        if (this.myConfig.multiSelect && this.myConfig.showCheckBox) {
+          tempName = "checked";
+        } else {
+          tempName = "selected";
+        }
+      }
+      let responseId = this.myConfig.idField || this.myConfig.responseId;
       const idSet = new Set(
         data.map((item) => item[responseId])
       );
@@ -47124,6 +47332,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) => {