@lingxiteam/assets 1.0.11 → 1.0.12-alpha.1

package/es/dealDsl/index.d.ts

@@ -1,2 +1 @@
-export { preprocessDSL, preprocessEditorDSL, preprocessEngineDSL } from './preprocessDSL';
-export { parseActionBefore } from './events';
+export { preprocessDSL } from './preprocessDSL';

package/es/dealDsl/index.js

@@ -1,2 +1 @@
-export { preprocessDSL, preprocessEditorDSL, preprocessEngineDSL } from './preprocessDSL';
-export { parseActionBefore } from './events';
+export { preprocessDSL } from './preprocessDSL';

package/es/dealDsl/preprocess/common.js

@@ -1,10 +1,23 @@
-import { hasSomeOwnProperty } from '../utils';
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+import { hasSomeOwnProperty, hasEveryOwnProperty } from '../utils';
 var h5 = {
-  Icon: function Icon() {
+  Button: function Button() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var _component$props = component.props,
       props = _component$props === void 0 ? {} : _component$props;
-    if (props.type) {
+    // 兼容存量数据不存在 hasIcon（是否有图标开关标识）
+    if ((props === null || props === void 0 ? void 0 : props.icontype) && JSON.stringify(props.icontype) !== '{}') {
+      props.btnIcon = true;
+    } else {
+      props.btnIcon = false;
+    }
+    return component;
+  },
+  Icon: function Icon() {
+    var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var _component$props2 = component.props,
+      props = _component$props2 === void 0 ? {} : _component$props2;
+    if (props.type && _typeof(props.type) === 'object') {
       props.icon = props.type;
       delete props.type;
     }
@@ -12,18 +25,27 @@ var h5 = {
   },
   Divider: function Divider() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _component$props2 = component.props,
-      props = _component$props2 === void 0 ? {} : _component$props2;
+    var _component$props3 = component.props,
+      props = _component$props3 === void 0 ? {} : _component$props3;
     if (props.status !== undefined) {
       props.visible = props.status;
       delete props.status;
     }
     return component;
   },
+  'DatePicker|Calendar|Picker': function DatePickerCalendarPicker() {
+    var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    // TODO: 1.0.9 版本数据兼容
+    if (!component.props.hasOwnProperty('visible')) {
+      component.props.visible = false;
+    }
+    ;
+    return component;
+  },
   DformDate: function DformDate() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _component$props3 = component.props,
-      props = _component$props3 === void 0 ? {} : _component$props3;
+    var _component$props4 = component.props,
+      props = _component$props4 === void 0 ? {} : _component$props4;
     var isCurrent = props.isCurrent,
       defaultValue = props.defaultValue,
       customTime = props.customTime;
@@ -50,22 +72,24 @@ var h5 = {
   },
   'DMultiplePicker|DformDate|DformInput|DformSelect|DformPicker': function DMultiplePickerDformDateDformInputDformSelectDformPicker() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _component$props4 = component.props,
-      props = _component$props4 === void 0 ? {} : _component$props4;
-    delete props.type;
-    delete props.theme;
-    delete props.fontAddress;
-    delete props.isIconFont;
-    delete props.iconFileInfo;
-    delete props.svgContent;
-    delete props.iconFile;
+    var _component$props5 = component.props,
+      props = _component$props5 === void 0 ? {} : _component$props5;
+    if (props.hasOwnProperty('type')) {
+      delete props.type;
+      delete props.theme;
+      delete props.fontAddress;
+      delete props.isIconFont;
+      delete props.iconFileInfo;
+      delete props.svgContent;
+      delete props.iconFile;
+    }
     return component;
   },
   DformFile: function DformFile() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     // 新数据改成  accept、acceptExtension 从uploadAccepType当中获取  eg uploadAccepType = {accept,acceptExtension}
-    var _component$props5 = component.props,
-      props = _component$props5 === void 0 ? {} : _component$props5;
+    var _component$props6 = component.props,
+      props = _component$props6 === void 0 ? {} : _component$props6;
     var accept = props.accept,
       acceptExtension = props.acceptExtension;
     if (props.hasOwnProperty('accept')) {
@@ -77,13 +101,45 @@ var h5 = {
       props === null || props === void 0 ? true : delete props.acceptExtension;
     }
     return component;
+  },
+  'Image|DformFile|DformImagePicker|Signature': function ImageDformFileDformImagePickerSignature() {
+    var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var _component$props7 = component.props,
+      props = _component$props7 === void 0 ? {} : _component$props7;
+    if (props.hasOwnProperty('action')) {
+      // 旧数据含有action,实际用到的值和columns当中的api是相同
+      props.columns.api = props.action;
+      delete props.action;
+    }
+    return component;
+  },
+  // 兼容处理下存量的身份证校验规则
+  'DformInput|Input': function DformInputInput(component) {
+    var _component$props8 = component === null || component === void 0 ? void 0 : component.props,
+      regexp = _component$props8.regexp;
+    if (Array.isArray(regexp)) {
+      var oldRegStr = "/^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[12])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|X)$/";
+      var newRegStr = "/^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[012])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|X)$/";
+      // 运行态会给正则加上$$符号
+      var idCardRegexp = regexp.find(function (reg) {
+        return reg.pattern === "$".concat(oldRegStr, "$") || reg.pattern === oldRegStr;
+      });
+      if (idCardRegexp) {
+        if (/^\$.+\$$/.test(idCardRegexp.pattern)) {
+          idCardRegexp.pattern = "$".concat(newRegStr, "$");
+        } else {
+          idCardRegexp.pattern = newRegStr;
+        }
+      }
+    }
+    return component;
   }
 };
 var pc = {
   'DatePicker|TimePicker': function DatePickerTimePicker() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _component$props6 = component.props,
-      props = _component$props6 === void 0 ? {} : _component$props6;
+    var _component$props9 = component.props,
+      props = _component$props9 === void 0 ? {} : _component$props9;
     var isCurrent = props.isCurrent,
       defaultValue = props.defaultValue,
       customTime = props.customTime;
@@ -110,8 +166,8 @@ var pc = {
   },
   Button: function Button() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _component$props7 = component.props,
-      props = _component$props7 === void 0 ? {} : _component$props7;
+    var _component$props10 = component.props,
+      props = _component$props10 === void 0 ? {} : _component$props10;
     // const { popoverSetting, showPopover } = props;
     if (props.iconType && !props.icon) {
       var theme = props.theme,
@@ -136,19 +192,34 @@ var pc = {
     delete props.iconFileInfo;
     delete props.svgContent;
     delete props.iconFile;
+    // 兼容存量数据不存在 hasIcon（是否有图标开关标识）
+    if ((props === null || props === void 0 ? void 0 : props.icon) && JSON.stringify(props.icon) !== '{}') {
+      props.hasIcon = true;
+    } else {
+      props.hasIcon = false;
+    }
     return component;
   },
   'Dropdown|Menu': function DropdownMenu() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _component$props8 = component.props,
-      props = _component$props8 === void 0 ? {} : _component$props8;
+    var _component$props11 = component.props,
+      props = _component$props11 === void 0 ? {} : _component$props11;
     delete props.iconInfo;
     return component;
   },
   'Input|Card|Collapse': function InputCardCollapse() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _component$props9 = component.props,
-      props = _component$props9 === void 0 ? {} : _component$props9;
+    var _component$props12 = component.props,
+      props = _component$props12 === void 0 ? {} : _component$props12;
+    if (!props.icon) {
+      props.icon = {
+        type: props.type,
+        theme: props.theme || "outlined",
+        fontAddress: "",
+        isIconFont: false,
+        iconFileInfo: {}
+      };
+    }
     delete props.type;
     delete props.theme;
     delete props.fontAddress;
@@ -156,6 +227,15 @@ var pc = {
     delete props.iconFileInfo;
     delete props.svgContent;
     delete props.iconFile;
+    if (!props.prefixIcon) {
+      props.prefixIcon = {
+        type: props.prefixIconType,
+        theme: props.prefixIconTheme || "outlined",
+        fontAddress: "",
+        isIconFont: false,
+        iconFileInfo: {}
+      };
+    }
     delete props.prefixIconIconFileInfo;
     delete props.prefixIconIsIconFont;
     delete props.prefixIconType;
@@ -166,8 +246,17 @@ var pc = {
   },
   'StdUpload|Icon': function StdUploadIcon() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _component$props10 = component.props,
-      props = _component$props10 === void 0 ? {} : _component$props10;
+    var _component$props13 = component.props,
+      props = _component$props13 === void 0 ? {} : _component$props13;
+    if (!props.icon) {
+      props.icon = {
+        type: props.type,
+        theme: props.theme || "outlined",
+        fontAddress: "",
+        isIconFont: false,
+        iconFileInfo: {}
+      };
+    }
     delete props.type;
     delete props.theme;
     delete props.fontAddress;
@@ -179,8 +268,8 @@ var pc = {
   },
   Table: function Table() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _component$props11 = component.props,
-      props = _component$props11 === void 0 ? {} : _component$props11;
+    var _component$props14 = component.props,
+      props = _component$props14 === void 0 ? {} : _component$props14;
     if (typeof props.showCustom === 'boolean') {
       // 旧数据
       var iconPosition = props.iconPosition,
@@ -212,17 +301,37 @@ var pc = {
       delete props.customStyle;
       delete props.iconFile;
     }
+    // 预处理内容列配置
+    var columns = props === null || props === void 0 ? void 0 : props.columns;
+    if (Array.isArray(columns)) {
+      props.columns = columns.map(function (colCfg) {
+        /**
+         * 1、兼容存量没有 editContent 情况：默认改为 -> 提示方式为默认提示 -> 提示内容为初始数据
+         * 2、false 假值表示：提示方式为无
+         */
+        if (!(colCfg === null || colCfg === void 0 ? void 0 : colCfg.editContent) && typeof (colCfg === null || colCfg === void 0 ? void 0 : colCfg.editContent) !== 'boolean') {
+          colCfg.editContent = {
+            edittype: 'title',
+            title: {
+              "code": "$function main(text, row, index) { return text;}$",
+              "originCode": ["/**", " * 计算绑定的内容", " * @param {String} text 行数据中数据字段对应的原始值", " * @param {Object} row 行数据对象", " * @param {Number} index 行索引", " * @returns {Boolean} 实际值", " * 例：return row.id，表示当行主键为id时，返回内容为row.id实际的值", " */", "function main(text, row, index) {", "    return text;", "}"]
+            }
+          };
+        }
+        return colCfg;
+      });
+    }
     return component;
   },
   Upload: function Upload(component) {
-    var _component$props12 = component.props,
-      props = _component$props12 === void 0 ? {} : _component$props12;
+    var _component$props15 = component.props,
+      props = _component$props15 === void 0 ? {} : _component$props15;
     if (props.hasOwnProperty('action')) {
       // 旧数据含有action
       props.columns.api = props.action;
       delete props.action;
     }
-    if (props.hasOwnProperty('accept') && props.hasOwnProperty('acceptType')) {
+    if (hasEveryOwnProperty(props, ['accept', 'acceptType'])) {
       // 实际数据是取acceptType
       delete props.accept;
     }
@@ -240,12 +349,56 @@ var pc = {
     }
     // 新数据改成  accept、acceptExtension 从uploadAccepType当中获取  eg uploadAccepType = {accept,acceptExtension}
     if (props.hasOwnProperty('accept')) {
-      props.uploadAccepType.accept = accept;
-      props === null || props === void 0 ? true : delete props.accept;
+      props.uploadAccepType = Object.assign({}, props.uploadAccepType, {
+        accept: accept
+      });
+      delete props.accept;
     }
     if (props.hasOwnProperty('acceptExtension')) {
-      props.uploadAccepType.acceptExtension = acceptExtension;
-      props === null || props === void 0 ? true : delete props.acceptExtension;
+      props.uploadAccepType = Object.assign({}, props.uploadAccepType, {
+        acceptExtension: acceptExtension
+      });
+      delete props.acceptExtension;
+    }
+    return component;
+  },
+  TreeSelect: function TreeSelect(component) {
+    var props = component.props;
+    var multiple = props.multiple,
+      treeNodeFilterProp = props.treeNodeFilterProp,
+      treeCheckable = props.treeCheckable,
+      _props$filter = props.filter,
+      filter = _props$filter === void 0 ? 'local' : _props$filter;
+    if (props.hasOwnProperty('multiple')) {
+      // 废除multiple，多选统一设置为treeCheckable
+      component.props.treeCheckable = multiple || treeCheckable;
+      delete props.multiple;
+    }
+    if (props.hasOwnProperty('treeNodeFilterProp')) {
+      // 以前设置了过滤搜索值的，统一设置为本地过滤
+      component.props.filter = treeNodeFilterProp ? 'local' : filter;
+      delete props.treeNodeFilterProp;
+    }
+    return component;
+  },
+  Input: function Input(component) {
+    // 兼容处理下存量的身份证校验规则
+    var _component$props16 = component === null || component === void 0 ? void 0 : component.props,
+      regexp = _component$props16.regexp;
+    if (Array.isArray(regexp)) {
+      var oldRegStr = "/^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[12])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|X)$/";
+      var newRegStr = "/^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[012])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|X)$/";
+      // 运行态会给正则加上$$符号
+      var idCardRegexp = regexp.find(function (reg) {
+        return reg.pattern === "$".concat(oldRegStr, "$") || reg.pattern === oldRegStr;
+      });
+      if (idCardRegexp) {
+        if (/^\$.+\$$/.test(idCardRegexp.pattern)) {
+          idCardRegexp.pattern = "$".concat(newRegStr, "$");
+        } else {
+          idCardRegexp.pattern = newRegStr;
+        }
+      }
     }
     return component;
   }

package/es/dealDsl/preprocessDSL.d.ts

@@ -1,21 +1,9 @@
 import type { ContextType } from "./PropType";
 /**
- * 本方法只处理运行态和配置态公共属性.
- * 如果需要修改单独特性属性，请使用preprocessEditorDSL或者preprocessEngineDSL
+ * 本方法只处理运行态和配置态公共属性. 也就是配置态运行态都会生效
+ * 如果需要修改单独特性属性，请使用在配置态中preprocessEditorDSL 处理
  * @param component
  * @param context
  * @returns
  */
 export declare const preprocessDSL: (component: Record<string, any>, context: ContextType) => Record<string, any>;
-/**
- * 预处理DSL数据， 本方法仅在编辑器端使用。 处理后数据的权重高于preprocessDSL。
- * @param component 组件JSON数据
- * @param context 上下文
- */
-export declare const preprocessEditorDSL: (component: Record<string, any>, context: ContextType) => Record<string, any>;
-/**
- * 预处理DSL数据，本方法仅在运行态端使用。 处理后数据的权重高于preprocessDSL。
- * @param component 组件JSON数据
- * @param context 上下文
- */
-export declare const preprocessEngineDSL: (component: Record<string, any>, context: ContextType) => Record<string, any>;

package/es/dealDsl/preprocessDSL.js

@@ -1,6 +1,4 @@
 import preprocessObj from "./preprocess/common";
-import preEditorObj from "./preprocess/editor";
-import preEngineObj from "./preprocess/engine";
 /**
  * 支持属性key通过 "compName|compName"模式
  * @param compName
@@ -18,8 +16,8 @@ var collectionMethods = function collectionMethods(compName, obj) {
   return funcs;
 };
 /**
- * 本方法只处理运行态和配置态公共属性.
- * 如果需要修改单独特性属性，请使用preprocessEditorDSL或者preprocessEngineDSL
+ * 本方法只处理运行态和配置态公共属性. 也就是配置态运行态都会生效
+ * 如果需要修改单独特性属性，请使用在配置态中preprocessEditorDSL 处理
  * @param component
  * @param context
  * @returns
@@ -37,42 +35,4 @@ export var preprocessDSL = function preprocessDSL(component, context) {
     targetComponents = (_fn = fn(targetComponents)) !== null && _fn !== void 0 ? _fn : targetComponents;
   });
   return targetComponents;
-};
-/**
- * 预处理DSL数据， 本方法仅在编辑器端使用。 处理后数据的权重高于preprocessDSL。
- * @param component 组件JSON数据
- * @param context 上下文
- */
-export var preprocessEditorDSL = function preprocessEditorDSL(component, context) {
-  var targetComponents = component;
-  var _ref2 = component || {},
-    compName = _ref2.compName;
-  var _context$isMobile2 = context.isMobile,
-    isMobile = _context$isMobile2 === void 0 ? false : _context$isMobile2;
-  var platform = isMobile ? 'h5' : 'pc';
-  var methods = collectionMethods(compName, preEditorObj === null || preEditorObj === void 0 ? void 0 : preEditorObj[platform]);
-  methods.forEach(function (fn) {
-    var _fn2;
-    targetComponents = (_fn2 = fn(targetComponents)) !== null && _fn2 !== void 0 ? _fn2 : targetComponents;
-  });
-  return targetComponents;
-};
-/**
- * 预处理DSL数据，本方法仅在运行态端使用。 处理后数据的权重高于preprocessDSL。
- * @param component 组件JSON数据
- * @param context 上下文
- */
-export var preprocessEngineDSL = function preprocessEngineDSL(component, context) {
-  var targetComponents = component;
-  var _ref3 = component || {},
-    compName = _ref3.compName;
-  var _context$isMobile3 = context.isMobile,
-    isMobile = _context$isMobile3 === void 0 ? false : _context$isMobile3;
-  var platform = isMobile ? 'h5' : 'pc';
-  var methods = collectionMethods(compName, preEngineObj === null || preEngineObj === void 0 ? void 0 : preEngineObj[platform]);
-  methods.forEach(function (fn) {
-    var _fn3;
-    targetComponents = (_fn3 = fn(targetComponents)) !== null && _fn3 !== void 0 ? _fn3 : targetComponents;
-  });
-  return targetComponents;
 };

package/es/error/errorDisplay/Web/Drawer/Drawer.js

@@ -46,7 +46,8 @@ var Drawer = /*#__PURE__*/forwardRef(function (props, ref) {
     _props$errorInfoProps = props.errorInfoProps,
     errorInfoProps = _props$errorInfoProps === void 0 ? {
       tabs: []
-    } : _props$errorInfoProps;
+    } : _props$errorInfoProps,
+    subTitle = props.subTitle;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     extraConts = _useState2[0],
@@ -191,7 +192,10 @@ var Drawer = /*#__PURE__*/forwardRef(function (props, ref) {
         tabsContent = errorInfoProps.tabsContent,
         tabsFooter = errorInfoProps.tabsFooter,
         onTabsChange = errorInfoProps.onTabsChange;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, isDomEle(content) ? /*#__PURE__*/React.createElement("div", {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, isDomEle(subTitle) ? /*#__PURE__*/React.createElement("div", {
+        className: "lx-drawer-sub-title",
+        title: subTitle
+      }, subTitle) : null, isDomEle(content) ? /*#__PURE__*/React.createElement("div", {
         className: "lx-drawer-code-desc"
       }, content) : null, /*#__PURE__*/React.createElement("div", {
         className: classnames('lx-drawer-code-tabs', {

package/es/error/errorDisplay/Web/Drawer/Drawer.less

@@ -386,4 +386,60 @@
       border-radius: 4px;
     }
   }
+
+  &-sub-title {
+    background-color: rgba(28, 36, 46, 0.04);
+    color: rgba(28, 36, 46, 0.55);
+    height: 32px;
+    line-height: 32px;
+    padding: 0 16px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    font-size: 12px;
+  }
+
+  &-btn {
+    display: inline-block;
+    padding: 0 15px;
+    border: 1px solid rgba(28, 36, 46, 0.15);
+    border-radius: 4px;
+    height: 32px;
+    line-height: 30px;
+    color: #1c242e;
+    &:hover {
+      border-color: rgb(112, 158, 250);
+      color: rgb(112, 158, 250);
+    }
+    &-disabled {
+      cursor: not-allowed;
+      pointer-events: none;
+      &,
+      &:hover,
+      &:focus,
+      &:active {
+        border-color: #e5e5e5 !important;
+        color: rgba(28,36,46,0.65) !important;
+        background-color: #e5e5e5 !important;
+        opacity: 1;
+      }
+    }
+  }
+
+  &-btn&-btn-primary {
+    color: rgb(68, 119, 238);
+    background-color: rgb(68, 119, 238);
+    &,
+    &:hover {
+      color: white;
+    }
+    &:hover {
+      border-color: rgb(112, 158, 250);
+      background-color: rgb(112, 158, 250);
+    }
+  }
+
+  &-footer &-btn {
+    margin-left: 8px;
+  }
 }

package/es/error/errorDisplay/Web/Drawer/index.js

@@ -50,7 +50,8 @@ function getDrawerInstance() {
           drawerInstance === null || drawerInstance === void 0 ? void 0 : drawerInstance.update(_objectSpread(_objectSpread({}, prarms), {}, {
             key: cacheKey
           }));
-        }
+        },
+        key: cacheKey
       });
     });
   });
@@ -62,11 +63,13 @@ var drawerHandel = {
       getDrawerInstance(options, function (_ref) {
         var instance = _ref.instance,
           _close = _ref.close,
-          update = _ref.update;
+          update = _ref.update,
+          key = _ref.key;
         var _ref2 = instance || {},
           open = _ref2.open,
           otherInstace = _objectWithoutProperties(_ref2, _excluded);
         open(options);
+        drawerHandel.key = key;
         resolve(_objectSpread(_objectSpread({}, otherInstace), {}, {
           close: function close() {
             if ((options === null || options === void 0 ? void 0 : options.onClose) instanceof Function) {
@@ -81,10 +84,15 @@ var drawerHandel = {
       });
     });
   },
-  close: function close(key) {
+  close: function close() {
+    var key = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : drawerHandel.key;
     Object.keys(drawerInstances).forEach(function (cacheKey) {
       Promise.resolve(drawerInstances[cacheKey]).then(function (instance) {
-        instance.remove(key);
+        if (instance === null || instance === void 0 ? void 0 : instance.remove) {
+          instance.remove(key);
+        } else {
+          instance.close(key);
+        }
       });
       delete drawerInstances[cacheKey];
     });