mooho-base-admin-plus 2.4.57 → 2.4.58

package/history.md

@@ -89,3 +89,4 @@ mooho-base-admin-plus@2.4.54 - 修复上一版本bug
 mooho-base-admin-plus@2.4.55 - 改变task-form组件位置，使其允许被项目引用
 mooho-base-admin-plus@2.4.56 - 列表必填项加星号
 mooho-base-admin-plus@2.4.57 - 修复多行文本框筛选的bug
+mooho-base-admin-plus@2.4.58 - 如果表单有值，viewForm中loadView的时候不设置默认值

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

@@ -15285,8 +15285,8 @@ var __glob_5_1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProp
 }, Symbol.toStringTag, { value: "Module" }));
 var vueI18n = {};
 /*!
-  * shared v9.8.0
-  * (c) 2023 kazuya kawaguchi
+  * shared v9.9.0
+  * (c) 2024 kazuya kawaguchi
   * Released under the MIT License.
   */
 const inBrowser$1 = typeof window !== "undefined";
@@ -15438,14 +15438,16 @@ function deepCopy(src, des) {
   if (isNotObjectOrIsArray(src) || isNotObjectOrIsArray(des)) {
     throw new Error("Invalid value");
   }
-  for (const key in src) {
-    if (hasOwn$1(src, key)) {
-      if (isNotObjectOrIsArray(src[key]) || isNotObjectOrIsArray(des[key])) {
-        des[key] = src[key];
+  const stack = [{ src, des }];
+  while (stack.length) {
+    const { src: src2, des: des2 } = stack.pop();
+    Object.keys(src2).forEach((key) => {
+      if (isNotObjectOrIsArray(src2[key]) || isNotObjectOrIsArray(des2[key])) {
+        des2[key] = src2[key];
       } else {
-        deepCopy(src[key], des[key]);
+        stack.push({ src: src2[key], des: des2[key] });
       }
-    }
+    });
   }
 }
 var shared_esmBrowser = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -15490,8 +15492,8 @@ var shared_esmBrowser = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.def
 }, Symbol.toStringTag, { value: "Module" }));
 var require$$0 = /* @__PURE__ */ getAugmentedNamespace(shared_esmBrowser);
 /*!
-  * core-base v9.8.0
-  * (c) 2023 kazuya kawaguchi
+  * core-base v9.9.0
+  * (c) 2024 kazuya kawaguchi
   * Released under the MIT License.
   */
 const inBrowser = typeof window !== "undefined";
@@ -17408,7 +17410,7 @@ function appendItemToChain(chain, target, blocks) {
   }
   return follow;
 }
-const VERSION$1 = "9.8.0";
+const VERSION$1 = "9.9.0";
 const NOT_REOSLVED = -1;
 const DEFAULT_LOCALE$1 = "en-US";
 const MISSING_RESOLVE_VALUE = "";
@@ -18338,14 +18340,14 @@ var coreBase_esmBrowser = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.d
 }, Symbol.toStringTag, { value: "Module" }));
 var require$$1$1 = /* @__PURE__ */ getAugmentedNamespace(coreBase_esmBrowser);
 /*!
-  * vue-i18n v9.8.0
-  * (c) 2023 kazuya kawaguchi
+  * vue-i18n v9.9.0
+  * (c) 2024 kazuya kawaguchi
   * Released under the MIT License.
   */
 var shared = require$$0;
 var coreBase = require$$1$1;
 var vue = require$$0$1;
-const VERSION = "9.8.0";
+const VERSION = "9.9.0";
 const code$1 = coreBase.CoreWarnCodes.__EXTEND_POINT__;
 const inc$1 = shared.incrementer(code$1);
 const I18nWarnCodes = {
@@ -18546,16 +18548,17 @@ function createComposer(options = {}, VueI18nLegacy) {
   const { __root, __injectWithOption } = options;
   const _isGlobal = __root === void 0;
   const flatJson = options.flatJson;
+  const _ref = shared.inBrowser ? vue.ref : vue.shallowRef;
   let _inheritLocale = shared.isBoolean(options.inheritLocale) ? options.inheritLocale : true;
-  const _locale = vue.ref(
+  const _locale = _ref(
     __root && _inheritLocale ? __root.locale.value : shared.isString(options.locale) ? options.locale : coreBase.DEFAULT_LOCALE
   );
-  const _fallbackLocale = vue.ref(
+  const _fallbackLocale = _ref(
     __root && _inheritLocale ? __root.fallbackLocale.value : shared.isString(options.fallbackLocale) || shared.isArray(options.fallbackLocale) || shared.isPlainObject(options.fallbackLocale) || options.fallbackLocale === false ? options.fallbackLocale : _locale.value
   );
-  const _messages = vue.ref(getLocaleMessages(_locale.value, options));
-  const _datetimeFormats = vue.ref(shared.isPlainObject(options.datetimeFormats) ? options.datetimeFormats : { [_locale.value]: {} });
-  const _numberFormats = vue.ref(shared.isPlainObject(options.numberFormats) ? options.numberFormats : { [_locale.value]: {} });
+  const _messages = _ref(getLocaleMessages(_locale.value, options));
+  const _datetimeFormats = _ref(shared.isPlainObject(options.datetimeFormats) ? options.datetimeFormats : { [_locale.value]: {} });
+  const _numberFormats = _ref(shared.isPlainObject(options.numberFormats) ? options.numberFormats : { [_locale.value]: {} });
   let _missingWarn = __root ? __root.missingWarn : shared.isBoolean(options.missingWarn) || shared.isRegExp(options.missingWarn) ? options.missingWarn : true;
   let _fallbackWarn = __root ? __root.fallbackWarn : shared.isBoolean(options.fallbackWarn) || shared.isRegExp(options.fallbackWarn) ? options.fallbackWarn : true;
   let _fallbackRoot = __root ? __root.fallbackRoot : shared.isBoolean(options.fallbackRoot) ? options.fallbackRoot : true;
@@ -38864,6 +38867,9 @@ const _sfc_main$12 = {
               }
             });
           }
+          if (column.dataSource.length > 0 && column.isDefaultFirst) {
+            this.setFilterData(this.data, column, column.dataSource[0].id);
+          }
         }
       });
     },
@@ -38885,6 +38891,7 @@ const _sfc_main$12 = {
       });
     },
     async fillDataSource(data2, column, param) {
+      console.log("0");
       let value;
       if (column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect") {
         value = this.parseTreeFilterData(data2, column);
@@ -38919,6 +38926,7 @@ const _sfc_main$12 = {
             name: this.parseData(item, column.sourceDisplayCode)
           };
         });
+        console.log("1");
         if (data2) {
           if (this.parseFilterData(data2, column) == null && column.isDefaultFirst && res2.length > 0) {
             this.setData(data2, column.code, this.parseData(res2[0], column.sourceDataCode));
@@ -40775,7 +40783,9 @@ const _sfc_main$$ = {
       this.formView.columns = view.viewColumns;
       this.$emit("on-ready", this.formView);
       this.columns = view.viewColumns;
-      this.data = this.getDefaultData();
+      if (!this.data) {
+        this.data = this.getDefaultData();
+      }
       setTimeout(() => {
         this.initTab();
         this.initStaticItem();
@@ -41022,6 +41032,9 @@ const _sfc_main$$ = {
               }
             });
           }
+          if (column.dataSource.length > 0 && column.isDefaultFirst) {
+            this.setData(this.data, column.code, column.dataSource[0].id);
+          }
         }
       });
     },