@wibetter/json-editor 5.1.12 → 5.1.16

package/lib/index.css

@@ -1,8 +1,8 @@
 /*!
- * @wibetter/json-editor v5.1.12
+ * @wibetter/json-editor v5.1.16
  * author: wibetter
  * build tool: AKFun
- * build time: Fri Jan 17 2025 15:43:17 GMT+0800 (中国标准时间)
+ * build time: Tue Jan 21 2025 18:00:43 GMT+0800 (中国标准时间)
  * build tool info: https://github.com/wibetter/akfun
  */
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\

package/lib/index.js

@@ -1,8 +1,8 @@
 /*!
- * @wibetter/json-editor v5.1.12
+ * @wibetter/json-editor v5.1.16
  * author: wibetter
  * build tool: AKFun
- * build time: Fri Jan 17 2025 15:43:17 GMT+0800 (中国标准时间)
+ * build time: Tue Jan 21 2025 18:00:43 GMT+0800 (中国标准时间)
  * build tool info: https://github.com/wibetter/akfun
  */
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -2863,11 +2863,12 @@ var ObjectSchema = /*#__PURE__*/function (_React$PureComponent) {
         }
       }
       if (currentJsonKey === 'range') {
-        if (curJsonData.valueType === 'select' && (curJsonData.type === 'ContentStaticConfig' || curJsonData.type === 'ResourceCenter')) {
+        if (curJsonData.valueType === 'select' && (!currentSchemaData.options || currentSchemaData.options.length === 0) && (curJsonData.type === 'ContentStaticConfig' || curJsonData.type === 'ResourceCenter')) {
+          // 如果 range 没有可选项则从 value 中获取可选项
           var _valueSchema = targetJsonSchema.properties['value'];
           if (['select', 'radio', 'checkboxes'].includes(_valueSchema.type) && _valueSchema.options && _valueSchema.options.length > 0) {
             // range 和 value 复用 options
-            currentSchemaData.options = (0,$utils_index__WEBPACK_IMPORTED_MODULE_8__.objClone)(_valueSchema.options);
+            currentSchemaData.options = (0,$utils_index__WEBPACK_IMPORTED_MODULE_8__.getWrapOptions)(_valueSchema.options);
           }
         }
       }
@@ -7903,9 +7904,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   formatOptions: function() { return /* binding */ formatOptions; },
 /* harmony export */   formatOptions1: function() { return /* binding */ formatOptions1; },
 /* harmony export */   getExprProperties: function() { return /* binding */ getExprProperties; },
+/* harmony export */   getObjectTitle: function() { return /* binding */ getObjectTitle; },
 /* harmony export */   getParams: function() { return /* binding */ getParams; },
 /* harmony export */   getURLParam: function() { return /* binding */ getURLParam; },
 /* harmony export */   getWebCacheData: function() { return /* binding */ getWebCacheData; },
+/* harmony export */   getWrapOptions: function() { return /* binding */ getWrapOptions; },
 /* harmony export */   hasProperties: function() { return /* binding */ hasProperties; },
 /* harmony export */   isBaseSchemaElem: function() { return /* binding */ isBaseSchemaElem; },
 /* harmony export */   isBoxSchemaElem: function() { return /* binding */ isBoxSchemaElem; },
@@ -8181,6 +8184,46 @@ function formatOptions1(options) {
     optionValue: optionValue
   };
 }
+function getObjectTitle(objItem) {
+  if (objItem && (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isObject)(objItem)) {
+    var curObjectTitle = objItem.label || objItem.title || objItem.description || objItem.desc;
+    if (curObjectTitle) {
+      return curObjectTitle;
+    }
+    var objItemKeys = Object.keys(objItem);
+    for (var index = 0, size = objItemKeys.length; index < size; index++) {
+      var itemVal = objItem[objItemKeys[index]];
+      if (itemVal && (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isString)(itemVal) && !(0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isURL)(itemVal) && !(0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isColor)(itemVal)) {
+        return itemVal;
+      }
+    }
+  } else {
+    return objItem;
+  }
+}
+;
+
+/**
+ * options 数据处理
+ * 将 options 列表中的普通 option 自动包裹一层：
+ * 比如：[{label: 'xxLabel', value: 123}] => [{label: 'xxLabel', value: {label: 'xxLabel', value: 123}}]
+ */
+function getWrapOptions(options) {
+  var curOptions = [];
+  if ((0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isArray)(options)) {
+    options.forEach(function (option) {
+      if ((0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isObject)(option)) {
+        curOptions.push({
+          label: getObjectTitle(option),
+          value: (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isObject)(option.value) ? option.value : option
+        });
+      } else {
+        curOptions.push(option);
+      }
+    });
+  }
+  return curOptions;
+}
 
 /***/ }),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wibetter/json-editor",
-  "version": "5.1.12",
+  "version": "5.1.16",
   "description": "JSON数据可视化/JSONEditor, 可视化界面编辑json数据",
   "keywords": [
     "json",

package/sdk/index.css

@@ -1,8 +1,8 @@
 /*!
- * @wibetter/json-editor v5.1.12
+ * @wibetter/json-editor v5.1.16
  * author: wibetter
  * build tool: AKFun
- * build time: Fri Jan 17 2025 15:43:26 GMT+0800 (中国标准时间)
+ * build time: Tue Jan 21 2025 18:00:52 GMT+0800 (中国标准时间)
  * build tool info: https://github.com/wibetter/akfun
  */
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\

package/sdk/index.js

@@ -1,8 +1,8 @@
 /*!
- * @wibetter/json-editor v5.1.12
+ * @wibetter/json-editor v5.1.16
  * author: wibetter
  * build tool: AKFun
- * build time: Fri Jan 17 2025 15:43:26 GMT+0800 (中国标准时间)
+ * build time: Tue Jan 21 2025 18:00:52 GMT+0800 (中国标准时间)
  * build tool info: https://github.com/wibetter/akfun
  */
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -69271,11 +69271,12 @@ var ObjectSchema = /*#__PURE__*/function (_React$PureComponent) {
         }
       }
       if (currentJsonKey === 'range') {
-        if (curJsonData.valueType === 'select' && (curJsonData.type === 'ContentStaticConfig' || curJsonData.type === 'ResourceCenter')) {
+        if (curJsonData.valueType === 'select' && (!currentSchemaData.options || currentSchemaData.options.length === 0) && (curJsonData.type === 'ContentStaticConfig' || curJsonData.type === 'ResourceCenter')) {
+          // 如果 range 没有可选项则从 value 中获取可选项
           var _valueSchema = targetJsonSchema.properties['value'];
           if (['select', 'radio', 'checkboxes'].includes(_valueSchema.type) && _valueSchema.options && _valueSchema.options.length > 0) {
             // range 和 value 复用 options
-            currentSchemaData.options = (0,$utils_index__WEBPACK_IMPORTED_MODULE_4__.objClone)(_valueSchema.options);
+            currentSchemaData.options = (0,$utils_index__WEBPACK_IMPORTED_MODULE_4__.getWrapOptions)(_valueSchema.options);
           }
         }
       }
@@ -74200,9 +74201,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   formatOptions: function() { return /* binding */ formatOptions; },
 /* harmony export */   formatOptions1: function() { return /* binding */ formatOptions1; },
 /* harmony export */   getExprProperties: function() { return /* binding */ getExprProperties; },
+/* harmony export */   getObjectTitle: function() { return /* binding */ getObjectTitle; },
 /* harmony export */   getParams: function() { return /* binding */ getParams; },
 /* harmony export */   getURLParam: function() { return /* binding */ getURLParam; },
 /* harmony export */   getWebCacheData: function() { return /* binding */ getWebCacheData; },
+/* harmony export */   getWrapOptions: function() { return /* binding */ getWrapOptions; },
 /* harmony export */   hasProperties: function() { return /* binding */ hasProperties; },
 /* harmony export */   isBaseSchemaElem: function() { return /* binding */ isBaseSchemaElem; },
 /* harmony export */   isBoxSchemaElem: function() { return /* binding */ isBoxSchemaElem; },
@@ -74477,6 +74480,46 @@ function formatOptions1(options) {
     optionValue: optionValue
   };
 }
+function getObjectTitle(objItem) {
+  if (objItem && (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isObject)(objItem)) {
+    var curObjectTitle = objItem.label || objItem.title || objItem.description || objItem.desc;
+    if (curObjectTitle) {
+      return curObjectTitle;
+    }
+    var objItemKeys = Object.keys(objItem);
+    for (var index = 0, size = objItemKeys.length; index < size; index++) {
+      var itemVal = objItem[objItemKeys[index]];
+      if (itemVal && (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isString)(itemVal) && !(0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isURL)(itemVal) && !(0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isColor)(itemVal)) {
+        return itemVal;
+      }
+    }
+  } else {
+    return objItem;
+  }
+}
+;
+
+/**
+ * options 数据处理
+ * 将 options 列表中的普通 option 自动包裹一层：
+ * 比如：[{label: 'xxLabel', value: 123}] => [{label: 'xxLabel', value: {label: 'xxLabel', value: 123}}]
+ */
+function getWrapOptions(options) {
+  var curOptions = [];
+  if ((0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isArray)(options)) {
+    options.forEach(function (option) {
+      if ((0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isObject)(option)) {
+        curOptions.push({
+          label: getObjectTitle(option),
+          value: (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.isObject)(option.value) ? option.value : option
+        });
+      } else {
+        curOptions.push(option);
+      }
+    });
+  }
+  return curOptions;
+}
 
 /***/ }),
 
@@ -268508,7 +268551,7 @@ var initRadioData = {
       value: 'c',
     },
   ],
-  default: 'a',
+  // default: 'a',
   description: '',
 };
 
@@ -268538,7 +268581,7 @@ var initSelectData = {
       value: 'c',
     },
   ],
-  default: 'a',
+  // default: 'a',
   description: '',
 };
 
@@ -269701,9 +269744,14 @@ var initSohuSourceData = {
           title: '数据来源',
           isConditionProp: true,
           options: [
+            /*
+          {
+            label: '模板直接配置',
+            value: "DevDefaults",
+          },
+          */
             {
-              label: '模板直接配置',
-              // value: "DevDefaults",
+              label: '模板自定义数据源',
               value: 'RuntimeDataSelfDefine',
             },
             {
@@ -269719,7 +269767,7 @@ var initSohuSourceData = {
               value: 'ResourceCenter',
             },
           ],
-          default: 'ContentStaticConfig',
+          default: 'RuntimeDataSelfDefine',
           description: '',
         },
         description: {
@@ -269962,18 +270010,19 @@ var initSohuSourceData = {
           description: '',
           placeholder: '',
         },
-        CODE: {
-          title: 'Code参数',
-          type: 'input',
-          description: '',
-          placeholder: '',
-        },
         URL: {
           type: 'url',
           title: '跳转链接',
           description: '',
           placeholder: '',
         },
+        CODE: {
+          title: 'Code参数',
+          type: 'input',
+          description: '',
+          placeholder: '',
+          onShow: false,
+        },
       },
       propertyOrder: ['SIZE', 'TITLE', 'URL', 'CODE'],
       showCodeViewBtn: false,