ls-pro-common 1.0.16 → 1.0.19

package/es/components/404.js

@@ -4,6 +4,6 @@ export default (function () {
   return /*#__PURE__*/React.createElement("div", {
     className: "page404"
   }, /*#__PURE__*/React.createElement("img", {
-    src: "./404.jpg"
+    src: require('./404.jpg')
   }), " \u60A8\u8BBF\u95EE\u7684\u8D44\u6E90\u4E0D\u5B58\u5728~~");
 });

package/es/components/common.less

@@ -64,15 +64,18 @@
 }
 
 .page404 {
-    width         : 100%;
-    height        : 100%;
-    text-align    : center;
-    padding-top   : 20%;
-    vertical-align: middle;
+    width           : 100%;
+    height          : 100%;
+    text-align      : center;
+    padding-top     : 10%;   
+    font-size       : 15px;
+    font-weight     : 600;
+    color           : gray;
+    background-color: #fff;
 
     img {
-        vertical-align: middle;
-        padding-right : 20px;
+        vertical-align: bottom;
+        padding-right : 5px;
     }
 }
 

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

@@ -24,7 +24,7 @@ declare function useDtl(dtlParam: DtlParamType): {
     onLoadDtl: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
     onAddDtl: () => Promise<boolean>;
     onEditDtl: () => Promise<boolean>;
-    onSaveMst: (values: any) => Promise<void>;
+    onSaveMst: (values: any) => Promise<boolean>;
     onRemoveMst: () => Promise<boolean | undefined>;
     onExportDtl: (url: string, param: exportParam) => Promise<boolean>;
 };

package/es/hooks/useDtl/index.js

@@ -93,16 +93,23 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              return _context.abrupt("return");
+              return _context.abrupt("return", false);
 
             case 12:
-              if ((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0') {
-                showSuccess(result.flag.retMsg);
-                Object.assign(masterObject, result.data);
-                setEditItem({});
+              if (!((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0')) {
+                _context.next = 17;
+                break;
               }
 
-            case 13:
+              showSuccess(result.flag.retMsg);
+              Object.assign(masterObject, result.data);
+              setEditItem({});
+              return _context.abrupt("return", true);
+
+            case 17:
+              return _context.abrupt("return", false);
+
+            case 18:
             case "end":
               return _context.stop();
           }
@@ -217,52 +224,79 @@ function useDtl(dtlParam) {
 
   var onAddDtl = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      var _formRef$current, mstVal, mst;
+
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              if (masterObject[mstKeyField]) {
-                _context3.next = 3;
+              if (!(!masterObject[mstKeyField] && formRef.current)) {
+                _context3.next = 15;
+                break;
+              }
+
+              _context3.prev = 1;
+              _context3.next = 4;
+              return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
+
+            case 4:
+              mstVal = formRef.current.getFieldsValue();
+              _context3.next = 7;
+              return onSaveMst(mstVal);
+
+            case 7:
+              mst = _context3.sent;
+
+              if (!(mst !== true)) {
+                _context3.next = 10;
                 break;
               }
 
-              showWarn("请先保存主表");
               return _context3.abrupt("return", false);
 
-            case 3:
-              _context3.t0 = beforeAdd;
+            case 10:
+              _context3.next = 15;
+              break;
+
+            case 12:
+              _context3.prev = 12;
+              _context3.t0 = _context3["catch"](1);
+              return _context3.abrupt("return", false);
+
+            case 15:
+              _context3.t1 = beforeAdd;
 
-              if (!_context3.t0) {
-                _context3.next = 9;
+              if (!_context3.t1) {
+                _context3.next = 21;
                 break;
               }
 
-              _context3.next = 7;
+              _context3.next = 19;
               return beforeAdd(dtlItem);
 
-            case 7:
-              _context3.t1 = _context3.sent;
-              _context3.t0 = _context3.t1 === false;
+            case 19:
+              _context3.t2 = _context3.sent;
+              _context3.t1 = _context3.t2 === false;
 
-            case 9:
-              if (!_context3.t0) {
-                _context3.next = 11;
+            case 21:
+              if (!_context3.t1) {
+                _context3.next = 23;
                 break;
               }
 
               return _context3.abrupt("return", false);
 
-            case 11:
+            case 23:
               setEditItem(dtlItem);
               setShowEdit(true);
               return _context3.abrupt("return", true);
 
-            case 14:
+            case 26:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3);
+      }, _callee3, null, [[1, 12]]);
     }));
 
     return function onAddDtl() {

package/es/http/index.js

@@ -2,7 +2,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 { getCache, getUrlQuery, showError, toGatewayUrl } from '../utils'; //默认超时时间为1分钟
+import { getCache, getUrlQuery, setUrlQuery, getResourceProps, showError, toGatewayUrl } from '../utils'; //默认超时时间为1分钟
 
 var request = extend({
   timeout: 60000
@@ -22,8 +22,11 @@ request.interceptors.request.use(function (url, options) {
     });
   }
 
+  var param = {
+    resCode: getUrlQuery('resourceId') || getResourceProps('resourceId')
+  };
   return {
-    url: url,
+    url: setUrlQuery(url, param),
     options: opts
   };
 });

package/es/index.d.ts

@@ -1,5 +1,7 @@
 import DtlLayout from './components/DtlLayout';
 import InputTable from './components/InputTable';
+import Page404 from './components/404';
+import Loading from './components/Loading';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -10,4 +12,4 @@ import useDtl from './hooks/useDtl';
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps };
-export { DtlLayout, InputTable, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };
+export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };

package/es/index.js

@@ -1,5 +1,7 @@
 import DtlLayout from './components/DtlLayout';
 import InputTable from './components/InputTable';
+import Page404 from './components/404';
+import Loading from './components/Loading';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -7,4 +9,4 @@ import * as utils from './utils';
 
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
-export { DtlLayout, InputTable, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };
+export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };

package/es/utils/index.js

@@ -52,7 +52,7 @@ export var setCookie = function setCookie(key, value) {
  */
 
 export var isLogin = function isLogin() {
-  return !!getCookie('token');
+  return !!getCookie('inline');
 };
 /**
  * 设置本地缓存

package/lib/components/404.js

@@ -15,7 +15,7 @@ var _default = function _default() {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "page404"
   }, /*#__PURE__*/_react.default.createElement("img", {
-    src: "./404.jpg"
+    src: require('./404.jpg')
   }), " \u60A8\u8BBF\u95EE\u7684\u8D44\u6E90\u4E0D\u5B58\u5728~~");
 };
 

package/lib/components/common.less

@@ -64,15 +64,18 @@
 }
 
 .page404 {
-    width         : 100%;
-    height        : 100%;
-    text-align    : center;
-    padding-top   : 20%;
-    vertical-align: middle;
+    width           : 100%;
+    height          : 100%;
+    text-align      : center;
+    padding-top     : 10%;   
+    font-size       : 15px;
+    font-weight     : 600;
+    color           : gray;
+    background-color: #fff;
 
     img {
-        vertical-align: middle;
-        padding-right : 20px;
+        vertical-align: bottom;
+        padding-right : 5px;
     }
 }
 

package/lib/hooks/useDtl/index.d.ts

@@ -24,7 +24,7 @@ declare function useDtl(dtlParam: DtlParamType): {
     onLoadDtl: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
     onAddDtl: () => Promise<boolean>;
     onEditDtl: () => Promise<boolean>;
-    onSaveMst: (values: any) => Promise<void>;
+    onSaveMst: (values: any) => Promise<boolean>;
     onRemoveMst: () => Promise<boolean | undefined>;
     onExportDtl: (url: string, param: exportParam) => Promise<boolean>;
 };

package/lib/hooks/useDtl/index.js

@@ -114,16 +114,23 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              return _context.abrupt("return");
+              return _context.abrupt("return", false);
 
             case 12:
-              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);
-                Object.assign(masterObject, result.data);
-                setEditItem({});
+              if (!((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0')) {
+                _context.next = 17;
+                break;
               }
 
-            case 13:
+              (0, _utils.showSuccess)(result.flag.retMsg);
+              Object.assign(masterObject, result.data);
+              setEditItem({});
+              return _context.abrupt("return", true);
+
+            case 17:
+              return _context.abrupt("return", false);
+
+            case 18:
             case "end":
               return _context.stop();
           }
@@ -238,52 +245,79 @@ function useDtl(dtlParam) {
 
   var onAddDtl = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      var _formRef$current, mstVal, mst;
+
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              if (masterObject[mstKeyField]) {
-                _context3.next = 3;
+              if (!(!masterObject[mstKeyField] && formRef.current)) {
+                _context3.next = 15;
+                break;
+              }
+
+              _context3.prev = 1;
+              _context3.next = 4;
+              return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
+
+            case 4:
+              mstVal = formRef.current.getFieldsValue();
+              _context3.next = 7;
+              return onSaveMst(mstVal);
+
+            case 7:
+              mst = _context3.sent;
+
+              if (!(mst !== true)) {
+                _context3.next = 10;
                 break;
               }
 
-              (0, _utils.showWarn)("请先保存主表");
               return _context3.abrupt("return", false);
 
-            case 3:
-              _context3.t0 = beforeAdd;
+            case 10:
+              _context3.next = 15;
+              break;
+
+            case 12:
+              _context3.prev = 12;
+              _context3.t0 = _context3["catch"](1);
+              return _context3.abrupt("return", false);
+
+            case 15:
+              _context3.t1 = beforeAdd;
 
-              if (!_context3.t0) {
-                _context3.next = 9;
+              if (!_context3.t1) {
+                _context3.next = 21;
                 break;
               }
 
-              _context3.next = 7;
+              _context3.next = 19;
               return beforeAdd(dtlItem);
 
-            case 7:
-              _context3.t1 = _context3.sent;
-              _context3.t0 = _context3.t1 === false;
+            case 19:
+              _context3.t2 = _context3.sent;
+              _context3.t1 = _context3.t2 === false;
 
-            case 9:
-              if (!_context3.t0) {
-                _context3.next = 11;
+            case 21:
+              if (!_context3.t1) {
+                _context3.next = 23;
                 break;
               }
 
               return _context3.abrupt("return", false);
 
-            case 11:
+            case 23:
               setEditItem(dtlItem);
               setShowEdit(true);
               return _context3.abrupt("return", true);
 
-            case 14:
+            case 26:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3);
+      }, _callee3, null, [[1, 12]]);
     }));
 
     return function onAddDtl() {

package/lib/http/index.js

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

package/lib/index.d.ts

@@ -1,5 +1,7 @@
 import DtlLayout from './components/DtlLayout';
 import InputTable from './components/InputTable';
+import Page404 from './components/404';
+import Loading from './components/Loading';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -10,4 +12,4 @@ import useDtl from './hooks/useDtl';
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps };
-export { DtlLayout, InputTable, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };
+export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };

package/lib/index.js

@@ -25,6 +25,18 @@ Object.defineProperty(exports, "InputTable", {
     return _InputTable.default;
   }
 });
+Object.defineProperty(exports, "Loading", {
+  enumerable: true,
+  get: function get() {
+    return _Loading.default;
+  }
+});
+Object.defineProperty(exports, "Page404", {
+  enumerable: true,
+  get: function get() {
+    return _.default;
+  }
+});
 Object.defineProperty(exports, "fetchOptions", {
   enumerable: true,
   get: function get() {
@@ -85,6 +97,10 @@ var _DtlLayout = _interopRequireDefault(require("./components/DtlLayout"));
 
 var _InputTable = _interopRequireDefault(require("./components/InputTable"));
 
+var _ = _interopRequireDefault(require("./components/404"));
+
+var _Loading = _interopRequireDefault(require("./components/Loading"));
+
 var _BaseService = _interopRequireDefault(require("./service/BaseService"));
 
 var _http = _interopRequireWildcard(require("./http"));

package/lib/utils/index.js

@@ -111,7 +111,7 @@ var setCookie = function setCookie(key, value) {
 exports.setCookie = setCookie;
 
 var isLogin = function isLogin() {
-  return !!getCookie('token');
+  return !!getCookie('inline');
 };
 /**
  * 设置本地缓存

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.16",
+  "version": "1.0.19",
   "description": "ls-pro-common",
   "keywords": [
     "antd",
@@ -28,8 +28,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.20",
-    "ls-pro-form": "1.52.20",
+    "ls-pro-table": "2.62.21",
+    "ls-pro-form": "1.52.21",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",