mooho-base-admin-plus 2.1.1 → 2.1.3

package/history.md

@@ -0,0 +1 @@
+2.1.3 修复因为 i18n 加载延迟导致的页面出错，特别是日期控件

package/package/mooho-base-admin-plus.min.esm.js

@@ -21491,6 +21491,11 @@ var i18n = {
       state.locale = locale2;
       app.config.globalProperties.$i18n.locale = locale2;
       const ViewUIPlusLocale = { "../../../../i18n/locale/en-US.js": __glob_5_0, "../../../../i18n/locale/zh-CN.js": __glob_5_1 };
+      Object.keys(ViewUIPlusLocale).forEach((path) => {
+        const currentLocale = ViewUIPlusLocale[path].default;
+        i18n$1.global.setLocaleMessage(currentLocale.i.locale, currentLocale);
+      });
+      console.log("ViewUIPlusLocale", ViewUIPlusLocale);
       let res2 = await i18nTextApi.getAll();
       state.languages = {};
       for (let lanCode in res2) {
@@ -21501,6 +21506,7 @@ var i18n = {
           }
         });
         state.languages[lanCode] = res2[lanCode].name;
+        console.log("setLocaleMessage", lanCode);
         i18n$1.global.setLocaleMessage(lanCode, res2[lanCode]["text"]);
       }
     }
@@ -23903,7 +23909,6 @@ const _hoisted_22$2 = { class: "content" };
 const _hoisted_23$2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "value1" }, "\u5F85\u5206\u6D3E", -1));
 const _hoisted_24$2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "value2" }, "\u5DF2\u5206\u6D3E", -1));
 function _sfc_render$1o(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_DatePicker = resolveComponent("DatePicker");
   const _component_Icon = resolveComponent("Icon");
   const _component_Numeral = resolveComponent("Numeral");
   const _component_Card = resolveComponent("Card");
@@ -23913,10 +23918,6 @@ function _sfc_render$1o(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_shortcut = resolveComponent("shortcut");
   const _directive_font = resolveDirective("font");
   return openBlock(), createElementBlock("div", null, [
-    createVNode$1(_component_DatePicker, {
-      type: "date",
-      size: "small"
-    }),
     createVNode$1(_component_Row, {
       gutter: 24,
       class: "ivu-mt"
@@ -50599,24 +50600,6 @@ const _sfc_main$o = {
   computed: {},
   methods: {
     ...mapActions("admin/dataView", { loadDataView: "load" }),
-    getWidth(column) {
-      switch (column.columnWidth) {
-        case "Column12":
-          return 100 * 24 / 24;
-        case "Column9":
-          return 100 * 18 / 24;
-        case "Column8":
-          return 100 * 16 / 24;
-        case "Column6":
-          return 100 * 12 / 24;
-        case "Column4":
-          return 100 * 8 / 24;
-        case "Column3":
-          return 100 * 6 / 24;
-        case "Column2":
-          return 100 * 4 / 24;
-      }
-    },
     getRules(column) {
       if (!column.isShow) {
         return [];
@@ -50710,6 +50693,7 @@ const _sfc_main$o = {
         this.initTab();
         this.initStaticItem();
         this.initTrigger();
+        this.initNewLine();
         this.onDataChange();
       });
     },
@@ -50993,44 +50977,13 @@ const _sfc_main$o = {
         return column.name;
       }
     },
-    getRightWidth(index2) {
-      let current = 0;
-      for (let i3 = 0; i3 <= index2; i3++) {
-        let width = 0;
-        switch (this.columns[i3].columnWidth) {
-          case "Column12":
-            width = 24;
-            break;
-          case "Column9":
-            width = 18;
-            break;
-          case "Column8":
-            width = 16;
-            break;
-          case "Column6":
-            width = 12;
-            break;
-          case "Column4":
-            width = 8;
-            break;
-          case "Column3":
-            width = 6;
-            break;
-          case "Column2":
-            width = 4;
-            break;
-        }
-        if (width == 24) {
-          current = 0;
-        } else if (this.columns[i3].newLine || current + width > 24) {
-          current = width;
-        } else if (current + width == 24) {
-          current = 0;
-        } else {
-          current = current + width;
-        }
+    getClass(column) {
+      const grid = this.getGrid(column.columnWidth);
+      const classes = [];
+      for (const key in grid) {
+        classes.push("ivu-col-span-" + key + "-" + grid[key]);
       }
-      return current == 0 ? 0 : 100 * (24 - current) / 24;
+      return classes;
     },
     mouseover(column) {
       if (!this.dragging) {
@@ -51043,7 +50996,7 @@ const _sfc_main$o = {
       }
     },
     start(evt) {
-      this.draggingColumn = this.columns[evt.oldIndex];
+      this.draggingColumn = this.columns[evt.oldDraggableIndex];
       this.draggingColumn._actived = true;
       this.draggingColumn._editable = false;
       this.dragging = true;
@@ -51051,10 +51004,28 @@ const _sfc_main$o = {
     end(evt) {
       this.draggingColumn._actived = false;
       this.dragging = false;
+      this.initNewLine();
+    },
+    initNewLine() {
+      this.columns.forEach((column, index2) => {
+        const line = document.getElementById("line-" + index2);
+        if (line) {
+          line.parentNode.removeChild(line);
+        }
+      });
+      this.columns.forEach((column, index2) => {
+        if (column.newLine) {
+          const col = document.getElementById("col-" + index2);
+          const line = document.createElement("div");
+          line.id = "line-" + index2;
+          line.style.width = "100%";
+          col.parentNode.insertBefore(line, col);
+        }
+      });
     }
   }
 };
-const _hoisted_1$f = ["onMouseover", "onMouseleave"];
+const _hoisted_1$f = ["id", "onMouseover", "onMouseleave"];
 const _hoisted_2$d = { style: { "position": "absolute", "z-index": "100", "top": "4px", "right": "4px" } };
 const _hoisted_3$b = { key: 2 };
 const _hoisted_4$4 = { class: "title" };
@@ -51105,14 +51076,15 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
           group: "sort",
           onStart: $options.start,
           onEnd: $options.end,
-          style: { "display": "flex", "flex-flow": "row wrap" }
+          class: "ivu-row ivu-row-flex",
+          style: { "margin-left": "-12px", "margin-right": "-12px" }
         }, {
           item: withCtx(({ element: column, index: index2 }) => [
             createElementVNode("div", {
-              style: normalizeStyle$1([
-                { "position": "relative", "min-height": "1px" },
-                "flex: 0 0 " + $options.getWidth(column) + "%; max-width:" + $options.getWidth(column) + "%;" + (column._actived ? "border: dashed #ddd 1px; background-color: #ffefd5;" : "") + (index2 < $data.columns.length - 1 && $data.columns[index2 + 1].newLine ? "margin-right: " + $options.getRightWidth(index2) + "%" : "")
-              ]),
+              id: "col-" + index2,
+              ref: "col-" + index2,
+              class: normalizeClass(["ivu-col", $options.getClass(column)]),
+              style: normalizeStyle$1([{ "padding-left": "12px", "padding-right": "12px" }, column._actived ? "border: dashed #ddd 1px; background-color: #ffefd5;" : ""]),
               onMouseover: ($event) => $options.mouseover(column),
               onMouseleave: ($event) => $options.mouseleave(column)
             }, [
@@ -51563,7 +51535,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                 ]),
                 _: 2
               }, 1032, ["label", "prop", "rules", "error"])) : createCommentVNode("v-if", true)
-            ], 44, _hoisted_1$f)
+            ], 46, _hoisted_1$f)
           ]),
           _: 1
         }, 8, ["modelValue", "onStart", "onEnd"])