ls-pro-common 1.0.62 → 1.0.64

package/es/hooks/usePermission/index.d.ts

@@ -2,6 +2,7 @@ declare function usePermission(): {
     resourceId: any;
     permissionVal: number;
     resRightVal: number;
+    loginName: string | undefined;
     checkRight: (val: number) => boolean;
     canAdd: boolean;
     canEdit: boolean;

package/es/hooks/usePermission/index.js

@@ -1,19 +1,40 @@
 import { useMemo, useCallback } from 'react';
-import { getUrlQuery, getResourceProps, getCache } from '../../utils';
+import { useLocation } from 'react-router-dom';
+import { getUrlQuery, getResourceProps, getCache, getLoginName } from '../../utils';
 
 function usePermission() {
+  var routeLocation = useLocation();
   /** @name 资源ID */
+
   var resourceId = useMemo(function () {
+    var _routeLocation$query;
+
+    //@ts-ignore
+    var resId = routeLocation === null || routeLocation === void 0 ? void 0 : (_routeLocation$query = routeLocation.query) === null || _routeLocation$query === void 0 ? void 0 : _routeLocation$query.resCode;
+    if (resId) return resId;
     return getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   }, []);
+  var loginName = useMemo(function () {
+    return getLoginName();
+  }, []);
   /** @name 用户权限 */
 
   var permissionVal = useMemo(function () {
+    var _routeLocation$query2;
+
+    //@ts-ignore
+    var right = routeLocation === null || routeLocation === void 0 ? void 0 : (_routeLocation$query2 = routeLocation.query) === null || _routeLocation$query2 === void 0 ? void 0 : _routeLocation$query2.right;
+    if (right) return Number(right);
     return Number(getUrlQuery('right') || getResourceProps('userPermissionVal') || getCache('right') || 0);
   }, []);
   /** @name 资源权限 */
 
   var resRightVal = useMemo(function () {
+    var _routeLocation$query3;
+
+    //@ts-ignore
+    var right = routeLocation === null || routeLocation === void 0 ? void 0 : (_routeLocation$query3 = routeLocation.query) === null || _routeLocation$query3 === void 0 ? void 0 : _routeLocation$query3.resRight;
+    if (right) return Number(right);
     return Number(getUrlQuery('resRight') || getResourceProps('permissionVal') || getCache('right') || 0);
   }, []);
   /**
@@ -30,6 +51,7 @@ function usePermission() {
     resourceId: resourceId,
     permissionVal: permissionVal,
     resRightVal: resRightVal,
+    loginName: loginName,
     checkRight: checkRight,
     canAdd: checkRight(2),
     canEdit: checkRight(4),

package/es/hooks/useSingle/index.d.ts

@@ -47,6 +47,7 @@ declare function useSingle(inParam: SingleParamType): {
     onAudit: (row: any) => Promise<void>;
     resourceId: any;
     checkRight: (val: number) => boolean;
+    loginName: string | undefined;
     isAudit: (row?: any) => boolean;
 };
 export default useSingle;

package/es/hooks/useSingle/index.js

@@ -24,6 +24,7 @@ import usePermission from '../usePermission';
 function useSingle(inParam) {
   var _usePermission = usePermission(),
       resourceId = _usePermission.resourceId,
+      loginName = _usePermission.loginName,
       checkRight = _usePermission.checkRight,
       canAdd = _usePermission.canAdd,
       canEdit = _usePermission.canEdit,
@@ -299,7 +300,7 @@ function useSingle(inParam) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              if (!(!row || !selectedRows.length)) {
+              if (!(!row && !selectedRows.length)) {
                 _context4.next = 3;
                 break;
               }
@@ -789,6 +790,7 @@ function useSingle(inParam) {
     onAudit: onAudit,
     resourceId: resourceId,
     checkRight: checkRight,
+    loginName: loginName,
     isAudit: isAudit
   };
 }

package/es/http/index.js

@@ -1,8 +1,7 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { extend } from 'umi-request';
-import { getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, toGatewayUrl, reLogin } from '../utils'; //默认超时时间为1分钟
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, toGatewayUrl, reLogin } from '../utils'; //默认超时时间为1分钟
 
 var request = extend({
   timeout: 60000
@@ -11,15 +10,31 @@ var request = extend({
 
 request.interceptors.request.use(function (url, options) {
   var token = getCookie("token");
-
-  var opts = _objectSpread({}, options);
+  options.headers = options.headers || {}; // 处理 token
 
   if (token && url.indexOf('noToken=1') === -1) {
-    Object.assign(opts, {
-      headers: {
-        token: token
-      }
-    });
+    options.headers["token"] = token;
+  } // 处理门店
+
+
+  var shopNo = getCache('shopNo', true) || getCache('shopNo');
+
+  if (shopNo) {
+    options.headers["shopNo"] = shopNo;
+  } // 处理门店
+
+
+  var shopCode = getCache('shopCode', true) || getCache('shopCode');
+
+  if (shopCode) {
+    options.headers["shopCode"] = shopCode;
+  } // 处理仓库
+
+
+  var storeNo = getCache('storeNo', true) || getCache('storeNo');
+
+  if (storeNo) {
+    options.headers["storeNo"] = storeNo;
   }
 
   url = url.replace('noToken=1', '').replace('&&', '&').replace('?&', '?');
@@ -32,9 +47,10 @@ request.interceptors.request.use(function (url, options) {
     delete param.resCode;
   }
 
+  url = setUrlQuery(url, param);
   return {
-    url: setUrlQuery(url, param),
-    options: opts
+    url: url,
+    options: options
   };
 });
 /** 请求返回拦截器,统一处理业务异常 */
@@ -63,7 +79,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
             if (((_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode) === 'timeout' || ((_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retCode) === '4011') {
               reLogin();
-            } else {
+            } else if (noMsg !== '1') {
               showError(options.url + ((_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.retMsg));
             }
 

package/es/service/BaseService.d.ts

@@ -9,6 +9,14 @@ declare class BaseService {
     load(param: Record<string, any>): Promise<any>;
     /** 保存数据方法 @param data 对象数据，当存在id时即为更改 */
     save(data: Record<string, any>): Promise<any>;
+    saveMstDtl(data: {
+        opType: 'inserted' | 'updated' | 'deleted';
+        master: any;
+        idName: string;
+        billType?: string;
+        codeRuleDynamicField?: string;
+        details?: any;
+    }): Promise<any>;
     /** 批量删除对象方法，@param data id集合 */
     remove(data: any[]): Promise<any>;
     audit(data: any[]): Promise<any>;

package/es/service/BaseService.js

@@ -137,12 +137,10 @@ var BaseService = /*#__PURE__*/function () {
 
       return save;
     }()
-    /** 批量删除对象方法，@param data id集合 */
-
   }, {
-    key: "remove",
+    key: "saveMstDtl",
     value: function () {
-      var _remove = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data) {
+      var _saveMstDtl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data) {
         var _this$api3;
 
         var url;
@@ -150,45 +148,90 @@ var BaseService = /*#__PURE__*/function () {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                url = (_this$api3 = this.api) === null || _this$api3 === void 0 ? void 0 : _this$api3.delete;
+                url = (_this$api3 = this.api) === null || _this$api3 === void 0 ? void 0 : _this$api3.mstDtl;
 
                 if (url) {
                   _context3.next = 4;
                   break;
                 }
 
+                _message.error("主从一起保存方法没有配置api");
+
+                return _context3.abrupt("return", Promise.reject("主从一起保存方法没有配置api"));
+
+              case 4:
+                _context3.next = 6;
+                return httpPost(url, data);
+
+              case 6:
+                return _context3.abrupt("return", _context3.sent);
+
+              case 7:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function saveMstDtl(_x3) {
+        return _saveMstDtl.apply(this, arguments);
+      }
+
+      return saveMstDtl;
+    }()
+    /** 批量删除对象方法，@param data id集合 */
+
+  }, {
+    key: "remove",
+    value: function () {
+      var _remove = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
+        var _this$api4;
+
+        var url;
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                url = (_this$api4 = this.api) === null || _this$api4 === void 0 ? void 0 : _this$api4.delete;
+
+                if (url) {
+                  _context4.next = 4;
+                  break;
+                }
+
                 _message.error("删除方法没有配置api");
 
-                return _context3.abrupt("return", Promise.reject("删除方法没有配置api"));
+                return _context4.abrupt("return", Promise.reject("删除方法没有配置api"));
 
               case 4:
                 if (!(this.method.delete === 'post')) {
-                  _context3.next = 8;
+                  _context4.next = 8;
                   break;
                 }
 
-                _context3.next = 7;
+                _context4.next = 7;
                 return httpPost(url, data);
 
               case 7:
-                return _context3.abrupt("return", _context3.sent);
+                return _context4.abrupt("return", _context4.sent);
 
               case 8:
-                _context3.next = 10;
+                _context4.next = 10;
                 return httpDelete(url, data);
 
               case 10:
-                return _context3.abrupt("return", _context3.sent);
+                return _context4.abrupt("return", _context4.sent);
 
               case 11:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
 
-      function remove(_x3) {
+      function remove(_x4) {
         return _remove.apply(this, arguments);
       }
 
@@ -197,41 +240,41 @@ var BaseService = /*#__PURE__*/function () {
   }, {
     key: "audit",
     value: function () {
-      var _audit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
-        var _this$api4;
+      var _audit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(data) {
+        var _this$api5;
 
         var url;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
-                url = (_this$api4 = this.api) === null || _this$api4 === void 0 ? void 0 : _this$api4.audit;
+                url = (_this$api5 = this.api) === null || _this$api5 === void 0 ? void 0 : _this$api5.audit;
 
                 if (url) {
-                  _context4.next = 4;
+                  _context5.next = 4;
                   break;
                 }
 
                 _message.error("审核方法没有配置api");
 
-                return _context4.abrupt("return", Promise.reject("审核方法没有配置api"));
+                return _context5.abrupt("return", Promise.reject("审核方法没有配置api"));
 
               case 4:
-                _context4.next = 6;
+                _context5.next = 6;
                 return httpPost(url, data);
 
               case 6:
-                return _context4.abrupt("return", _context4.sent);
+                return _context5.abrupt("return", _context5.sent);
 
               case 7:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
 
-      function audit(_x4) {
+      function audit(_x5) {
         return _audit.apply(this, arguments);
       }
 

package/es/typing.d.ts

@@ -8,6 +8,8 @@ export declare type ApiResponse = Record<string, any> & {
     rows?: [];
     data?: any;
     total?: 0;
+    id?: string;
+    billNo?: string;
 };
 export declare type TableToolbar = {
     add?: boolean;
@@ -29,6 +31,8 @@ export declare type BaseApiType = {
     edit?: string;
     /**删除数据api */
     delete?: string;
+    /**主从一起保存方法，新增，现改，删除共用一个接口 */
+    mstDtl?: string;
     /**导入数据api */
     import?: string;
     /**导出数据api,如果跟加载数据api一致，可不指定 */

package/es/utils/index.d.ts

@@ -150,6 +150,55 @@ export declare const treeFind: (list: any[], key: string, val: any, children?: s
  * @returns 返回已处理好的表头[{dataIndex:sizeTypeNo,title:'国标码',width:120,children[...]},{dataIndex:'f1',...}...]
  */
 export declare const handleSizeCols: (orgSizeHeader: any[], typeWidth?: number, sizeWidth?: number) => any[];
+/**
+ * 函数防抖, 限定的时间内多次操作只执行最后一次
+ * @param fn 函数
+ * @param delay 限时
+ * @returns function
+ */
+export declare const debounce: (fn: Function, delay?: number) => () => void;
+/**
+ * 函数节流,限时内只触发一次函数
+ * @param fn 函数
+ * @param delay 限时
+ * @returns function
+ */
+export declare const throttle: (fn: Function, delay?: number) => () => void;
+/**
+ * 绑定事件
+ * @param eventName  事件名
+ * @param fn  调用函数
+ * @param el  源对象，默认为window
+ */
+export declare const on: (eventName: string, fn: Function, el: any | undefined) => void;
+/**
+ * 解绑事件
+ * @param eventName 事件名
+ * @param fn 调用函数
+ * @param el 源对象，默认为window
+ */
+export declare const off: (eventName: string, fn: Function, el: any | undefined) => void;
+/**
+ * 打印预览
+ * @param templateNo 打印模板编码
+ * @param reqUrl 业务请求api
+ * @param bodyParam Post传参数
+ * @param param get传参数
+ * @param method 请求方式，默认post
+ * @returns
+ */
+export declare const printView: (templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET') => any;
+/**
+ * 直接打印
+ * @param taskName 打印任务名
+ * @param templateNo 打印模板
+ * @param reqUrl 业务请求api
+ * @param bodyParam Post传参数
+ * @param param get传参数
+ * @param method 请求方式，默认post
+ * @returns
+ */
+export declare const printAsync: (taskName: string, templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET') => Promise<any>;
 export declare const isDev: boolean;
 export declare type UserType = {
     id?: string;

package/es/utils/index.js

@@ -6,7 +6,8 @@ import _message from "antd/es/message";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import React from "react";
 import { QuestionCircleOutlined } from '@ant-design/icons';
-import { dateFormat } from 'ls-pro-table';
+import { dateFormat, toGatewayUrl } from 'ls-pro-table';
+import { httpPost } from '../http';
 export { getUrlQuery, setUrlQuery, toGatewayUrl, dateFormat, getResourceProps } from 'ls-pro-table';
 /**
  * 设置文档title
@@ -463,6 +464,146 @@ export var handleSizeCols = function handleSizeCols(orgSizeHeader) {
   });
   return headers;
 };
+/**
+ * 函数防抖, 限定的时间内多次操作只执行最后一次
+ * @param fn 函数
+ * @param delay 限时
+ * @returns function
+ */
+
+export var debounce = function debounce(fn) {
+  var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;
+  var t = null;
+  return function () {
+    clearTimeout(t);
+    t = setTimeout(fn, delay);
+  };
+};
+/**
+ * 函数节流,限时内只触发一次函数
+ * @param fn 函数
+ * @param delay 限时
+ * @returns function
+ */
+
+export var throttle = function throttle(fn) {
+  var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;
+  var t = Date.now();
+  return function () {
+    var now = Date.now();
+
+    if (now - t > delay) {
+      fn();
+      t = now;
+    }
+  };
+};
+/**
+ * 绑定事件
+ * @param eventName  事件名
+ * @param fn  调用函数
+ * @param el  源对象，默认为window
+ */
+
+export var on = function on(eventName, fn, el) {
+  if (!el) {
+    el = window;
+  }
+
+  el.addEventListener(eventName, fn);
+};
+/**
+ * 解绑事件
+ * @param eventName 事件名
+ * @param fn 调用函数
+ * @param el 源对象，默认为window
+ */
+
+export var off = function off(eventName, fn, el) {
+  if (!el) {
+    el = window;
+  }
+
+  el.removeEventListener(eventName, fn);
+};
+/**
+ * 打印预览
+ * @param templateNo 打印模板编码
+ * @param reqUrl 业务请求api
+ * @param bodyParam Post传参数
+ * @param param get传参数
+ * @param method 请求方式，默认post
+ * @returns
+ */
+
+export var printView = function printView(templateNo, reqUrl) {
+  var bodyParam = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var param = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
+  var method = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'POST';
+  var printCenterUrl = toGatewayUrl('/petrel-print-center-api/report/remote/print/dataStr');
+  reqUrl = toGatewayUrl(reqUrl);
+
+  if (!reqUrl.includes(location.origin)) {
+    reqUrl = location.origin + reqUrl;
+  }
+
+  var data = {
+    templateNo: templateNo,
+    printType: 1,
+    reqUrl: reqUrl,
+    reqMethodType: method,
+    params: param || {},
+    body: bodyParam || {}
+  };
+  var openWin = window.open();
+  var formStr = "<form style=\"visibility:hidden;\" method=\"POST\" action=\"".concat(printCenterUrl, "\">\n                      <input type=\"hidden\" name=\"clientPrintData\" value='").concat(JSON.stringify(data), "' />\n                  </form>");
+  openWin.document.body.innerHTML = formStr;
+  openWin.document.forms[0].submit();
+  return openWin;
+};
+/**
+ * 直接打印
+ * @param taskName 打印任务名
+ * @param templateNo 打印模板
+ * @param reqUrl 业务请求api
+ * @param bodyParam Post传参数
+ * @param param get传参数
+ * @param method 请求方式，默认post
+ * @returns
+ */
+
+export var printAsync = function printAsync(taskName, templateNo, reqUrl) {
+  var bodyParam = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var param = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : undefined;
+  var method = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'POST';
+  var printCenterUrl = toGatewayUrl('/petrel-print-center-api/report/client/print');
+
+  if (!printCenterUrl.includes(location.origin)) {
+    printCenterUrl = location.origin + printCenterUrl;
+  }
+
+  reqUrl = toGatewayUrl(reqUrl);
+
+  if (!reqUrl.includes(location.origin)) {
+    reqUrl = location.origin + reqUrl;
+  }
+
+  var data = {
+    taskName: taskName,
+    printReqUrl: printCenterUrl,
+    bizVO: {
+      templateNo: templateNo,
+      printType: 1,
+      reqUrl: reqUrl,
+      reqMethodType: method,
+      params: param || {},
+      body: bodyParam || {}
+    },
+    token: getCache('token') || ''
+  };
+  var url = 'http://localhost:10050/client/async/print';
+  return httpPost(url, data, true, false);
+};
 export var isDev = location.href.includes("//localhost");
 /** @name 用户信息 */
 

package/lib/components/IconSelector.d.ts

@@ -2,18 +2,12 @@
 import type { InputProps, ModalProps } from 'antd';
 import type { ProFormItemProps } from 'ls-pro-form';
 export declare type IconSelectorProps = ProFormItemProps<InputProps> & {
-    /** @name 图标类型 */
-    type: string;
-    /** @name 是否可上传，默认可上传 */
-    uploadable?: boolean;
     /** @name 弹框title */
     title?: string;
+    defaultValue?: string;
+    isInput?: boolean;
     /** @name 弹框宽度 */
     modalWidth?: string;
-    /**
-     * @name 最大值, 默认2M
-     */
-    maxSize?: number;
     modalProps?: ModalProps;
 };
 declare function IconSelector(prop: IconSelectorProps): JSX.Element;