@lingxiteam/assets 3.2.1 → 3.3.1-alpha.2

package/lib/rootConfig/todoOptionList.d.ts

@@ -953,9 +953,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/lib/rootConfig/todoOptionList.js

@@ -596,7 +596,7 @@ var todoOptionList = {
   inlineeditrow: {
     key: 'inlineeditrow',
     label: '指定行id',
-    type: 'SelectParams'
+    type: 'SetExpression'
   },
   stateval: {
     key: 'stateval',
@@ -779,7 +779,7 @@ var todoOptionList = {
   flowWorkOrderId: {
     key: 'workOrderId',
     label: '业务工单 ID',
-    type: 'SelectParams'
+    type: 'SetExpression'
   },
   // 这里三个字段没设置type。经协商(gy)为无用类型，先注释
   // 流程页面按钮动作服务响应数据
@@ -1028,13 +1028,13 @@ var todoOptionList = {
   busiObjectFilterParams: {
     key: 'busiObjectFilterParams',
     label: '查询条件',
-    type: 'SelectParams'
+    type: 'SetExpression'
   },
   filterParams: {
     // 入参
     key: 'filterParams',
     label: '查询条件',
-    type: 'SelectParams'
+    type: 'SetExpression'
   },
   busiObjectFields: {
     key: 'busiObjectFields',
@@ -1133,9 +1133,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(对象类型，非必须)字段接收自定义参数'
+        }]
       }
     }
   },
@@ -1429,7 +1438,7 @@ var todoOptionList = {
         // 入参
         key: 'filterParams',
         label: '查询条件',
-        type: 'SelectParams'
+        type: 'SetExpression'
       }, {
         key: 'objectFields',
         label: '导出字段',

package/lib/security/encipher/sign.js

@@ -37,7 +37,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 ||
@@ -82,7 +82,8 @@ var createHttpSignStr = function createHttpSignStr(url, options) {
   // 获取参数3: 请求参数
   var params = '';
   if (method.toLowerCase() === 'get') {
-    params = urlSearch;
+    // 为保证与后端值一致此处需要将数据进行解码
+    params = (0, _url.decodeQueryString)(urlSearch);
   } else {
     params = _typeof(body) === 'object' ? JSON.stringify(body) : body;
   }

package/lib/security/fetch.js

@@ -116,11 +116,18 @@ 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 || {})[_const.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) {
+    var _opts$headers2;
+    opts === null || opts === void 0 ? true : (_opts$headers2 = opts.headers) === null || _opts$headers2 === void 0 ? true : delete _opts$headers2.disabledSignKey;
+    return originFetch(url, opts);
+  }
   // ------ 参数签名(默认) ------
   if (
   // 配置开启加密

package/lib/theme/bin/default/theme.js

@@ -317,7 +317,7 @@ var theme = {
   'margin-xs': '8px',
   'margin-xxs': '4px',
   'margin-xxxs': '2px',
-  'page-space': '0 40px 16px 40px',
+  'page-space': '0px',
   'box-padding-base': '20px',
   'box-padding-sm': '12px',
   'size-xs': '16px',

package/lib/theme/bin/default/theme.less

@@ -314,7 +314,7 @@
 @margin-xs: 8px;
 @margin-xxs: 4px;
 @margin-xxxs: 2px;
-@page-space: 0 40px 16px 40px;
+@page-space: 0px;
 @box-padding-base: 20px;
 @box-padding-sm: 12px;
 @size-xs: 16px;

package/lib/theme/bin/default/theme.scss

@@ -314,7 +314,7 @@ $margin-sm: 12px;
 $margin-xs: 8px;
 $margin-xxs: 4px;
 $margin-xxxs: 2px;
-$page-space: 0 40px 16px 40px;
+$page-space: 0px;
 $box-padding-base: 20px;
 $box-padding-sm: 12px;
 $size-xs: 16px;

package/lib/theme/index.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var https = require('https');
+var fs = require('fs');
+var path = require('path');
+var unzipper = require('unzipper');
+
+// 下载远程zip文件到本地
+function downloadRemoteZipFile(url, localFilePath) {
+  var file = fs.createWriteStream(localFilePath);
+  return new Promise(function (resolve, reject) {
+    https.get(url, function (response) {
+      response.pipe(file);
+      file.on('finish', function () {
+        file.close();
+        resolve();
+      });
+      file.on('error', function (error) {
+        fs.unlink(localFilePath, function () {
+          reject(error);
+        });
+      });
+    }).on('error', function (error) {
+      reject(error);
+    });
+  });
+}
+
+// 解压文件
+function extractZip(zipFilePath, outputDirectory) {
+  fs.createReadStream(zipFilePath).pipe(unzipper.Extract({
+    path: outputDirectory
+  })).on('close', function () {
+    console.log('remote zip file extract success！');
+    fs.unlink(zipFilePath, function () {
+      console.log('remote zip file delete success！');
+    });
+  }).on('error', function (err) {
+    console.error('remote zip file extract error', err);
+  });
+}
+
+// 获取主题
+var getTheme = function getTheme() {
+  // TODO 借用cdn.jsdelivr.net 平台存最新的变量文件
+  var remoteZipUrl = 'https://cdn.jsdelivr.net/npm/@lingxiteam/theme@latest/bin/default.zip';
+  var localFilePath = path.resolve(__dirname, './bin/default.zip');
+  var outputDirectory = path.resolve(__dirname, './bin');
+  downloadRemoteZipFile(remoteZipUrl, localFilePath).then(function () {
+    console.log('remote zip file download success！,beigin extract......');
+    extractZip(localFilePath, outputDirectory);
+  }).catch(function (error) {
+    console.error('emote zip file download error:', error);
+  });
+};
+var _default = getTheme;
+exports.default = _default;

package/lib/theme/src/default/index.js

@@ -159,7 +159,7 @@ var margins = {
 
 // 页面间距
 var pageSpaces = {
-  'page-space': '0 40px 16px 40px'
+  'page-space': '0px'
 };
 
 // 盒子区块间距

package/lib/utils/url.d.ts

@@ -1,4 +1,5 @@
 export declare const obj2QueryString: (params: any) => string;
+export declare const decodeQueryString: (queryStr: string) => string;
 export declare const getSearchObj: (url?: string) => {};
 /**
  * 解析路径地址表达式

package/lib/utils/url.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseUrlExpression = exports.obj2QueryString = exports.getSearchObj = void 0;
+exports.parseUrlExpression = exports.obj2QueryString = exports.getSearchObj = exports.decodeQueryString = void 0;
 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; }
@@ -23,6 +23,12 @@ var obj2QueryString = function obj2QueryString(params) {
   return queryString;
 };
 exports.obj2QueryString = obj2QueryString;
+var decodeQueryString = function decodeQueryString(queryStr) {
+  return queryStr === null || queryStr === void 0 ? void 0 : queryStr.replace(/[^&=]+/g, function (mat) {
+    return decodeURIComponent(mat);
+  });
+};
+exports.decodeQueryString = decodeQueryString;
 var getSearchObj = function getSearchObj() {
   var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : window.location.href;
   var urlArr = url.split('?');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/assets",
-  "version": "3.2.1",
+  "version": "3.3.1-alpha.2",
   "description": "灵犀低代码平台移动端 - 工具类",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -37,8 +37,9 @@
   },
   "gitHead": "bcd338198e2c14459538542d10600ab03abc92f2",
   "dependencies": {
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
     "jsencrypt": "^3.1.0",
-    "tinycolor2": "^1.6.0"
+    "tinycolor2": "^1.6.0",
+    "unzipper": "^0.10.14"
   }
 }