@freelog/tools-lib 0.1.150 → 0.1.152

package/dist/tools-lib.esm.js

@@ -119,11 +119,11 @@ var Format = {
 var EXHIBIT_NAME = /*#__PURE__*/new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/); // 资源名称
 
 var RESOURCE_NAME = /*#__PURE__*/new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/); // 资源类型
-// export const RESOURCE_TYPE: RegExp = new RegExp(/^(?!_)[a-z0-9_]{3,20}(?<!_)$/);
 
-var RESOURCE_TYPE = /*#__PURE__*/new RegExp(/^[a-z0-9][a-z0-9_]{1,18}[a-z0-9]$/); // 自定义属性键
+var RESOURCE_TYPE = /*#__PURE__*/new RegExp("^[\u4E00-\u9FEFa-zA-Z0-9\\-&.,]{1,40}$"); // 自定义属性键
+// export const CUSTOM_KEY: RegExp = new RegExp(/^[a-zA-Z_]([a-zA-Z0-9_]{1,19})?$/);
 
-var CUSTOM_KEY = /*#__PURE__*/new RegExp(/^[a-zA-Z0-9_]{1,20}$/); // 节点名称
+var CUSTOM_KEY = /*#__PURE__*/new RegExp('^[a-zA-Z]([a-zA-Z0-9_]{1,19})?$'); // 节点名称
 
 var NODE_NAME = /*#__PURE__*/new RegExp(/^[\u4E00-\u9FA5|a-zA-Z0-9]{2,24}$/); // 节点地址
 // export const NODE_DOMAIN: RegExp = new RegExp(/^(?!-)[a-z0-9-]{4,24}(?<!-)$/);
@@ -146,8 +146,9 @@ var PASSWORD = /*#__PURE__*/new RegExp(/^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,24})$/);
 var NATURAL_NUMBER = /*#__PURE__*/new RegExp(/^[0-9]*$/); // 正整数
 
 var POSITIVE_INTEGER = /*#__PURE__*/new RegExp(/^[1-9]\d*$/); // 最多两位小数的正数
+// export const MAX_2_DECIMAL_POSITIVE_NUMBER = new RegExp(/^\d+(.\d{1,2})?$/);
 
-var MAX_2_DECIMAL_POSITIVE_NUMBER = /*#__PURE__*/new RegExp(/^\d+(.\d{1,2})?$/); // 对象的Bucket名称
+var MAX_2_DECIMAL_POSITIVE_NUMBER = /*#__PURE__*/new RegExp(/^\d+(\.\d{0,2})?$/); // 对象的Bucket名称
 
 var BUCKET_NAME = /*#__PURE__*/new RegExp(/^([a-z0-9][a-z0-9-]{0,61})?[a-z0-9]$/); // JS变量名称
 
@@ -1805,6 +1806,16 @@ function getResourceAttrListSimple(_ref20) {
     params: params
   });
 }
+function listSimple4Recently(_temp2) {
+  var _ref21 = _temp2 === void 0 ? {} : _temp2,
+      params = _extends({}, _ref21);
+
+  return FUtil.Request({
+    method: 'GET',
+    url: "/v2/resources/types/listSimple4Recently",
+    params: params
+  });
+}
 
 var Resource = {
   __proto__: null,
@@ -1838,7 +1849,8 @@ var Resource = {
   resourceTypes: resourceTypes$1,
   ListSimpleByParentCode: ListSimpleByParentCode,
   getResourceTypeInfoByCode: getResourceTypeInfoByCode,
-  getResourceAttrListSimple: getResourceAttrListSimple
+  getResourceAttrListSimple: getResourceAttrListSimple,
+  listSimple4Recently: listSimple4Recently
 };
 
 var _excluded$4 = ["loginName"];
@@ -2891,13 +2903,13 @@ function getFilesSha1Info(_x, _x2) {
 
 function _getFilesSha1Info() {
   _getFilesSha1Info = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref, cdPartially) {
-    var sha1, delay, needHandleSha1, allData, _yield$Storage$filesL, ret, errCode, data, msg, finishedInfo;
+    var sha1, resourceTypeCode, delay, needHandleSha1, allData, _yield$Storage$filesL, ret, errCode, data, msg, finishedInfo;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            sha1 = _ref.sha1;
+            sha1 = _ref.sha1, resourceTypeCode = _ref.resourceTypeCode;
 
             if (cdPartially === void 0) {
               cdPartially = function cdPartially() {
@@ -2924,7 +2936,8 @@ function _getFilesSha1Info() {
 
             _context.next = 10;
             return filesListInfo({
-              sha1: needHandleSha1.join(',')
+              sha1: needHandleSha1.join(','),
+              resourceTypeCode: resourceTypeCode
             });
 
           case 10:
@@ -2967,9 +2980,9 @@ function _getFilesSha1Info() {
                 state = 'success';
               } else if (d.metaAnalyzeStatus === 3) {
                 state = 'fail';
-              }
+              } // console.log(d, '90wieojiksdjf;lkasdjf;lksdjflksjdflkjsdlfkjsdlkj');
+
 
-              console.log(d, '90wieojiksdjf;lkasdjf;lksdjflksjdflkjsdlfkjsdlkj');
               return {
                 sha1: d.sha1,
                 state: state,