@lingxiteam/assets 1.0.11-alpha.7 → 1.0.11-alpha.9

package/es/dealDsl/preprocess/common.js

@@ -1,4 +1,4 @@
-import { hasSomeOwnProperty } from '../utils';
+import { hasSomeOwnProperty, hasEveryOwnProperty } from '../utils';
 var h5 = {
   Icon: function Icon() {
     var component = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -77,13 +77,24 @@ 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$props6 = component.props,
+      props = _component$props6 === void 0 ? {} : _component$props6;
+    if (props.hasOwnProperty('action')) {
+      // 旧数据含有action,实际用到的值和columns当中的api是相同
+      props.columns.api = props.action;
+      delete props.action;
+    }
+    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$props7 = component.props,
+      props = _component$props7 === void 0 ? {} : _component$props7;
     var isCurrent = props.isCurrent,
       defaultValue = props.defaultValue,
       customTime = props.customTime;
@@ -110,8 +121,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$props8 = component.props,
+      props = _component$props8 === void 0 ? {} : _component$props8;
     // const { popoverSetting, showPopover } = props;
     if (props.iconType && !props.icon) {
       var theme = props.theme,
@@ -140,15 +151,15 @@ var pc = {
   },
   '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$props9 = component.props,
+      props = _component$props9 === void 0 ? {} : _component$props9;
     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$props10 = component.props,
+      props = _component$props10 === void 0 ? {} : _component$props10;
     delete props.type;
     delete props.theme;
     delete props.fontAddress;
@@ -166,8 +177,8 @@ 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$props11 = component.props,
+      props = _component$props11 === void 0 ? {} : _component$props11;
     delete props.type;
     delete props.theme;
     delete props.fontAddress;
@@ -179,8 +190,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$props12 = component.props,
+      props = _component$props12 === void 0 ? {} : _component$props12;
     if (typeof props.showCustom === 'boolean') {
       // 旧数据
       var iconPosition = props.iconPosition,
@@ -215,14 +226,14 @@ var pc = {
     return component;
   },
   Upload: function Upload(component) {
-    var _component$props12 = component.props,
-      props = _component$props12 === void 0 ? {} : _component$props12;
+    var _component$props13 = component.props,
+      props = _component$props13 === void 0 ? {} : _component$props13;
     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;
     }

package/es/rootConfig/mobile/BusiComp.js

@@ -4,7 +4,7 @@ export default {
   compType: -1,
   isBusiObjContainer: false,
   isContainer: false,
-  label: '页面',
+  label: '业务组件',
   props: {
     objType: 'app',
     catalogItemId: -1

package/es/rootConfig/mobile/MobileModal.js

@@ -4,7 +4,7 @@ export default {
   compType: -1,
   isBusiObjContainer: false,
   isContainer: false,
-  label: '页面',
+  label: '弹窗',
   props: {
     catalogItemId: -1,
     ignoreLogin: false,

package/es/rootConfig/mobile/MobilePopover.js

@@ -4,7 +4,7 @@ export default {
   compType: -1,
   isBusiObjContainer: false,
   isContainer: false,
-  label: '页面',
+  label: '气泡卡片',
   props: {
     pageLayout: 'BaseLayout',
     pageDynamicFlag: false,

package/es/rootConfig/pc/BusiComp.js

@@ -4,7 +4,7 @@ export default {
   compType: -1,
   isBusiObjContainer: false,
   isContainer: false,
-  label: '页面',
+  label: '业务组件',
   props: {
     objType: 'app',
     catalogItemId: -1

package/es/rootConfig/pc/Drawer.js

@@ -4,7 +4,7 @@ export default {
   compType: -1,
   isBusiObjContainer: false,
   isContainer: false,
-  label: '页面',
+  label: '抽屉',
   props: {
     width: 624,
     height: 300,

package/es/rootConfig/pc/Modal.js

@@ -4,7 +4,7 @@ export default {
   compType: -1,
   isBusiObjContainer: false,
   isContainer: false,
-  label: '页面',
+  label: '弹窗',
   props: {
     catalogItemId: -1,
     width: 624,

package/es/rootConfig/pc/Popover.js

@@ -4,7 +4,7 @@ export default {
   compType: -1,
   isBusiObjContainer: false,
   isContainer: false,
-  label: '页面',
+  label: '气泡卡片',
   props: {
     catalogItemId: -1,
     width: 624,

package/es/rootConfig/todoActionList.js

@@ -2169,7 +2169,7 @@ var todoActionObject = {
     label: '给组件设置属性',
     todoOptions: [{
       key: 'rProps',
-      label: '设置远程组件属性',
+      label: '设置自定义组件属性',
       type: 'SelectCustomParams'
     }]
   },

package/es/rootConfig/todoOptionList.js

@@ -979,7 +979,7 @@ var todoOptionList = {
   },
   rProps: {
     key: 'rProps',
-    label: '设置远程组件属性',
+    label: '设置自定义组件属性',
     type: 'SelectCustomParams'
   },
   hasEventExtService: {

package/es/utils/url.js

@@ -1,9 +1,9 @@
-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); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -49,41 +49,54 @@ href 当前文档的完整url
  */
 export var parseUrlExpression = function parseUrlExpression(urlStr) {
   var urlParamsContext = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var _ref = window.location || {},
-    protocol = _ref.protocol,
-    _ref$href = _ref.href,
-    href = _ref$href === void 0 ? '' : _ref$href,
-    port = _ref.port,
-    pathname = _ref.pathname,
-    host = _ref.host,
-    hostname = _ref.hostname,
-    hash = _ref.hash;
-  var defaultParams = {
-    protocol: protocol,
-    href: href,
-    port: port,
-    pathname: pathname,
-    host: host,
-    hostname: hostname,
-    searchObj: getSearchObj(href),
-    search: decodeURIComponent(href.split('?').pop() || ''),
-    hash: decodeURIComponent(hash)
-  };
-  var evalVariableExpression = function evalVariableExpression(text) {
-    var params = _objectSpread(_objectSpread({}, defaultParams), urlParamsContext);
-    try {
-      return Function('context', "\n        with(context) {\n            return (function(){\n              \"use strict\";\n              return ".concat(text.slice(2, text.length - 1), ";\n              })();\n            }\n          "))(params);
-    } catch (error) {
-      console.warn("".concat(text, "\u8868\u8FBE\u5F0F\u6267\u884C\u6709\u8BEF:"), error);
-      return text;
-    }
-  };
-  var regexp = /\$\{(.+?)\}/g;
+  if (urlStr && typeof urlStr !== 'string') {
+    console.error("parseUrlExpression\u5904\u7406".concat(urlStr, "\u65F6\u89E3\u6790\u9519\u8BEF:\u8868\u8FBE\u5F0F\u9700\u4E3A\u5B57\u7B26\u4E32\u683C\u5F0F"));
+    return '';
+  }
+  var extend = urlParamsContext;
   var result = urlStr;
-  if (result) {
-    result = result.replace(regexp, function (str) {
-      return evalVariableExpression(str);
-    });
+  if (_typeof(urlParamsContext) !== 'object') {
+    console.warn("parseUrlExpression\u53C2\u6570\u9519\u8BEF:\u6269\u5C55\u53C2\u6570\u9700\u4E3A\u5BF9\u8C61");
+    extend = {};
+  }
+  try {
+    var _ref = window.location || {},
+      protocol = _ref.protocol,
+      _ref$href = _ref.href,
+      href = _ref$href === void 0 ? '' : _ref$href,
+      port = _ref.port,
+      pathname = _ref.pathname,
+      host = _ref.host,
+      hostname = _ref.hostname,
+      hash = _ref.hash;
+    var defaultParams = {
+      protocol: protocol,
+      href: href,
+      port: port,
+      pathname: pathname,
+      host: host,
+      hostname: hostname,
+      searchObj: getSearchObj(href),
+      search: decodeURIComponent(href.split('?').pop() || ''),
+      hash: decodeURIComponent(hash)
+    };
+    var evalVariableExpression = function evalVariableExpression(text) {
+      var params = _objectSpread(_objectSpread({}, defaultParams), extend);
+      try {
+        return Function('context', "\n          with(context) {\n              return (function(){\n                \"use strict\";\n                return ".concat(text.slice(2, text.length - 1), ";\n                })();\n              }\n            "))(params);
+      } catch (error) {
+        console.warn("parseUrlExpression\u5904\u7406".concat(text, "\u65F6\u89E3\u6790\u9519\u8BEF:"), error);
+        return text;
+      }
+    };
+    var regexp = /\$\{(.+?)\}/g;
+    if (result) {
+      result = result.replace(regexp, function (str) {
+        return evalVariableExpression(str);
+      });
+    }
+  } catch (e) {
+    console.error("parseUrlExpression\u6267\u884C\u9519\u8BEF:", e);
   }
-  return result;
+  return result || '';
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/assets",
-  "version": "1.0.11-alpha.7",
+  "version": "1.0.11-alpha.9",
   "description": "灵犀低代码平台移动端 - 工具类",
   "main": "lib/index.js",
   "module": "es/index.js",