ls-pro-common 1.0.24 → 1.0.27

package/lib/hooks/useDtl/index.js

@@ -164,7 +164,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              (0, _utils.showSuccess)(result.flag.retMsg);
+              (0, _utils.showSuccess)(result.flag.retMsg || '操作成功');
               Object.assign(masterObject, result.data);
               setEditItem({});
               return _context.abrupt("return", true);
@@ -273,7 +273,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              (0, _utils.showSuccess)(result.flag.retMsg);
+              (0, _utils.showSuccess)(result.flag.retMsg || '删除成功');
               return _context2.abrupt("return", true);
 
             case 28:
@@ -632,6 +632,8 @@ function useDtl(dtlParam) {
 
   var onLoadDtl = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(params, sort, filter) {
+      var _tableRef$current, _tableRef$current$cle;
+
       var current, pageSize, rest, param, key, result;
       return _regenerator.default.wrap(function _callee7$(_context7) {
         while (1) {
@@ -670,23 +672,25 @@ function useDtl(dtlParam) {
                 }
               }
 
+              setSelectedRows([]);
+              (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$cle = _tableRef$current.clearSelected) === null || _tableRef$current$cle === void 0 ? void 0 : _tableRef$current$cle.call(_tableRef$current);
               _context7.t0 = beforeLoad;
 
               if (!_context7.t0) {
-                _context7.next = 15;
+                _context7.next = 17;
                 break;
               }
 
-              _context7.next = 13;
+              _context7.next = 15;
               return beforeLoad(param);
 
-            case 13:
+            case 15:
               _context7.t1 = _context7.sent;
               _context7.t0 = _context7.t1 === false;
 
-            case 15:
+            case 17:
               if (!_context7.t0) {
-                _context7.next = 17;
+                _context7.next = 19;
                 break;
               }
 
@@ -695,17 +699,17 @@ function useDtl(dtlParam) {
                 success: true
               });
 
-            case 17:
-              _context7.next = 19;
+            case 19:
+              _context7.next = 21;
               return dtlService.load(param);
 
-            case 19:
+            case 21:
               result = _context7.sent;
               result.data = result.rows;
               result.success = true;
               return _context7.abrupt("return", result);
 
-            case 23:
+            case 25:
             case "end":
               return _context7.stop();
           }
@@ -808,53 +812,48 @@ function useDtl(dtlParam) {
               return _context9.abrupt("return");
 
             case 3:
-              obj = (0, _objectSpread2.default)({}, masterObject); // beforeAudit 强式终止
+              obj = (0, _objectSpread2.default)({}, masterObject);
 
-              _context9.t0 = beforeAudit;
-
-              if (!_context9.t0) {
-                _context9.next = 10;
+              if (masterObject[mstKeyField]) {
+                _context9.next = 7;
                 break;
               }
 
-              _context9.next = 8;
-              return beforeAudit(obj);
+              (0, _utils.showWarn)('当前数据未保存，不能审核');
+              return _context9.abrupt("return");
 
-            case 8:
-              _context9.t1 = _context9.sent;
-              _context9.t0 = _context9.t1 === false;
+            case 7:
+              _context9.prev = 7;
+              _context9.next = 10;
+              return (0, _utils.showConfirm)('确认要审核此数据？', '审核提示');
 
             case 10:
-              if (!_context9.t0) {
-                _context9.next = 12;
-                break;
-              }
-
-              return _context9.abrupt("return");
+              _context9.next = 16;
+              break;
 
             case 12:
               _context9.prev = 12;
-              _context9.next = 15;
-              return mstService.audit([obj]);
+              _context9.t0 = _context9["catch"](7);
+              console.log('终止审核', _context9.t0);
+              return _context9.abrupt("return");
 
-            case 15:
-              result = _context9.sent;
-              _context9.t2 = afterAudit;
+            case 16:
+              _context9.t1 = beforeAudit;
 
-              if (!_context9.t2) {
+              if (!_context9.t1) {
                 _context9.next = 22;
                 break;
               }
 
               _context9.next = 20;
-              return afterAudit(result, [obj]);
+              return beforeAudit(obj);
 
             case 20:
-              _context9.t3 = _context9.sent;
-              _context9.t2 = _context9.t3 === false;
+              _context9.t2 = _context9.sent;
+              _context9.t1 = _context9.t2 === false;
 
             case 22:
-              if (!_context9.t2) {
+              if (!_context9.t1) {
                 _context9.next = 24;
                 break;
               }
@@ -862,25 +861,54 @@ function useDtl(dtlParam) {
               return _context9.abrupt("return");
 
             case 24:
+              _context9.prev = 24;
+              _context9.next = 27;
+              return mstService.audit([obj]);
+
+            case 27:
+              result = _context9.sent;
+              _context9.t3 = afterAudit;
+
+              if (!_context9.t3) {
+                _context9.next = 34;
+                break;
+              }
+
+              _context9.next = 32;
+              return afterAudit(result, [obj]);
+
+            case 32:
+              _context9.t4 = _context9.sent;
+              _context9.t3 = _context9.t4 === false;
+
+            case 34:
+              if (!_context9.t3) {
+                _context9.next = 36;
+                break;
+              }
+
+              return _context9.abrupt("return");
+
+            case 36:
               if ((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) === '0') {
-                (0, _utils.showSuccess)(result.flag.retMsg);
+                (0, _utils.showSuccess)(result.flag.retMsg || '审核成功');
                 Object.assign(masterObject, result.data);
               }
 
-              _context9.next = 30;
+              _context9.next = 42;
               break;
 
-            case 27:
-              _context9.prev = 27;
-              _context9.t4 = _context9["catch"](12);
-              console.log(_context9.t4);
+            case 39:
+              _context9.prev = 39;
+              _context9.t5 = _context9["catch"](24);
+              console.log('审核异常', _context9.t5);
 
-            case 30:
+            case 42:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, null, [[12, 27]]);
+      }, _callee9, null, [[7, 12], [24, 39]]);
     }));
 
     return function onAudit() {
@@ -904,25 +932,25 @@ function useDtl(dtlParam) {
   };
 
   var onExport = function onExport() {
-    var _tableRef$current, _tableRef$current$sho;
+    var _tableRef$current2, _tableRef$current2$sh;
 
     if (!masterObject[mstKeyField]) {
       (0, _utils.showWarn)('主表没保存，无法导出数据');
       return;
     }
 
-    tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$sho = _tableRef$current.showExport) === null || _tableRef$current$sho === void 0 ? void 0 : _tableRef$current$sho.call(_tableRef$current);
+    tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$sh = _tableRef$current2.showExport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
   };
 
   var onImport = function onImport() {
-    var _tableRef$current2, _tableRef$current2$sh;
+    var _tableRef$current3, _tableRef$current3$sh;
 
     if (!masterObject[mstKeyField]) {
       (0, _utils.showWarn)('主表没保存，无法导入数据');
       return;
     }
 
-    tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$sh = _tableRef$current2.showImport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
+    tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current3 = tableRef.current) === null || _tableRef$current3 === void 0 ? void 0 : (_tableRef$current3$sh = _tableRef$current3.showImport) === null || _tableRef$current3$sh === void 0 ? void 0 : _tableRef$current3$sh.call(_tableRef$current3);
   };
 
   var tableTools = (0, _react.useMemo)(function () {
@@ -931,6 +959,7 @@ function useDtl(dtlParam) {
       onClick: function onClick() {
         return onAddDtl();
       },
+      disabled: btnDisabled('add'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
@@ -952,12 +981,14 @@ function useDtl(dtlParam) {
       onClick: function onClick() {
         onImport();
       },
+      disabled: btnDisabled('import'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
-    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
       onClick: function onClick() {
         onExport();
       },
+      disabled: btnDisabled('export'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;

package/lib/hooks/useSingle/index.js

@@ -207,7 +207,7 @@ function useSingle(inParam) {
 
 
   var onRemove = function onRemove(row) {
-    if (!row || !selectedRows.length) {
+    if (!row && !selectedRows.length) {
       (0, _utils.showWarn)('请选择需要删除的数据');
       return;
     }
@@ -281,7 +281,7 @@ function useSingle(inParam) {
 
             case 20:
               if ((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0') {
-                (0, _utils.showSuccess)(result.flag.retMsg);
+                (0, _utils.showSuccess)(result.flag.retMsg || '删除成功');
 
                 if (tableRef.current) {
                   tableRef.current.reload(false);
@@ -338,69 +338,83 @@ function useSingle(inParam) {
 
                 obj[statusField] = auditStatus;
                 return obj;
-              }); // beforeAudit 强式终止
+              });
+              _context4.prev = 7;
+              _context4.next = 10;
+              return (0, _utils.showConfirm)('确认要审核选中的数据？', '审核提示');
 
-              _context4.t0 = beforeAudit;
+            case 10:
+              _context4.next = 16;
+              break;
 
-              if (!_context4.t0) {
-                _context4.next = 13;
+            case 12:
+              _context4.prev = 12;
+              _context4.t0 = _context4["catch"](7);
+              console.log(_context4.t0);
+              return _context4.abrupt("return");
+
+            case 16:
+              _context4.t1 = beforeAudit;
+
+              if (!_context4.t1) {
+                _context4.next = 22;
                 break;
               }
 
-              _context4.next = 11;
+              _context4.next = 20;
               return beforeAudit(rows);
 
-            case 11:
-              _context4.t1 = _context4.sent;
-              _context4.t0 = _context4.t1 === false;
+            case 20:
+              _context4.t2 = _context4.sent;
+              _context4.t1 = _context4.t2 === false;
 
-            case 13:
-              if (!_context4.t0) {
-                _context4.next = 15;
+            case 22:
+              if (!_context4.t1) {
+                _context4.next = 24;
                 break;
               }
 
               return _context4.abrupt("return");
 
-            case 15:
-              _context4.prev = 15;
-              _context4.next = 18;
+            case 24:
+              _context4.prev = 24;
+              _context4.next = 27;
               return service.audit(rows);
 
-            case 18:
+            case 27:
               result = _context4.sent;
 
               if (!afterAudit) {
-                _context4.next = 22;
+                _context4.next = 31;
                 break;
               }
 
               afterAudit(result, rows);
               return _context4.abrupt("return");
 
-            case 22:
+            case 31:
               if ((result === null || result === void 0 ? void 0 : (_result$flag2 = result.flag) === null || _result$flag2 === void 0 ? void 0 : _result$flag2.retCode) === '0') {
-                (0, _utils.showSuccess)(result.flag.retMsg);
+                (0, _utils.showSuccess)(result.flag.retMsg || '审核成功');
 
                 if (tableRef.current) {
                   tableRef.current.reload(false);
                 }
               }
 
-              _context4.next = 28;
+              _context4.next = 37;
               break;
 
-            case 25:
-              _context4.prev = 25;
-              _context4.t2 = _context4["catch"](15);
-              console.log(_context4.t2);
+            case 34:
+              _context4.prev = 34;
+              _context4.t3 = _context4["catch"](24);
+              console.log(_context4.t3);
 
-            case 28:
+            case 37:
             case "end":
               return _context4.stop();
           }
         }
-      }, _callee4, null, [[15, 25]]);
+      }, _callee4, null, [[7, 12], [24, 34]]);
     }));
 
     return function onAudit(_x3) {
@@ -466,7 +480,7 @@ function useSingle(inParam) {
                 break;
               }
 
-              (0, _utils.showSuccess)(result.flag.retMsg);
+              (0, _utils.showSuccess)(result.flag.retMsg || '操作成功');
 
               if (tableRef.current) {
                 tableRef.current.reload(false);
@@ -503,6 +517,8 @@ function useSingle(inParam) {
 
   var onLoad = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(params, sort, filter) {
+      var _tableRef$current, _tableRef$current$cle;
+
       var current, pageSize, rest, param, key, result;
       return _regenerator.default.wrap(function _callee6$(_context6) {
         while (1) {
@@ -526,23 +542,25 @@ function useSingle(inParam) {
                 param.where = rest;
               }
 
+              setSelectedRows([]);
+              (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$cle = _tableRef$current.clearSelected) === null || _tableRef$current$cle === void 0 ? void 0 : _tableRef$current$cle.call(_tableRef$current);
               _context6.t0 = beforeLoad;
 
               if (!_context6.t0) {
-                _context6.next = 11;
+                _context6.next = 13;
                 break;
               }
 
-              _context6.next = 9;
+              _context6.next = 11;
               return beforeLoad(param);
 
-            case 9:
+            case 11:
               _context6.t1 = _context6.sent;
               _context6.t0 = _context6.t1 === false;
 
-            case 11:
+            case 13:
               if (!_context6.t0) {
-                _context6.next = 13;
+                _context6.next = 15;
                 break;
               }
 
@@ -552,17 +570,17 @@ function useSingle(inParam) {
                 total: 0
               });
 
-            case 13:
-              _context6.next = 15;
+            case 15:
+              _context6.next = 17;
               return service.load(param);
 
-            case 15:
+            case 17:
               result = _context6.sent;
               result.data = result.rows;
               result.success = true;
               return _context6.abrupt("return", result);
 
-            case 19:
+            case 21:
             case "end":
               return _context6.stop();
           }
@@ -684,6 +702,7 @@ function useSingle(inParam) {
       onClick: function onClick() {
         return onAdd(null);
       },
+      disabled: btnDisabled('add'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && checkRight(4) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
@@ -710,18 +729,20 @@ function useSingle(inParam) {
     }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && checkRight(128) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
       onClick: function onClick() {
-        var _tableRef$current, _tableRef$current$sho;
+        var _tableRef$current2, _tableRef$current2$sh;
 
-        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$sho = _tableRef$current.showImport) === null || _tableRef$current$sho === void 0 ? void 0 : _tableRef$current$sho.call(_tableRef$current);
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$sh = _tableRef$current2.showImport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
       },
+      disabled: btnDisabled('import'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
-    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && checkRight(256) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && checkRight(256) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
       onClick: function onClick() {
-        var _tableRef$current2, _tableRef$current2$sh;
+        var _tableRef$current3, _tableRef$current3$sh;
 
-        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$sh = _tableRef$current2.showExport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current3 = tableRef.current) === null || _tableRef$current3 === void 0 ? void 0 : (_tableRef$current3$sh = _tableRef$current3.showExport) === null || _tableRef$current3$sh === void 0 ? void 0 : _tableRef$current3$sh.call(_tableRef$current3);
       },
+      disabled: btnDisabled('export'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;

package/lib/http/index.js

@@ -42,7 +42,7 @@ request.interceptors.request.use(function (url, options) {
   }
 
   var param = {
-    resCode: (0, _utils.getUrlQuery)('resourceId') || (0, _utils.getResourceProps)('resourceId')
+    resCode: (0, _utils.getUrlQuery)('resCode') || (0, _utils.getUrlQuery)('resourceId') || (0, _utils.getResourceProps)('resourceId')
   };
   return {
     url: (0, _utils.setUrlQuery)(url, param),

package/lib/utils/index.d.ts

@@ -82,12 +82,15 @@ export declare const treeEach: (list: any[], fn: (item: any, index: any, list: a
  * @returns 返回符合条件的第一条对象
  */
 export declare const treeFind: (list: any[], key: string, val: any, children?: string) => any;
+export declare const isDev: boolean;
 export declare type UserType = {
     id?: string;
     userId?: string;
     userName?: string;
     loginName?: string;
     companyId?: string;
+    companyCode?: string;
+    companyName?: string;
     email?: string;
     employeeAttr?: string;
     expireTime?: string;
@@ -99,7 +102,13 @@ export declare type UserType = {
     phoneNumber?: string;
     remarks?: string;
 };
+/** @name 用户信息 */
 export declare const getUserInfo: () => UserType | null;
+/** @name 用户名 */
 export declare const getUserName: () => string | undefined;
+/** @name 登录名 */
 export declare const getLoginName: () => string | undefined;
+/** @name 公司Id */
 export declare const getCompanyId: () => string | undefined;
+/** @name 微前端原生路径 */
+export declare const appPath: (path?: string) => any;

package/lib/utils/index.js

@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.appPath = void 0;
 Object.defineProperty(exports, "dateFormat", {
   enumerable: true,
   get: function get() {
@@ -24,7 +25,7 @@ Object.defineProperty(exports, "getUrlQuery", {
     return _utils.getUrlQuery;
   }
 });
-exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUserName = exports.getUserInfo = void 0;
+exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.isDev = exports.getUserName = exports.getUserInfo = void 0;
 Object.defineProperty(exports, "setUrlQuery", {
   enumerable: true,
   get: function get() {
@@ -307,10 +308,16 @@ var treeFind = function treeFind(list, key, val) {
 };
 
 exports.treeFind = treeFind;
+var isDev = location.href.includes("//localhost");
+/** @name 用户信息 */
+
+exports.isDev = isDev;
 
 var getUserInfo = function getUserInfo() {
   return getCache('user');
 };
+/** @name 用户名 */
+
 
 exports.getUserInfo = getUserInfo;
 
@@ -319,6 +326,8 @@ var getUserName = function getUserName() {
 
   return (_getUserInfo = getUserInfo()) === null || _getUserInfo === void 0 ? void 0 : _getUserInfo.userName;
 };
+/** @name 登录名 */
+
 
 exports.getUserName = getUserName;
 
@@ -327,6 +336,8 @@ var getLoginName = function getLoginName() {
 
   return (_getUserInfo2 = getUserInfo()) === null || _getUserInfo2 === void 0 ? void 0 : _getUserInfo2.loginName;
 };
+/** @name 公司Id */
+
 
 exports.getLoginName = getLoginName;
 
@@ -335,5 +346,21 @@ var getCompanyId = function getCompanyId() {
 
   return (_getUserInfo3 = getUserInfo()) === null || _getUserInfo3 === void 0 ? void 0 : _getUserInfo3.companyId;
 };
+/** @name 微前端原生路径 */
+
+
+exports.getCompanyId = getCompanyId;
+
+var appPath = function appPath() {
+  var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+
+  // @ts-ignore
+  if (window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__) {
+    // @ts-ignore
+    return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+  }
+
+  return path ? path : './';
+};
 
-exports.getCompanyId = getCompanyId;
+exports.appPath = appPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.24",
+  "version": "1.0.27",
   "description": "ls-pro-common",
   "keywords": [
     "antd",
@@ -28,8 +28,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.23",
-    "ls-pro-form": "1.52.22",
+    "ls-pro-table": "2.62.25",
+    "ls-pro-form": "1.52.24",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",