@wibetter/json-utils 5.0.20 → 5.0.21

package/dist/index.esm.js

@@ -7680,6 +7680,14 @@ function getDefaultOptionVal(jsonSchema, multiple) {
  * jsonData: json数据对象，会优先使用此jsonData对应的数值
  * */
 
+// 用于区分 对象 和 数组 类型
+function isEqualByType(value1, value2) {
+  return (
+    isObject$1(value1) + '-' + isArray(value1) ===
+    isObject$1(value2) + '-' + isArray(value2)
+  );
+}
+
 /**
  * 基础类型的schema转jsonData
  * 根据jsonSchema和旧版的jsonData生成一份对应的jsonData
@@ -7691,7 +7699,8 @@ function baseSchema2JsonData(jsonSchema, jsonData) {
   if (
     hasProperties(oldValue) &&
     hasProperties(jsonSchema.default) &&
-    typeof oldValue !== typeof jsonSchema.default
+    (typeof oldValue !== typeof jsonSchema.default ||
+      !isEqualByType(oldValue, jsonSchema.default))
   ) {
     // 表示当前数据类型发生变化，则丢弃旧版数据
     oldValue = undefined;

package/dist/index.esm.min.js

@@ -4771,49 +4771,55 @@ function Kr(e, t) {
   );
 }
 function zr(e, t) {
-  var r = '',
-    n = t;
-  l(n) && l(e.default) && typeof n != typeof e.default && (n = void 0);
-  var o = l(n) ? n : e.default;
+  var r,
+    n,
+    o = '',
+    i = t;
+  l(i) &&
+    l(e.default) &&
+    (typeof i != typeof e.default ||
+      ((r = i), (n = e.default), k(r) + '-' + V(r) != k(n) + '-' + V(n))) &&
+    (i = void 0);
+  var a = l(i) ? i : e.default;
   switch (e.type) {
     case 'select':
     case 'radio':
-      r = o || Kr(e);
+      o = a || Kr(e);
       break;
     case 'checkboxes':
-      r = o || Kr(e, !0);
+      o = a || Kr(e, !0);
       break;
     case 'color':
-      ('#fff' !== o && '#FFF' !== o) || (o = '#ffffff'),
-        (r = l(o) ? o : '#ffffff');
+      ('#fff' !== a && '#FFF' !== a) || (a = '#ffffff'),
+        (o = l(a) ? a : '#ffffff');
       break;
     case 'boolean':
-      r = !!l(o) && o;
+      o = !!l(a) && a;
       break;
     case 'number':
-      r = l(o) ? o : void 0;
+      o = l(a) ? a : void 0;
       break;
     case 'json':
-      var i = '';
-      if (k(o) || V(o)) i = o;
-      else if (I(o) || '' === o) i = {};
+      var s = '';
+      if (k(a) || V(a)) s = a;
+      else if (I(a) || '' === a) s = {};
       else
         try {
-          i = JSON.parse(o);
+          s = JSON.parse(a);
         } catch (e) {
-          i = {};
+          s = {};
         }
-      r = i;
+      o = s;
       break;
     default:
-      r =
+      o =
         'input' === e.type && '0' === e.default
-          ? o || e.default
-          : l(o)
-            ? o
+          ? a || e.default
+          : l(a)
+            ? a
             : void 0;
   }
-  return r;
+  return o;
 }
 function Jr(e, t) {
   var r = {},

package/dist/index.js

@@ -1893,49 +1893,55 @@
       );
     }
     function ie(e, t) {
-      var r = '',
-        a = t;
-      p(a) && p(e.default) && typeof a != typeof e.default && (a = void 0);
-      var l = p(a) ? a : e.default;
+      var r,
+        a,
+        l = '',
+        i = t;
+      p(i) &&
+        p(e.default) &&
+        (typeof i != typeof e.default ||
+          ((r = i), (a = e.default), P(r) + '-' + q(r) != P(a) + '-' + q(a))) &&
+        (i = void 0);
+      var n = p(i) ? i : e.default;
       switch (e.type) {
         case 'select':
         case 'radio':
-          r = l || le(e);
+          l = n || le(e);
           break;
         case 'checkboxes':
-          r = l || le(e, !0);
+          l = n || le(e, !0);
           break;
         case 'color':
-          ('#fff' !== l && '#FFF' !== l) || (l = '#ffffff'),
-            (r = p(l) ? l : '#ffffff');
+          ('#fff' !== n && '#FFF' !== n) || (n = '#ffffff'),
+            (l = p(n) ? n : '#ffffff');
           break;
         case 'boolean':
-          r = !!p(l) && l;
+          l = !!p(n) && n;
           break;
         case 'number':
-          r = p(l) ? l : void 0;
+          l = p(n) ? n : void 0;
           break;
         case 'json':
-          var i = '';
-          if (P(l) || q(l)) i = l;
-          else if (_(l) || '' === l) i = {};
+          var o = '';
+          if (P(n) || q(n)) o = n;
+          else if (_(n) || '' === n) o = {};
           else
             try {
-              i = JSON.parse(l);
+              o = JSON.parse(n);
             } catch (e) {
-              i = {};
+              o = {};
             }
-          r = i;
+          l = o;
           break;
         default:
-          r =
+          l =
             'input' === e.type && '0' === e.default
-              ? l || e.default
-              : p(l)
-                ? l
+              ? n || e.default
+              : p(n)
+                ? n
                 : void 0;
       }
-      return r;
+      return l;
     }
     function ne(e, t) {
       var r = {},

package/dist/index.js.LICENSE.txt

@@ -1,7 +1,7 @@
 /*!
- * @wibetter/json-utils v5.0.16
+ * @wibetter/json-utils v5.0.21
  * author: wibetter
  * build tool: AKFun
- * build time: Tue Dec 31 2024 16:16:34 GMT+0800 (中国标准时间)
+ * build time: Tue Dec 31 2024 17:31:46 GMT+0800 (中国标准时间)
  * build tool info: https://github.com/wibetter/akfun
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wibetter/json-utils",
-  "version": "5.0.20",
+  "version": "5.0.21",
   "description": "提供JSON相关的各类工具方法，比如schema转json、json转schema、json元数据分析等",
   "keywords": [
     "json工具包",