ls-pro-common 1.0.22 → 1.0.25

package/es/components/InputTable.d.ts

@@ -13,7 +13,11 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     textName?: string;
     tableConfig?: any;
     labelWidth?: number;
+    isV2?: boolean;
+    keepSelect?: boolean;
     onSelectChange?: (item: any) => void;
+    beforeLoad?: (param: any) => void;
+    afterLoad?: (rows: any[]) => void;
 };
 declare function InputTable(prop: InputTableProps): JSX.Element;
 export default InputTable;

package/es/components/InputTable.js

@@ -10,7 +10,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange"],
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect"],
     _excluded2 = ["current", "pageSize"];
 import React from "react";
 import { useRef, useState, useEffect, useContext } from 'react';
@@ -58,39 +58,71 @@ function InputTable(prop) {
       labelWidth = _prop$labelWidth === void 0 ? 70 : _prop$labelWidth,
       textField = prop.textField,
       onSelectChange = prop.onSelectChange,
+      beforeLoad = prop.beforeLoad,
+      afterLoad = prop.afterLoad,
+      _prop$isV = prop.isV2,
+      isV2 = _prop$isV === void 0 ? false : _prop$isV,
+      _prop$allowClear = prop.allowClear,
+      allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
+      _prop$keepSelect = prop.keepSelect,
+      keepSelect = _prop$keepSelect === void 0 ? false : _prop$keepSelect,
       rest = _objectWithoutProperties(prop, _excluded);
 
   var textNameProp = textName || name + '__text';
 
   var loadData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
-      var current, pageSize, rest, data, result;
+      var current, pageSize, rest, data, _tableRef$current, _tableRef$current$cle, result, rows;
+
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               current = param.current, pageSize = param.pageSize, rest = _objectWithoutProperties(param, _excluded2);
-              data = {
-                page: current,
-                pageSize: pageSize
-              };
+              data = {};
+
+              if (isV2) {
+                data['page.pn'] = current;
+                data['page.size'] = pageSize;
+              } else {
+                data.page = current;
+                data.pageSize = pageSize;
+              }
 
-              if (Object.keys(rest).length) {
+              ;
+
+              if (Object.keys(rest).length && !isV2) {
                 data.where = rest;
               }
 
-              _context.next = 5;
+              if (!keepSelect) {
+                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);
+              }
+
+              if (beforeLoad) {
+                beforeLoad(data);
+              }
+
+              ;
+              _context.next = 10;
               return httpGet(url, data);
 
-            case 5:
+            case 10:
               result = _context.sent;
+              rows = result.rows || [];
+
+              if (afterLoad) {
+                afterLoad(rows);
+              }
+
               return _context.abrupt("return", {
-                data: result.rows || [],
+                data: rows,
                 total: result.total || 0,
                 success: true
               });
 
-            case 7:
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -107,10 +139,10 @@ function InputTable(prop) {
     var _formRef$current;
 
     var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue();
-    var txt = formValue[textField || valueField];
 
-    if (txt) {
-      setText(txt);
+    if (!textName && formValue[name]) {
+      formValue[textNameProp] = formValue[name];
+      formRef === null || formRef === void 0 ? void 0 : formRef.current.setFieldsValue(_objectSpread({}, formValue));
     }
   }, []);
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
@@ -148,12 +180,9 @@ function InputTable(prop) {
 
           var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFieldsValue();
           formValue[name] = record[valueField];
-          setText(record[textField || valueField]); // 如果需要接收名称(指定了名称属性名)，则反回名称
-
-          if (textName) {
-            formValue[textNameProp] = record[textField || valueField];
-          }
-
+          var txt = record[textField || valueField];
+          formValue[textNameProp] = txt;
+          setText(txt);
           (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldsValue(_objectSpread({}, formValue));
           setVisible(false);
           onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(record);
@@ -163,25 +192,19 @@ function InputTable(prop) {
     toolBarRender: function toolBarRender() {
       return [/*#__PURE__*/React.createElement(_Button, {
         onClick: function onClick() {
-          if (selectedRows.length) {
-            var _formRef$current4, _formRef$current5;
-
-            var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getFieldsValue();
-            formValue[name] = selectedRows.map(function (o) {
-              return o[valueField];
-            }).join(',');
-            var txt = selectedRows.map(function (o) {
-              return o[textField || valueField];
-            }).join(',');
-            setText(txt); // 如果需要接收名称，则反回名称
-
-            if (textName) {
-              formValue[textNameProp] = txt;
-            }
-
-            (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldsValue(_objectSpread({}, formValue));
-          }
+          var _formRef$current4, _formRef$current5;
 
+          var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getFieldsValue();
+          formValue[name] = selectedRows.map(function (o) {
+            return o[valueField];
+          }).join(',');
+          var txt = selectedRows.map(function (o) {
+            return o[textField || valueField];
+          }).join(',');
+          formValue[textNameProp] = txt;
+          setText(txt);
+          (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldsValue(_objectSpread({}, formValue));
+          onSelectChange === null || onSelectChange === void 0 ? void 0 : onSelectChange(selectedRows);
           setVisible(false);
         }
       }, "\u786E\u8BA4")];
@@ -194,7 +217,7 @@ function InputTable(prop) {
     }
   }, /*#__PURE__*/React.createElement(ProFormText, {
     name: name
-  })), /*#__PURE__*/React.createElement(ProFormText, _extends({
+  })), rest.label ? /*#__PURE__*/React.createElement(ProFormText, _extends({
     name: textNameProp
   }, rest), /*#__PURE__*/React.createElement(_Input, {
     suffix: /*#__PURE__*/React.createElement(_Popover, {
@@ -217,12 +240,66 @@ function InputTable(prop) {
       var _formRef$current6;
 
       var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.getFieldsValue();
-      formValue[name] = e.target.value;
+      var val = e.target.value;
+      formValue[name] = val;
+      formValue[textNameProp] = val;
+      formRef.current.setFieldsValue(_objectSpread({}, formValue));
+    },
+    onChange: function onChange(e) {
+      if (!e.target.value) {
+        var _formRef$current7;
+
+        var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.getFieldsValue();
+        formValue[name] = '';
+        formValue[textNameProp] = '';
+        formRef.current.setFieldsValue(_objectSpread({}, formValue));
+      }
+    },
+    readOnly: readonly,
+    allowClear: allowClear
+  })) : /*#__PURE__*/React.createElement(_Input, _extends({
+    suffix: /*#__PURE__*/React.createElement(_Popover, {
+      content: /*#__PURE__*/React.createElement("div", {
+        style: {
+          width: tableWidth + 'px',
+          height: tableHeight + 'px',
+          maxHeight: '95vh',
+          overflow: 'auto'
+        }
+      }, tableDom),
+      trigger: "click",
+      visible: visible,
+      onVisibleChange: setVisible
+    }, /*#__PURE__*/React.createElement(MoreOutlined, null)),
+    onClick: function onClick() {
+      return setVisible(true);
+    },
+    onInput: function onInput(e) {
+      var _formRef$current8;
+
+      var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.getFieldsValue();
+      var val = e.target.value;
+      formValue[name] = val;
+      formValue[textNameProp] = val;
+      setText(val);
       formRef.current.setFieldsValue(_objectSpread({}, formValue));
     },
+    onChange: function onChange(e) {
+      //用于清除当前组件值
+      if (!e.target.value) {
+        var _formRef$current9;
+
+        setText('');
+        var formValue = formRef === null || formRef === void 0 ? void 0 : (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.getFieldsValue();
+        formValue[name] = '';
+        formValue[textNameProp] = '';
+        formRef.current.setFieldsValue(_objectSpread({}, formValue));
+      }
+    },
     readOnly: readonly,
-    value: text
-  })));
+    value: text,
+    allowClear: allowClear
+  }, rest === null || rest === void 0 ? void 0 : rest.fieldProps)));
 }
 
 export default InputTable;

package/es/hooks/useDtl/index.js

@@ -611,6 +611,8 @@ function useDtl(dtlParam) {
 
   var onLoadDtl = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(params, sort, filter) {
+      var _tableRef$current, _tableRef$current$cle;
+
       var current, pageSize, rest, param, key, result;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
@@ -649,23 +651,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;
               }
 
@@ -674,17 +678,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();
           }
@@ -882,6 +886,28 @@ function useDtl(dtlParam) {
     }
   };
 
+  var onExport = function onExport() {
+    var _tableRef$current2, _tableRef$current2$sh;
+
+    if (!masterObject[mstKeyField]) {
+      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.showExport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
+  };
+
+  var onImport = function onImport() {
+    var _tableRef$current3, _tableRef$current3$sh;
+
+    if (!masterObject[mstKeyField]) {
+      showWarn('主表没保存，无法导入数据');
+      return;
+    }
+
+    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 = useMemo(function () {
     return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && !isAudit() ? /*#__PURE__*/React.createElement(_Button, {
       key: "add",
@@ -907,17 +933,13 @@ function useDtl(dtlParam) {
     }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) ? /*#__PURE__*/React.createElement(_Button, {
       key: "import",
       onClick: function onClick() {
-        var _tableRef$current, _tableRef$current$sho;
-
-        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);
+        onImport();
       },
       icon: /*#__PURE__*/React.createElement(ImportOutlined, null)
-    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) ? /*#__PURE__*/React.createElement(_Button, {
       key: "export",
       onClick: function onClick() {
-        var _tableRef$current2, _tableRef$current2$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);
+        onExport();
       },
       icon: /*#__PURE__*/React.createElement(ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {

package/es/hooks/useSingle/index.js

@@ -482,6 +482,8 @@ function useSingle(inParam) {
 
   var onLoad = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(params, sort, filter) {
+      var _tableRef$current, _tableRef$current$cle;
+
       var current, pageSize, rest, param, key, result;
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
@@ -505,23 +507,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;
               }
 
@@ -531,17 +535,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();
           }
@@ -689,17 +693,17 @@ function useSingle(inParam) {
     }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && checkRight(128) ? /*#__PURE__*/React.createElement(_Button, {
       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);
       },
       icon: /*#__PURE__*/React.createElement(ImportOutlined, null)
-    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && checkRight(256) ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && checkRight(256) ? /*#__PURE__*/React.createElement(_Button, {
       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);
       },
       icon: /*#__PURE__*/React.createElement(ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {

package/es/http/index.js

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

package/es/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;

package/es/utils/index.js

@@ -217,6 +217,7 @@ export var treeFind = function treeFind(list, key, val) {
 
   return item;
 };
+export var isDev = location.href.includes("//localhost");
 export var getUserInfo = function getUserInfo() {
   return getCache('user');
 };

package/lib/components/InputTable.d.ts

@@ -13,7 +13,11 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     textName?: string;
     tableConfig?: any;
     labelWidth?: number;
+    isV2?: boolean;
+    keepSelect?: boolean;
     onSelectChange?: (item: any) => void;
+    beforeLoad?: (param: any) => void;
+    afterLoad?: (rows: any[]) => void;
 };
 declare function InputTable(prop: InputTableProps): JSX.Element;
 export default InputTable;