ls-pro-common 3.0.87 → 3.0.89

package/lib/hooks/useDict.d.ts

@@ -0,0 +1,26 @@
+declare type TOption = {
+    label: string;
+    value: any;
+    text?: string;
+    status?: number;
+};
+declare type TDictItem = {
+    dict: string;
+    showValue?: boolean;
+    /** 是否转换数字 */
+    isValNum?: boolean;
+    transform?: (data: TOption[]) => TOption[];
+};
+declare type TDictParams = Record<string, string | (() => Promise<TOption[]>) | TDictItem>;
+/** 字典类型 */
+export declare type TDict<T extends TDictParams> = {
+    [key in keyof T]?: TOption[];
+};
+/**
+ * 获取字典
+ *
+ * @param dicts 字典列表
+ * @param type 字典类型 默认 tenant
+ */
+export declare function useDict<T extends TDictParams>(dicts: T): { [key in keyof T]?: TOption[] | undefined; };
+export {};

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,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, isSaasVersion } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -277,6 +277,9 @@ export function getDict(dictCode) {
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
   var api = '/lesoon-integration/sysDictDtl/listByProperties';
+  if (isSaasVersion()) {
+    api = '/tenant-lesoon-integration-api/sysDictDtl/listByProperties';
+  }
   var param = {
     dictCode: dictCode
   };

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/lib/utils/index.d.ts

@@ -316,3 +316,4 @@ export declare const exitLoading: () => void;
 export declare const handleTheme: () => void;
 export declare const sleep: (secord: number) => Promise<unknown>;
 export declare const downloadFile: (url: string, fileName?: string | undefined) => void;
+export declare const isSaasVersion: () => boolean;

package/lib/utils/index.js

@@ -915,4 +915,7 @@ export var downloadFile = function downloadFile(url, fileName) {
   document.body.appendChild(a);
   a.click();
   document.body.removeChild(a);
+};
+export var isSaasVersion = function isSaasVersion() {
+  return (getCache('poi-center-api') || '').includes('/tenant-lesoon-basic-api/');
 };

package/package.json

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