@wibetter/json-utils 5.0.14 → 5.0.16

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import {
   isEqual as isEqual$1,
   truncate as truncate$1,
 } from 'lodash';
-import queryString from 'query-string';
+import qs from 'qs';
 
 /**
  * 获取 URL 上的所有参数
@@ -12,7 +12,7 @@ import queryString from 'query-string';
 function urlParse() {
   var urlParams = {};
   if (location.search) {
-    urlParams = queryString.parse(location.search);
+    urlParams = qs.parse(location.search.substring(1));
   }
   return urlParams;
 }
@@ -25,7 +25,7 @@ function urlParse() {
 function urlStringify(urlParams) {
   var urlStr = '';
   if (url) {
-    urlStr = queryString.stringify(urlParams);
+    urlStr = qs.stringify(urlParams);
   }
   return urlStr;
 }
@@ -66,7 +66,7 @@ function truncate(str, paramConfig) {
 /**
  * 支持属性表达式
  */
-function expressionOn(expressionStr, data) {
+function evalExpression(expressionStr, data) {
   var curData = data || {};
   if (!expressionStr) return false;
   var expressionFunc = new Function(
@@ -7831,6 +7831,12 @@ function objectSchema2JsonData(jsonSchema, jsonData) {
       JSON.stringify(curValue) !== '{}'
     ) {
       curJsonData = Object.assign(curJsonData, curValue);
+    } else if (
+      oldValue === undefined &&
+      jsonItem.default &&
+      isObject$1(jsonItem.default)
+    ) {
+      curJsonData = jsonItem.default;
     } else if (jsonSchema.properties) {
       var curPropertyOrder = [];
       if (jsonSchema.propertyOrder) {
@@ -8240,7 +8246,7 @@ export {
   TypeDataList,
   dataRoute2dataPath,
   dynamicDataAnalyzer,
-  expressionOn,
+  evalExpression,
   getCurPosition,
   getDefaultOptionVal,
   getExpectType$1 as getExpectType,

package/dist/index.esm.min.js

@@ -1,8 +1,8 @@
 import { cloneDeep as e, isEqual as t, truncate as r } from 'lodash';
-import n from 'query-string';
+import n from 'qs';
 function o() {
   var e = {};
-  return location.search && (e = n.parse(location.search)), e;
+  return location.search && (e = n.parse(location.search.substring(1))), e;
 }
 function i(e) {
   var t = '';
@@ -4829,6 +4829,7 @@ function Jr(e, t) {
             s && s.actionFunc && (r.actionFunc = s.actionFunc));
     else if (!1 === e.isContainer && s && k(s) && '{}' !== JSON.stringify(s))
       r = Object.assign(r, s);
+    else if (void 0 === i && o.default && k(o.default)) r = o.default;
     else if (e.properties) {
       (e.propertyOrder ? e.propertyOrder : Object.keys(e.properties)).map(
         function (n) {
@@ -5003,7 +5004,7 @@ export {
   E as TypeDataList,
   Yr as dataRoute2dataPath,
   Xr as dynamicDataAnalyzer,
-  c as expressionOn,
+  c as evalExpression,
   Lr as getCurPosition,
   Kr as getDefaultOptionVal,
   Vr as getExpectType,

package/dist/index.js

@@ -59,7 +59,7 @@
         dynamicDataAnalyzer: function () {
           return ce;
         },
-        expressionOn: function () {
+        evalExpression: function () {
           return s;
         },
         getCurPosition: function () {
@@ -117,7 +117,7 @@
           return R;
         },
         isDateTimeStr: function () {
-          return q;
+          return E;
         },
         isEmptySchema: function () {
           return Y;
@@ -153,7 +153,7 @@
           return z;
         },
         isTimeStr: function () {
-          return E;
+          return q;
         },
         isURL: function () {
           return T;
@@ -208,11 +208,13 @@
         },
       });
     var r = require('lodash'),
-      a = require('query-string'),
+      a = require('qs'),
       i = e.n(a);
     function l() {
       var e = {};
-      return location.search && (e = i().parse(location.search)), e;
+      return (
+        location.search && (e = i().parse(location.search.substring(1))), e
+      );
     }
     function n(e) {
       var t = '';
@@ -1477,13 +1479,13 @@
     function R(e) {
       return /^\d{4}-\d{2}-\d{2}$/.test(e);
     }
-    function q(e) {
+    function E(e) {
       return (
         /^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}$/.test(e) ||
         /^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}$/.test(e)
       );
     }
-    function E(e) {
+    function q(e) {
       return /^\d{2}:\d{2}:\d{2}$/.test(e) || /^\d{2}:\d{2}$/.test(e);
     }
     function k(e) {
@@ -1569,8 +1571,8 @@
                   else if (N(e)) t = o(C.number);
                   else if (T(e)) t = o(C.url);
                   else if (R(e)) t = o(C.date);
-                  else if (q(e)) t = o(C['date-time']);
-                  else if (E(e)) t = o(C.time);
+                  else if (E(e)) t = o(C['date-time']);
+                  else if (q(e)) t = o(C.time);
                   else if (M(e)) t = o(C.color);
                   else
                     try {
@@ -1955,24 +1957,26 @@
                     n && n.actionFunc && (r.actionFunc = n.actionFunc))
               : !1 === e.isContainer && n && P(n) && '{}' !== JSON.stringify(n)
                 ? (r = Object.assign(r, n))
-                : e.properties &&
-                  (e.propertyOrder
-                    ? e.propertyOrder
-                    : Object.keys(e.properties)
-                  ).map(function (a) {
-                    var i = e.properties[a],
-                      l = t && t[a];
-                    switch (U(i.type)) {
-                      case 'array':
-                        r[a] = oe(i, l);
-                        break;
-                      case 'object':
-                        r[a] = ne(i, l);
-                        break;
-                      default:
-                        r[a] = le(i, l);
-                    }
-                  });
+                : void 0 === l && i.default && P(i.default)
+                  ? (r = i.default)
+                  : e.properties &&
+                    (e.propertyOrder
+                      ? e.propertyOrder
+                      : Object.keys(e.properties)
+                    ).map(function (a) {
+                      var i = e.properties[a],
+                        l = t && t[a];
+                      switch (U(i.type)) {
+                        case 'array':
+                          r[a] = oe(i, l);
+                          break;
+                        case 'object':
+                          r[a] = ne(i, l);
+                          break;
+                        default:
+                          r[a] = le(i, l);
+                      }
+                    });
       }
       return r;
     }

package/dist/index.js.LICENSE.txt

@@ -1,7 +1,7 @@
 /*!
- * @wibetter/json-utils v5.0.13
+ * @wibetter/json-utils v5.0.16
  * author: wibetter
  * build tool: AKFun
- * build time: Fri Dec 27 2024 17:12:36 GMT+0800 (中国标准时间)
+ * build time: Sun Dec 29 2024 02:45:04 GMT+0800 (中国标准时间)
  * build tool info: https://github.com/wibetter/akfun
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wibetter/json-utils",
-  "version": "5.0.14",
+  "version": "5.0.16",
   "description": "提供JSON相关的各类工具方法，比如schema转json、json转schema、json元数据分析等",
   "keywords": [
     "json工具包",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "query-string": "^9.1.1"
+    "qs": "^6.13.1"
   },
   "devDependencies": {
     "akfun": "^5.0.1"