ls-pro-common 3.0.88 → 3.0.90

package/lib/hooks/useDict.js

@@ -0,0 +1,60 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { getDict } from '../http';
+import { useEffect, useState } from 'react';
+/** Value转换数字 */
+var transformNum = function transformNum(options) {
+  return options.map(function (v) {
+    return _objectSpread(_objectSpread({}, v), {}, {
+      value: Number(v.value)
+    });
+  });
+};
+/**
+ * 获取字典
+ *
+ * @param dicts 字典列表
+ * @param type 字典类型 默认 tenant
+ */
+export function useDict(dicts) {
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    dictList = _useState2[0],
+    setDictList = _useState2[1];
+  useEffect(function () {
+    var keys = Object.keys(dicts);
+    var pList = [];
+    var result = {};
+    keys.forEach(function (k) {
+      if (typeof dicts[k] === 'string') {
+        pList.push(getDict(dicts[k]));
+      } else if (typeof dicts[k] === 'function') {
+        var fn = dicts[k];
+        pList.push(fn());
+      } else {
+        var _dicts$k = dicts[k],
+          dict = _dicts$k.dict,
+          showValue = _dicts$k.showValue,
+          isValNum = _dicts$k.isValNum,
+          _dicts$k$transform = _dicts$k.transform,
+          transform = _dicts$k$transform === void 0 ? function (d) {
+            return d;
+          } : _dicts$k$transform;
+        var _transform = transform;
+        if (isValNum) _transform = transformNum;
+        pList.push(getDict(dict, showValue).then(_transform));
+      }
+    });
+    Promise.allSettled(pList).then(function (res) {
+      res.forEach(function (v, i) {
+        if (v.status === 'fulfilled') {
+          result[keys[i]] = v.value;
+        } else {
+          result[keys[i]] = [];
+        }
+      });
+      setDictList(result);
+    });
+  }, []);
+  return dictList;
+}

package/lib/http/index.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
@@ -15,6 +16,7 @@ var httpStatus = {
 };
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
+  var _options$params;
   var token = getCookie('token');
   options.headers = options.headers || {};
   // 处理 token
@@ -47,12 +49,14 @@ request.interceptors.request.use(function (url, options) {
   }
 
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
+  var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {
-    resCode: getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
     _t1: Date.now()
   };
-  if (!param.resCode) {
-    delete param.resCode;
+  // 当没有明文参数resCode的时候，添加resCode参数为资源Id
+  //@ts-ignore
+  if (resCode && !((_options$params = options.params) === null || _options$params === void 0 ? void 0 : _options$params.resCode)) {
+    param.resCode = resCode;
   }
   url = setUrlQuery(url, param);
   return {
@@ -204,7 +208,9 @@ function ajax(url) {
       timeout: timeout,
       requestType: isJson ? 'json' : 'form'
     }).finally(function () {
-      return exitLoading();
+      if (loadText) {
+        exitLoading();
+      }
     });
   }
 }
@@ -322,12 +328,11 @@ function _fetchOptions() {
           _yield$httpGet$rows = _yield$httpGet.rows;
           rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
           data = (rows || []).map(function (o) {
-            return {
+            return _objectSpread(_objectSpread({}, o), {}, {
               value: o[valueField],
               text: o[labelField],
-              label: (showValue ? o[valueField] + '→' : '') + o[labelField],
-              status: o.status
-            };
+              label: (showValue ? o[valueField] + '→' : '') + o[labelField]
+            });
           });
           return _context2.abrupt("return", data);
         case 10:

package/lib/index.d.ts

@@ -31,10 +31,12 @@ import useBaseDict from './hooks/useBaseDict';
 import useSelectOptions from './hooks/useSelectOptions';
 import showConfirmFun from './hooks/useShowConfirm';
 import useQueue from './hooks/useQueue';
+import { useDict } from './hooks/useDict';
 /** Type */
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 import type { DescritionCardProps } from './components/DescritionCard';
 import type { PermissionProps } from './components/Permission';
-export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps, };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, showConfirmFun, exportProcess, };
+import type { TDict } from './hooks/useDict';
+export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps, TDict, };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, showConfirmFun, exportProcess, };

package/lib/index.js

@@ -31,4 +31,5 @@ import useBaseDict from './hooks/useBaseDict';
 import useSelectOptions from './hooks/useSelectOptions';
 import showConfirmFun from './hooks/useShowConfirm';
 import useQueue from './hooks/useQueue';
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, showConfirmFun, exportProcess };
+import { useDict } from './hooks/useDict';
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, showConfirmFun, exportProcess };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.88",
+  "version": "3.0.90",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [