@lingxiteam/assets 1.0.12-alpha.1 → 1.0.12-alpha.11

package/es/dealDsl/preprocess/common.js

@@ -11,6 +11,17 @@ var h5 = {
     } else {
       props.btnIcon = false;
     }
+    if (props.name && !props.children) {
+      props.children = props.name;
+    }
+    if (props.disabled !== undefined) {
+      if (props.disabled) {
+        props.status = '3';
+      } else {
+        props.status = '1';
+      }
+      delete props.disabled;
+    }
     return component;
   },
   Icon: function Icon() {
@@ -120,16 +131,11 @@ var h5 = {
     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;
+        return reg.pattern === oldRegStr;
       });
       if (idCardRegexp) {
-        if (/^\$.+\$$/.test(idCardRegexp.pattern)) {
-          idCardRegexp.pattern = "$".concat(newRegStr, "$");
-        } else {
-          idCardRegexp.pattern = newRegStr;
-        }
+        idCardRegexp.pattern = newRegStr;
       }
     }
     return component;
@@ -314,7 +320,7 @@ var pc = {
             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;", "}"]
+              "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;", "}"]
             }
           };
         }
@@ -388,16 +394,27 @@ var pc = {
     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;
+        return reg.pattern === oldRegStr;
       });
       if (idCardRegexp) {
-        if (/^\$.+\$$/.test(idCardRegexp.pattern)) {
-          idCardRegexp.pattern = "$".concat(newRegStr, "$");
-        } else {
-          idCardRegexp.pattern = newRegStr;
-        }
+        idCardRegexp.pattern = newRegStr;
+      }
+    }
+    return component;
+  },
+  Steps: function Steps(component) {
+    var _component$props17 = component.props,
+      props = _component$props17 === void 0 ? {} : _component$props17;
+    if (props.stepsOptions) {
+      // 兼容存量数据
+      if (props.stepsOptions.type === 'custom') {
+        props.stepsOptions = props.stepsOptions.data;
+      }
+      // 兼容存量服务数据
+      if (props.stepsOptions.type === 'service') {
+        props.alias = props.stepsOptions.data;
+        props.stepsOptions = props.defaultStepsOptions;
       }
     }
     return component;

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

@@ -251,7 +251,7 @@ var ErrorMsg = {
                     };
                     if (isShowFeedback) {
                       footerContent.push( /*#__PURE__*/React.createElement("a", {
-                        className: "lx-feedback-notification-".concat(_param.itemKey, " ").concat(renderDisabled(feedbackPlacements[0], _param.itemKey)),
+                        className: "lx-notification-notice-footer-btn-ghost lx-feedback-notification-".concat(_param.itemKey, " ").concat(renderDisabled(feedbackPlacements[0], _param.itemKey)),
                         config: String(_param.itemKey),
                         onClick: function onClick(e) {
                           if (!(_param === null || _param === void 0 ? void 0 : _param.feedbackState)) {
@@ -407,8 +407,9 @@ var ErrorMsg = {
                               }
                             }
                           }, _callee2, null, [[8, 15]]);
-                        }))
-                      }, "\u5F02\u5E38\u5E2E\u52A9"));
+                        })),
+                        className: "lx-notification-notice-footer-btn-primary"
+                      }, "\u67E5\u770B\u5F02\u5E38\u8BE6\u60C5"));
                     }
                     return _context3.abrupt("return", footerContent);
                   case 29:

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

@@ -125,15 +125,33 @@
 
     &-head + &-footer,
     &-content + &-footer {
-      margin-top: 12px;
+      margin-top: 14px;
     }
 
     &-footer {
       text-align: right;
       a {
         display: inline-block;
-        padding: 3px 0 2px 14px;
+        padding: 2px 4px;
+        border-radius: 2px;
+        margin-left: 8px;
+        &:hover {
+          opacity: .9;
+        }
+      }
+      &-btn-ghost {
+        color: #4477EE !important;
+        border: 1px solid  #4477EE;
+        &.lx-notification-btn-disabled {
+          border-color: rgba(28, 36, 46, 0.25) !important;
+        }
+      }
+      &-btn-primary {
+        color: #fff !important;
+        background-color: #4477EE;
+        border: 1px solid  #4477EE;
       }
+
     }
   }
 
@@ -142,7 +160,7 @@
     pointer-events: none;
     &,
     &:hover {
-      color: rgba(28,36,46,0.75) !important;
+      color: rgba(28,36,46,0.25) !important;
       background-color: white !important;
     }
   }

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

@@ -1,7 +1,7 @@
 import { resolveRequestPath } from '../compUtils';
 export var defaultGlobalConfig = {
   duration: 3500,
-  maxLine: null,
+  maxLine: 20,
   // 最多行数
   maxLen: null,
   // 最多字数

package/es/rootConfig/mobile/BusiComp.js

@@ -39,7 +39,8 @@ export default {
     todoOptions: [{
       key: 'fileId',
       label: '文件ID',
-      type: 'SetExpression'
+      type: 'SetExpression',
+      labelTip: '文件ID的预览形式支持：pdf、jpg、jpeg、png、svg、mp4、mov、txt、html、doc、xlsx、docx、wps、ppt！ 注意：如果是外部URL，支持图片，pdf，world，xlsx 注意：如果是外部URL，有可能存在跨域现象！'
     }],
     classification: [{
       label: '页面类',

package/es/rootConfig/mobile/MobileModal.js

@@ -15,9 +15,9 @@ export default {
     catalogItemId: -1,
     ignoreLogin: false,
     mode: 'alert',
-    closeOnClickOverlay: false,
-    destroyOnClose: false,
-    showCloseButton: false,
+    closeOnClickOverlay: true,
+    destroyOnClose: true,
+    showCloseButton: true,
     compState: [{
       name: '业务主键',
       code: 'bizId'
@@ -39,7 +39,8 @@ export default {
     todoOptions: [{
       key: 'fileId',
       label: '文件ID',
-      type: 'SetExpression'
+      type: 'SetExpression',
+      labelTip: '文件ID的预览形式支持：pdf、jpg、jpeg、png、svg、mp4、mov、txt、html、doc、xlsx、docx、wps、ppt！ 注意：如果是外部URL，支持图片，pdf，world，xlsx 注意：如果是外部URL，有可能存在跨域现象！'
     }],
     classification: [{
       label: '页面类',

package/es/rootConfig/mobile/MobilePopover.js

@@ -41,7 +41,8 @@ export default {
     todoOptions: [{
       key: 'fileId',
       label: '文件ID',
-      type: 'SetExpression'
+      type: 'SetExpression',
+      labelTip: '文件ID的预览形式支持：pdf、jpg、jpeg、png、svg、mp4、mov、txt、html、doc、xlsx、docx、wps、ppt！ 注意：如果是外部URL，支持图片，pdf，world，xlsx 注意：如果是外部URL，有可能存在跨域现象！'
     }],
     classification: [{
       label: '页面类',

package/es/rootConfig/mobile/page.d.ts

@@ -9,6 +9,7 @@ declare const _default: {
         pageDynamicFlag: boolean;
         catalogItemId: number;
         ignoreLogin: boolean;
+        hideNavBar: boolean;
         layout: string;
         searchParams: {
             name: string;
@@ -172,6 +173,12 @@ declare const _default: {
             type: string;
             props: {};
         };
+        colorType: {
+            groupsName: string;
+            label: string;
+            type: string;
+            props: {};
+        };
     };
 };
 export default _default;

package/es/rootConfig/mobile/page.js

@@ -16,6 +16,7 @@ export default {
     pageDynamicFlag: false,
     catalogItemId: -1,
     ignoreLogin: false,
+    hideNavBar: false,
     layout: 'BaseLayout',
     searchParams: [{
       name: '业务主键',
@@ -51,7 +52,8 @@ export default {
     todoOptions: [{
       key: 'fileId',
       label: '文件ID',
-      type: 'SetExpression'
+      type: 'SetExpression',
+      labelTip: '文件ID的预览形式支持：pdf、jpg、jpeg、png、svg、mp4、mov、txt、html、doc、xlsx、docx、wps、ppt！ 注意：如果是外部URL，支持图片，pdf，world，xlsx 注意：如果是外部URL，有可能存在跨域现象！'
     }],
     classification: [{
       label: '页面类',
@@ -209,6 +211,12 @@ export default {
       label: '填充类型',
       type: 'BackgroundType',
       props: {}
+    },
+    colorType: {
+      groupsName: '标题&返回键颜色',
+      label: '填充类型',
+      type: 'BackgroundType',
+      props: {}
     }
   }
 };

package/es/rootConfig/pc/page.d.ts

@@ -30,25 +30,8 @@ declare const _default: {
     todoEvents: ({
         value: string;
         label: string;
-        terminal?: undefined;
-        params?: undefined;
         dependProps?: undefined;
-    } | {
-        value: string;
-        label: string;
-        terminal: string[];
         params?: undefined;
-        dependProps?: undefined;
-    } | {
-        value: string;
-        label: string;
-        terminal: string[];
-        params: {
-            title: string;
-            name: string;
-            value: string;
-        }[];
-        dependProps?: undefined;
     } | {
         value: string;
         label: string;
@@ -60,7 +43,6 @@ declare const _default: {
             name: string;
             value: string;
         }[];
-        terminal?: undefined;
     })[];
     todoProps: {
         pageName: {

package/es/rootConfig/pc/page.js

@@ -100,19 +100,6 @@ export default {
   }, {
     value: 'willUnmount',
     label: '页面退出'
-  }, {
-    value: 'onLeftClick',
-    label: '页面返回点击事件',
-    terminal: ['mobile']
-  }, {
-    value: 'otherPageMessage',
-    label: '接收页面信息',
-    terminal: ['mobile'],
-    params: [{
-      title: '接收数据信息',
-      name: 'p',
-      value: '$p$'
-    }]
   }, {
     value: 'onPageCacheRefresh',
     label: '页面缓存刷新',

package/es/rootConfig/todoActionList.d.ts

@@ -531,10 +531,19 @@ declare const todoActionObject: {
             label: string;
             type: string;
             props: {
-                options: {
+                options: ({
                     title: string;
                     value: string;
-                }[];
+                    key?: undefined;
+                    label?: undefined;
+                    type?: undefined;
+                } | {
+                    key: string;
+                    label: string;
+                    type: string;
+                    title?: undefined;
+                    value?: undefined;
+                })[];
             };
         } | {
             key: string;
@@ -1416,6 +1425,17 @@ declare const todoActionObject: {
             labelTip: string;
             props: {
                 placeholder: string;
+                defaultValue?: undefined;
+            };
+            aliasKey?: undefined;
+        } | {
+            key: string;
+            label: string;
+            type: string;
+            labelTip: string;
+            props: {
+                defaultValue: boolean;
+                placeholder?: undefined;
             };
             aliasKey?: undefined;
         })[];
@@ -2363,9 +2383,20 @@ declare const todoActionObject: {
                 isRequired: boolean;
                 valuePropName: string;
                 options: {
-                    fileUpload: boolean;
                     refreshKey: string[];
-                    serviceTabs: string[];
+                    serviceTabs: ({
+                        key: string;
+                        description: string;
+                        filterParams: {
+                            fileInputEnabled: string;
+                        };
+                        fileUpload?: undefined;
+                    } | {
+                        key: string;
+                        fileUpload: boolean;
+                        description: string;
+                        filterParams?: undefined;
+                    })[];
                 };
             };
         } | {

package/es/rootConfig/todoActionList.js

@@ -644,6 +644,10 @@ var todoActionObject = {
       aliasKey: 'searchParams',
       label: 'url参数',
       type: 'SearchParams'
+    }, {
+      key: 'routerData',
+      label: '路由数据',
+      type: 'RouterData'
     }]
   },
   historyReplace: {
@@ -675,6 +679,10 @@ var todoActionObject = {
         }, {
           title: '路由替换',
           value: 'replace'
+        }, {
+          key: 'routerData',
+          label: '路由数据',
+          type: 'RouterData'
         }]
       }
     }, {
@@ -686,6 +694,10 @@ var todoActionObject = {
       aliasKey: 'searchParams',
       label: 'url参数',
       type: 'SearchParams'
+    }, {
+      key: 'routerData',
+      label: '路由数据',
+      type: 'RouterData'
     }],
     classification: [{
       label: '页面类',
@@ -1686,6 +1698,14 @@ var todoActionObject = {
       props: {
         placeholder: '包括后缀，如: 表格.xls'
       }
+    }, {
+      key: 'zip',
+      label: '单文件压缩',
+      type: 'Switch',
+      labelTip: '默认为单文件不压缩，多文件压缩，若开启单文件压缩为“是”，则不区分单文件/多文件，都压缩。',
+      props: {
+        defaultValue: false
+      }
     }],
     classification: [{
       label: '下载',
@@ -2680,9 +2700,18 @@ var todoActionObject = {
         isRequired: true,
         valuePropName: 'custUrl',
         options: {
-          fileUpload: true,
           refreshKey: ['objectFields'],
-          serviceTabs: [SERVICE_KEY.STD, SERVICE_KEY.INNER]
+          serviceTabs: [{
+            key: SERVICE_KEY.STD,
+            description: '此处仅展示开启文件入参的编排服务，服务入参需包含impFile(文件类型)字段用于接收文件和param(对象类型，非必须)字段接收自定义参数',
+            filterParams: {
+              fileInputEnabled: 'T'
+            }
+          }, {
+            key: SERVICE_KEY.INNER,
+            fileUpload: true,
+            description: '此处仅展示开启上传控件中使用的请求层服务，服务入参需包含impFile(文件类型)字段用于接收文件和param(对象类型，非必须)字段接收自定义参数'
+          }]
         }
       }
     }, {
@@ -3693,9 +3722,9 @@ var todoActionObject = {
     }]
   }
 };
-var mobileTodoActionKeys = ['showMessage', 'hideMessage', 'apiRequest', 'JSBridge', 'apiRequestByFlow', 'openFlowPage', 'rollbackFlow', 'openFlowDiagram', 'console', 'sysSetVisible', 'sysSetValue', 'sysSetDisable', 'sysSetRequired', 'showModal', 'showAppCustomModal', 'showDrawer', 'historyPush', 'historyReplace', 'history', 'dropPageByCatch', 'historyGoBack', 'setStatesByKeyAndValue', 'getStatesByKey', 'setCompNestedState', 'getCompNestedState', 'okCallbackData', 'closeModal', 'setDownloadResponse', 'saveBlobFile', 'setTimeout', 'setInterval', 'setTimer', 'clearTimer', 'validateAllAppForm', 'getAllFormValues', 'resetAllForm', 'pushScenePage', 'reloadDataSource', 'setDataSource', 'resetDataSource', 'postObjectData', 'postParentMessage', 'addEventListenerParentMessage', 'callFishParentFunc', 'callSelfFunc', 'callParentCustomFunc', 'callCustomPageFunc', 'exportBusiObjectData', 'exportCustomData', 'importBusiObjectData', 'exportSQLServiceData', 'importCustomBusiObjectData', 'exportCustomBusiObjectData', 'exportPage', 'importCustomData',
+var mobileTodoActionKeys = ['showMessage', 'hideMessage', 'apiRequest', 'JSBridge', 'console', 'sysSetVisible', 'sysSetValue', 'sysSetDisable', 'sysSetRequired', 'showModal', 'showAppCustomModal', 'showDrawer', 'historyPush', 'historyReplace', 'history', 'dropPageByCatch', 'historyGoBack', 'setStatesByKeyAndValue', 'getStatesByKey', 'setCompNestedState', 'getCompNestedState', 'okCallbackData', 'closeModal', 'setDownloadResponse', 'setTimeout', 'setInterval', 'setTimer', 'clearTimer', 'validateAllAppForm', 'getAllFormValues', 'resetAllForm', 'reloadDataSource', 'setDataSource', 'resetDataSource', 'postObjectData', 'postParentMessage', 'addEventListenerParentMessage', 'callFishParentFunc', 'callSelfFunc', 'callParentCustomFunc', 'callCustomPageFunc',
 // 'previewFile',
-'return', 'copyToClipboard', 'addDebugger', 'reload', 'customActionCode', 'getItemFromLocalStorage', 'setItemToLocalStorage', 'getLocalLocation'
+'return', 'copyToClipboard', 'reload', 'customActionCode', 'getItemFromLocalStorage', 'setItemToLocalStorage', 'getLocalLocation'
 // 'sysSetState'
 ];
 

package/es/rootConfig/todoOptionList.d.ts

@@ -952,9 +952,20 @@ declare const todoOptionList: {
             isRequired: boolean;
             valuePropName: string;
             options: {
-                fileUpload: boolean;
                 refreshKey: string[];
-                serviceTabs: string[];
+                serviceTabs: ({
+                    key: string;
+                    description: string;
+                    filterParams: {
+                        fileInputEnabled: string;
+                    };
+                    fileUpload?: undefined;
+                } | {
+                    key: string;
+                    fileUpload: boolean;
+                    description: string;
+                    filterParams?: undefined;
+                })[];
             };
         };
     };

package/es/rootConfig/todoOptionList.js

@@ -1126,9 +1126,18 @@ var todoOptionList = {
       isRequired: true,
       valuePropName: 'custUrl',
       options: {
-        fileUpload: true,
         refreshKey: ['objectFields'],
-        serviceTabs: [SERVICE_KEY.STD, SERVICE_KEY.INNER]
+        serviceTabs: [{
+          key: SERVICE_KEY.STD,
+          description: '此处仅展示开启文件入参的编排服务，服务入参需包含impFile(文件类型)字段用于接收文件和param(对象类型，非必须)字段接收自定义参数',
+          filterParams: {
+            fileInputEnabled: 'T'
+          }
+        }, {
+          key: SERVICE_KEY.INNER,
+          fileUpload: true,
+          description: '此处仅展示开启上传控件中使用的请求层服务，服务入参需包含impFile(文件类型)字段用于接收文件和param(对象类型，非必须)字段接收自定义参数'
+        }]
       }
     }
   },

package/es/security/encipher/sign.d.ts

@@ -1,4 +1,5 @@
 export declare const createHttpSignStr: (url: string, options: any) => string;
+export declare const buildXSignUrl: (url: string, options?: any) => string;
 declare const _default: {
     createHttpSignStr: (url: string, options: any) => string;
     getApiPath: (url: string) => string | undefined;

package/es/security/encipher/sign.js

@@ -1,3 +1,8 @@
+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."); }
@@ -6,8 +11,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { SHA256 } from 'crypto-js';
-import { obj2QueryString } from '../../utils/url';
+import { obj2QueryString, decodeQueryString } from '../../utils/url';
 import CookieUtil from '../../utils/cookieUtil';
+import { signKey } from '../const';
 var SIGN_KEY = process.env.LING_XI_HTTP_SIGN_KEY || 'zrT5bi2escXilaH1fs653uZiH9RWfzCS';
 // 注意：修改此文件请跑测试用例, npm run test
 // 1、签名算法：
@@ -30,7 +36,7 @@ var SIGN_KEY = process.env.LING_XI_HTTP_SIGN_KEY || 'zrT5bi2escXilaH1fs653uZiH9R
 // 由于X-B 的规则可能被业务网关使用，并往请求头增加内容，导致前后端加密不一致
 // 2022.08.09 使用以下3个固定值 + X-LX-*匹配 方式
 var hKeys = ['X-B-AUTH', 'X-B-TARGET-ID', 'APP-ID'];
-var userKeyInCookie = process.env.LING_XI_USER_KEY_IN_COOKIE || 'X-LX-N-ID';
+var userKeyInCookie = window.lxDataSaltCode || process.env.LING_XI_USER_KEY_IN_COOKIE || 'X-LX-N-ID';
 // 配置指定接口前缀,2023-03-16规则调整，不需要使用
 // const apiPrefix =
 //   process.env.LING_XI_HTTP_SIGN_API_PERFIX ||
@@ -75,7 +81,8 @@ export var createHttpSignStr = function createHttpSignStr(url, options) {
   // 获取参数3: 请求参数
   var params = '';
   if (method.toLowerCase() === 'get') {
-    params = urlSearch;
+    // 为保证与后端值一致此处需要将数据进行解码
+    params = decodeQueryString(urlSearch);
   } else {
     params = _typeof(body) === 'object' ? JSON.stringify(body) : body;
   }
@@ -95,6 +102,17 @@ export var createHttpSignStr = function createHttpSignStr(url, options) {
   // 生成约定签名
   return SHA256(str).toString();
 };
+// 由于（img、script）无法进行处理请求头，将签名参数x-sign放到url参数里
+export var buildXSignUrl = function buildXSignUrl(url) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  if (!url) {
+    return '';
+  }
+  var signStr = createHttpSignStr(url, _objectSpread({
+    method: 'GET'
+  }, options));
+  return "".concat(url).concat(url.includes('?') ? '&' : '?').concat(signKey, "=").concat(signStr);
+};
 export default {
   createHttpSignStr: createHttpSignStr,
   getApiPath: getApiPath

package/es/security/fetch.js

@@ -1,7 +1,10 @@
 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); }
+var _excluded = ["disabledSignKey"];
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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; }
@@ -110,11 +113,22 @@ function encrypted(url, opts, type) {
 //   });
 // }
 var fetch = function fetch(url) {
+  var _opts$headers;
   var fetchOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var opts = _objectSpread({}, fetchOptions);
   var optSecurityHeaderKey = (opts.headers || {})[securityHeaderKey];
   var isDebug = (config === null || config === void 0 ? void 0 : config.debug) || window.lxDebug || !!window.localStorage.getItem('lxDebug') || true;
+  // 如果在headers 传入disabledSignKey标识 标识不启用加密
+  if ((opts === null || opts === void 0 ? void 0 : (_opts$headers = opts.headers) === null || _opts$headers === void 0 ? void 0 : _opts$headers.disabledSignKey) === true) {
+    // 不能直接删除，否则会导致disabledSignKey 这个节点删除了，第二次进来的时候导致异常
+    var _opts$headers2 = opts === null || opts === void 0 ? void 0 : opts.headers,
+      disabledSignKey = _opts$headers2.disabledSignKey,
+      resprops = _objectWithoutProperties(_opts$headers2, _excluded);
+    return originFetch(url, _objectSpread(_objectSpread({}, opts), {}, {
+      headers: _objectSpread({}, resprops)
+    }));
+  }
   // ------ 参数签名(默认) ------
   if (
   // 配置开启加密

package/es/security/httpEncryption.js

@@ -11,7 +11,7 @@
 // 使用方式2: 使用fetch请求模块，将window.fetch 替换成 fetch，适应自己封装的fetch模块
 // 使用方式3: 不使用fetch请求模块，使用createHttpSignStr自己获取签名，自行在header上添加参数
 
-import { createHttpSignStr } from './encipher/sign';
+import { createHttpSignStr, buildXSignUrl } from './encipher/sign';
 // eslint-disable-next-line import/no-named-as-default, import/no-named-as-default-member
 import fetch from './fetch';
 var isHttpEncryption = false;
@@ -70,5 +70,6 @@ export default {
   start: start,
   stop: stop,
   fetch: fetch,
-  createHttpSignStr: createHttpSignStr
+  createHttpSignStr: createHttpSignStr,
+  buildXSignUrl: buildXSignUrl
 };