ocpview-plus 1.2.0 → 1.2.2

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.1.6";
+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);
           }
@@ -39011,6 +39011,7 @@ const _sfc_main$K = {
       }
       this.setDictData();
       this.importReset = false;
+      console.log("---------- base \u6267\u884C\u5B8C\u6BD5");
       this.$nextTick(() => {
         this.importReset = true;
       });
@@ -39179,6 +39180,12 @@ const _sfc_main$K = {
               this.uiconfig,
               data
             );
+          },
+          function(data) {
+            console.error(data);
+          },
+          function(data) {
+            console.error(data);
           }
         );
       } catch (e10) {
@@ -39238,9 +39245,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);
         }
       });
     },
@@ -49016,110 +49026,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) => {
@@ -49679,7 +49588,6 @@ const _sfc_main$r = {
     }
   },
   mounted() {
-    this.loadDynamicConfig();
     let billno = this.$Method.getUrlParam("billno");
     if (billno) {
       let para = {};