@wibetter/json-editor 5.0.10 → 5.0.17

package/lib/index.css

@@ -1,8 +1,8 @@
 /*!
- * @wibetter/json-editor v5.0.10
+ * @wibetter/json-editor v5.0.16
  * author: wibetter
  * build tool: AKFun
- * build time: Thu Dec 26 2024 15:58:45 GMT+0800 (中国标准时间)
+ * build time: Mon Dec 30 2024 15:48:09 GMT+0800 (中国标准时间)
  * build tool info: https://github.com/wibetter/akfun
  */
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\

package/lib/index.js

@@ -1,8 +1,8 @@
 /*!
- * @wibetter/json-editor v5.0.10
+ * @wibetter/json-editor v5.0.16
  * author: wibetter
  * build tool: AKFun
- * build time: Thu Dec 26 2024 15:58:45 GMT+0800 (中国标准时间)
+ * build time: Mon Dec 30 2024 15:48:09 GMT+0800 (中国标准时间)
  * build tool info: https://github.com/wibetter/akfun
  */
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -463,20 +463,22 @@ var MappingRender = function MappingRender(props) {
   var _ref = props.schemaStore || {},
     getSchemaByKeyRoute = _ref.getSchemaByKeyRoute;
   var _ref2 = props.jsonStore || {},
-    getJSONDataByKeyRoute = _ref2.getJSONDataByKeyRoute;
+    getJSONDataByKeyRoute = _ref2.getJSONDataByKeyRoute,
+    JSONEditorObj = _ref2.JSONEditorObj;
   var nodeKey = props.nodeKey,
     jsonKey = props.jsonKey,
     keyRoute = props.keyRoute,
     targetJsonSchema = props.targetJsonSchema;
-  var curType = targetJsonSchema.type;
-  var curNodeKey = nodeKey;
 
   // 支持显隐属性表达式
   var parentKeyRoute = (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_2__.getParentKeyRoute)(keyRoute);
-  var parentData = getJSONDataByKeyRoute(parentKeyRoute) || {}; // 获取当前父级数据域
-  if ((0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_2__.isBoolean)(targetJsonSchema.onShow) && !targetJsonSchema.onShow || (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_2__.isString)(targetJsonSchema.onShow) && !(0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_2__.expressionOn)(targetJsonSchema.onShow, parentData)) {
+  var parentData = parentKeyRoute ? getJSONDataByKeyRoute(parentKeyRoute) || {} : {}; // 获取当前父级数据域
+  var curData = Object.assign({}, JSONEditorObj, parentData);
+  if ((0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_2__.isBoolean)(targetJsonSchema.onShow) && !targetJsonSchema.onShow || (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_2__.isString)(targetJsonSchema.onShow) && !(0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_2__.evalExpression)(targetJsonSchema.onShow, curData)) {
     return;
   }
+  var curType = targetJsonSchema.typeOn ? (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_2__.evalExpression)(targetJsonSchema.typeOn, curData) : targetJsonSchema.type;
+  var curNodeKey = nodeKey;
 
   // 收集当前所有条件子字段
   /*
@@ -738,6 +740,7 @@ var ArraySchema = /*#__PURE__*/function (_React$PureComponent) {
     _this.elemHoverEnterEvent = _this.elemHoverEnterEvent.bind(_this);
     _this.elemHoverLeaveEvent = _this.elemHoverLeaveEvent.bind(_this);
     _this.collapseChange = _this.collapseChange.bind(_this);
+    _this.arrayCollapseChange = _this.arrayCollapseChange.bind(_this);
     return _this;
   }
   _babel_runtime_helpers_inheritsLoose__WEBPACK_IMPORTED_MODULE_0___default()(ArraySchema, _React$PureComponent);
@@ -5266,7 +5269,7 @@ var SohuEventSchema = /*#__PURE__*/function (_React$PureComponent) {
       nodeKey = _this$props4.nodeKey,
       keyRoute = _this$props4.keyRoute,
       targetJsonSchema = _this$props4.targetJsonSchema;
-    var options = options || {};
+    var options = _options || {};
     var curJsonData = getJSONDataByKeyRoute(keyRoute);
     var globalEventMap = curJsonData.globalEventMap || {}; // 全局事件列表
     var curEventList = curJsonData.event || []; // 当前组件事件列表
@@ -5276,7 +5279,7 @@ var SohuEventSchema = /*#__PURE__*/function (_React$PureComponent) {
     var eventEmitConfig = options.eventEmitConfig || [];
     var eventListenConfig = options.eventListenConfig || [];
     var allEmitEventList = options.allEmitEventList || [];
-    var isEmpty = widgetType !== 'page' && eventEmitConfig.length === 0 && eventListenConfig.length === 0;
+    var isEmpty = widgetType !== 'page' && eventEmitConfig.length === 0 || eventListenConfig.length === 0;
 
     // 获取前端缓存中的折叠数据
     var collapseData = [];
@@ -6718,6 +6721,7 @@ var RootJSONStore = function RootJSONStore() {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   deleteWebCacheData: function() { return /* binding */ deleteWebCacheData; },
+/* harmony export */   getExprProperties: function() { return /* binding */ getExprProperties; },
 /* harmony export */   getParams: function() { return /* binding */ getParams; },
 /* harmony export */   getURLParam: function() { return /* binding */ getURLParam; },
 /* harmony export */   getWebCacheData: function() { return /* binding */ getWebCacheData; },
@@ -6868,6 +6872,31 @@ function deleteWebCacheData(valueKey) {
   (0,_webCache_js__WEBPACK_IMPORTED_MODULE_1__.deleteJSONEditorCache)(valueKey, 'json-editor-formData');
 }
 
+/**
+ * 处理 Props 数据，所有以 On 或者 Expr 结尾的 prop 都进行一次计算
+ *
+ * xxxOn
+ * xxxExpr
+ */
+function getExprProperties(schema, data, ignoreList) {
+  if (ignoreList === void 0) {
+    ignoreList = ['name'];
+  }
+  Object.getOwnPropertyNames(schema).forEach(function (key) {
+    if (ignoreList && ~ignoreList.indexOf(key)) {
+      return;
+    }
+    var parts = /^(.*)(On|Expr)$/.exec(key) || [];
+    var type = parts[2];
+    var value = schema[key];
+    if (value && typeof value === 'string' && parts[1] && (type === 'On' || type === 'Expr')) {
+      key = parts[1];
+      schema[key] = (0,_wibetter_json_utils__WEBPACK_IMPORTED_MODULE_0__.evalExpression)(value, data || {});
+    }
+  });
+  return schema;
+}
+
 /***/ }),
 
 /***/ "./src/utils/typeof.js":

package/package.json

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

package/sdk/index.css

@@ -1,8 +1,8 @@
 /*!
- * @wibetter/json-editor v5.0.10
+ * @wibetter/json-editor v5.0.16
  * author: wibetter
  * build tool: AKFun
- * build time: Thu Dec 26 2024 15:59:10 GMT+0800 (中国标准时间)
+ * build time: Mon Dec 30 2024 15:48:22 GMT+0800 (中国标准时间)
  * build tool info: https://github.com/wibetter/akfun
  */
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\