ls-pro-common 1.0.91 → 1.1.1

package/es/components/AreaCascaderPanel.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { CascaderProps } from 'antd';
+import './common.less';
+declare const AreaPicker: React.ForwardRefExoticComponent<CascaderProps<any> & React.RefAttributes<unknown>>;
+export default AreaPicker;

package/es/components/AreaCascaderPanel.js

@@ -0,0 +1,260 @@
+import "antd/es/cascader/style";
+import _Cascader from "antd/es/cascader";
+import _extends from "@babel/runtime/helpers/esm/extends";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import React, { useRef, useState, useEffect, useImperativeHandle } from 'react';
+import { httpGet } from '../http';
+import { getCache, setCache, treeEach } from '../utils';
+import './common.less';
+var AreaPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var propsConfig = _objectSpread({
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      var _document;
+
+      return (_document = document) === null || _document === void 0 ? void 0 : _document.body;
+    },
+    placeholder: "请选择"
+  }, props);
+
+  var _useState = useState(getCache('areaOptionsPanel', true) || []),
+      _useState2 = _slicedToArray(_useState, 2),
+      options = _useState2[0],
+      setOptions = _useState2[1]; //显示数据
+
+
+  var _useState3 = useState(getCache('areaOptionsPanel', true) || []),
+      _useState4 = _slicedToArray(_useState3, 2),
+      showData = _useState4[0],
+      setShowData = _useState4[1]; //暂存值
+
+
+  var _useState5 = useState([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      listData = _useState6[0],
+      setListData = _useState6[1]; //省市区实际值
+
+
+  var _useState7 = useState(props.value || []),
+      _useState8 = _slicedToArray(_useState7, 2),
+      actualData = _useState8[0],
+      setActualData = _useState8[1]; //标题显示值
+
+
+  var _useState9 = useState('province'),
+      _useState10 = _slicedToArray(_useState9, 2),
+      areaTitle = _useState10[0],
+      setAreaTitle = _useState10[1];
+
+  var areaRef = useRef();
+  useImperativeHandle(ref, function () {
+    return areaRef.current;
+  });
+  useEffect(function () {
+    initOptions();
+  }, []);
+  useEffect(function () {
+    if (actualData.length !== 0) {
+      var _props$onChange;
+
+      (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, actualData, listData);
+    } else {
+      setAreaTitle('province');
+    }
+  }, [actualData]);
+  useEffect(function () {
+    var _props$value;
+
+    if (!options.length || !((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.length)) return;
+
+    var _props$value2 = _slicedToArray(props.value, 3),
+        pKey = _props$value2[0],
+        cKey = _props$value2[1],
+        dKey = _props$value2[2];
+
+    var province = pKey ? options.find(function (o) {
+      return o.value === pKey;
+    }) : false;
+    var city = province && cKey ? province.children.find(function (o) {
+      return o.value === cKey;
+    }) : false;
+    var district = city && dKey ? city.children.find(function (o) {
+      return o.value === dKey;
+    }) : false;
+    var area = [province, city, district].filter(Boolean);
+    setListData(area);
+    setAreaTitle(area.length === 3 ? 'district' : area.length === 2 ? 'city' : 'province');
+    setShowData(area.length === 3 ? city.children : area.length === 2 ? province.children : options);
+  }, [options]);
+
+  var initOptions = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var cacheItems, api, result, opts;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              cacheItems = getCache('areaOptionsPanel', true);
+
+              if (!(cacheItems && Array.isArray(cacheItems) && cacheItems.length)) {
+                _context.next = 3;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 3:
+              api = '/petrel/petrel-location-center-api/sysAdministrativeDivision/allByTree';
+              _context.next = 6;
+              return httpGet(api, {}, false);
+
+            case 6:
+              result = _context.sent;
+              opts = result.rows || [];
+              treeEach(opts, function (item) {
+                item.label = item.name;
+                item.value = item.id;
+
+                if (item.level === 'district') {
+                  delete item.children;
+                }
+
+                delete item.name;
+                delete item.id;
+                delete item.parentId;
+              });
+              setCache('areaOptionsPanel', opts, true);
+              setOptions(opts);
+              setShowData(opts);
+
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function initOptions() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  var dropdownRender = function dropdownRender(menus) {
+    var _listData$, _listData$3;
+
+    var title = /*#__PURE__*/React.createElement("div", {
+      className: "ls-area-cascaded-header"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "ls-word-box-display"
+    }, /*#__PURE__*/React.createElement(_Button, {
+      type: "text",
+      onClick: function onClick() {
+        setAreaTitle('province');
+        setShowData(options);
+        setListData(function (val) {
+          return val.length ? [val[0]] : [];
+        });
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      className: 'ls-myself-select-title-style'
+    }, listData[0] ? (_listData$ = listData[0]) === null || _listData$ === void 0 ? void 0 : _listData$.label : '省/直辖市'))), /*#__PURE__*/React.createElement("div", {
+      className: "ls-word-box-display"
+    }, /*#__PURE__*/React.createElement(_Button, {
+      type: "text",
+      disabled: listData.length < 2,
+      onClick: function onClick() {
+        var _listData$2;
+
+        setAreaTitle('city');
+        setShowData((_listData$2 = listData[0]) === null || _listData$2 === void 0 ? void 0 : _listData$2.children);
+        setListData(function (val) {
+          return val.filter(function (o, i) {
+            return i < 2;
+          });
+        });
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      className: 'ls-myself-select-title-style'
+    }, areaTitle !== 'province' && listData[1] ? (_listData$3 = listData[1]) === null || _listData$3 === void 0 ? void 0 : _listData$3.label : '市'))), /*#__PURE__*/React.createElement("div", {
+      className: "ls-word-box-display"
+    }, /*#__PURE__*/React.createElement(_Button, {
+      type: "text",
+      disabled: listData.length < 3
+    }, /*#__PURE__*/React.createElement("span", {
+      className: 'ls-myself-select-title-style'
+    }, listData[2] ? listData[2].label : '区'))));
+    return /*#__PURE__*/React.createElement("div", {
+      className: "ls-area-cascaded-box"
+    }, title, /*#__PURE__*/React.createElement("div", {
+      className: "ls-area-cascaded-body"
+    }, showData.map(function (item) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "ls-area-cascaded-span ".concat(actualData.find(function (o) {
+          return o === item.value;
+        }) ? ' ls-area-selected' : ''),
+        title: item.label,
+        onClick: function onClick(e) {
+          var _areaRef$current;
+
+          switch ((item === null || item === void 0 ? void 0 : item.level) || '') {
+            case 'province':
+              setShowData(item === null || item === void 0 ? void 0 : item.children);
+              setActualData([item === null || item === void 0 ? void 0 : item.value]);
+              setListData(function (val) {
+                return [item];
+              }); //面板标题指向市
+
+              setAreaTitle('city');
+              break;
+
+            case 'city':
+              setShowData(item === null || item === void 0 ? void 0 : item.children);
+              setActualData(function (val) {
+                return [val[0], item === null || item === void 0 ? void 0 : item.value];
+              });
+              setListData(function (val) {
+                return [val[0], item];
+              });
+              setAreaTitle('district');
+              break;
+
+            case 'district':
+              setActualData(function (val) {
+                return [val[0], val[1], item === null || item === void 0 ? void 0 : item.value];
+              });
+              setListData(function (val) {
+                return [val[0], val[1], item];
+              });
+              (_areaRef$current = areaRef.current) === null || _areaRef$current === void 0 ? void 0 : _areaRef$current.blur();
+              break;
+
+            default:
+              break;
+          }
+        }
+      }, item.label);
+    })));
+  };
+
+  return /*#__PURE__*/React.createElement(_Cascader, _extends({
+    options: options,
+    style: {
+      width: '100%'
+    },
+    className: 'ls-area-box-position',
+    changeOnSelect: true,
+    ref: areaRef,
+    onClear: function onClear() {
+      setActualData([]);
+      setListData([]);
+      setShowData(options);
+    },
+    dropdownRender: dropdownRender
+  }, propsConfig));
+});
+export default AreaPicker;

package/es/components/InputTable.d.ts

@@ -35,6 +35,7 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     fillMap?: Record<string, string>;
     /**@name 输入后检查数据的触发方式，默认为entry回车触发 */
     triggerCheck?: 'entry' | 'blur';
+    /**@name 每次展示面板时都加载数据，接合 tableConfig里的 manualRequest 一起使用 */
     loadOnShow?: boolean;
     placement?: TooltipPlacement;
     arrowPointAtCenter?: boolean;
@@ -88,6 +89,7 @@ declare const InputTable: React.ForwardRefExoticComponent<{
     fillMap?: Record<string, string> | undefined;
     /**@name 输入后检查数据的触发方式，默认为entry回车触发 */
     triggerCheck?: "entry" | "blur" | undefined;
+    /**@name 每次展示面板时都加载数据，接合 tableConfig里的 manualRequest 一起使用 */
     loadOnShow?: boolean | undefined;
     placement?: TooltipPlacement | undefined;
     arrowPointAtCenter?: boolean | undefined;

package/es/components/common.less

@@ -351,4 +351,98 @@ a:hover {
 
 .ant-row {
   width: 100%;
-}
+}
+
+.ant-popover {
+  max-width: min-content !important;
+}
+//-------------------省市区组件样式-----------
+//最外层盒子
+.ls-area-cascaded-box {
+  width: 600px;
+  display: flex;
+  flex-direction: column;
+  transition: all 0.3s;
+
+  .ls-area-cascaded-header {
+    width: 100%;
+    padding: 2px 0 6px;
+    border-bottom: 1px solid #f0f0f0;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    justify-content: center;
+
+    .ls-word-box-display {
+      margin: 0 10px;
+      font-size: 14px;
+      font-weight: 100;
+
+      button {
+        border: none;
+        background-color: var(--ant-primary-2, #f0f9ff);
+
+        &[disabled] {
+          background-color: #fafafa !important;
+
+          .ls-myself-select-title-style {
+            color: var(--ant-primary-4, #a3d7ff);
+            transition: all 0.3s;
+          }
+        }
+      }
+
+      .ls-myself-select-title-style {
+        color: var(--ant-primary-color, rgb(69, 154, 220));
+        font-size: 14px;
+        font-weight: 600;
+        transition: all 0.3s;
+      }
+    }
+
+    .ls-icon-box-display {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .ls-area-cascaded-body {
+    width: 100%;
+    min-height: 100px;
+    max-height: 350px;
+    overflow: auto;
+    padding: 8px 12px 4px;
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 4px;
+    justify-content: start;
+    align-content: flex-start;
+    align-items: center;
+
+    .ls-area-cascaded-span {
+      text-align: center;
+      padding: 6px 10px;
+
+      //文字不换行，超出省略
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      cursor: pointer;
+
+      &.ls-area-selected,
+      &:hover {
+        color: var(--ant-primary-color, rgb(69, 154, 220));
+        transition: all 0.3s;
+      }
+    }
+  }
+}
+
+//手动指定盒子位置
+.ls-area-box-position {
+  .ls-ant-select-dropdown {
+    top: 36px !important;
+  }
+}
+
+//-------------------省市区组件样式-----------

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

@@ -19,6 +19,8 @@ export declare type DtlParamType = SingleParamType & {
     billType?: string;
     /**@name 动态编码规则字段,主从表一起保存传参 */
     codeRuleDynamicField?: string;
+    /**@是否查询历史数据 */
+    ifHistoryData?: 0 | 1;
 };
 declare function useDtl(dtlParam: DtlParamType): {
     formRef: import("react").MutableRefObject<ProFormInstance<any> | undefined>;

package/es/hooks/useDtl/index.js

@@ -33,7 +33,9 @@ function useDtl(dtlParam) {
       afterRemove = dtlParam.afterRemove,
       btnStatus = dtlParam.btnStatus,
       beforeAudit = dtlParam.beforeAudit,
-      afterAudit = dtlParam.afterAudit;
+      afterAudit = dtlParam.afterAudit,
+      _dtlParam$ifHistoryDa = dtlParam.ifHistoryData,
+      ifHistoryData = _dtlParam$ifHistoryDa === void 0 ? 0 : _dtlParam$ifHistoryDa;
 
   var _usePermission = usePermission(),
       canAdd = _usePermission.canAdd,
@@ -841,23 +843,28 @@ function useDtl(dtlParam) {
 
               setSelectedRows([]);
               (_tableRef$current3 = tableRef.current) === null || _tableRef$current3 === void 0 ? void 0 : (_tableRef$current3$cl = _tableRef$current3.clearSelected) === null || _tableRef$current3$cl === void 0 ? void 0 : _tableRef$current3$cl.call(_tableRef$current3);
+
+              if (ifHistoryData === 1) {
+                param.history = 1;
+              }
+
               _context8.t0 = beforeLoad;
 
               if (!_context8.t0) {
-                _context8.next = 20;
+                _context8.next = 21;
                 break;
               }
 
-              _context8.next = 18;
+              _context8.next = 19;
               return beforeLoad(param);
 
-            case 18:
+            case 19:
               _context8.t1 = _context8.sent;
               _context8.t0 = _context8.t1 === false;
 
-            case 20:
+            case 21:
               if (!_context8.t0) {
-                _context8.next = 22;
+                _context8.next = 23;
                 break;
               }
 
@@ -866,15 +873,15 @@ function useDtl(dtlParam) {
                 success: true
               });
 
-            case 22:
+            case 23:
               if (sumProperties && param.sort) {
                 delete param.sort;
               }
 
-              _context8.next = 25;
+              _context8.next = 26;
               return dtlService.load(param);
 
-            case 25:
+            case 26:
               result = _context8.sent;
               result.data = result.rows;
               result.success = true;
@@ -885,7 +892,7 @@ function useDtl(dtlParam) {
 
               return _context8.abrupt("return", result);
 
-            case 30:
+            case 31:
             case "end":
               return _context8.stop();
           }
@@ -955,17 +962,16 @@ function useDtl(dtlParam) {
               return _context9.abrupt("return", false);
 
             case 20:
-              _context9.next = 27;
+              _context9.next = 26;
               break;
 
             case 22:
               _context9.prev = 22;
               _context9.t0 = _context9["catch"](6);
-              console.log(_context9.t0);
               showError(_context9.t0.message);
               return _context9.abrupt("return", false);
 
-            case 27:
+            case 26:
             case "end":
               return _context9.stop();
           }

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

@@ -49,5 +49,7 @@ declare function useSingle(inParam: SingleParamType): {
     checkRight: (val: number) => boolean;
     loginName: string | undefined;
     isAudit: (row?: any) => boolean;
+    ifHistoryData: 0 | 1;
+    setIfHistoryData: import("react").Dispatch<import("react").SetStateAction<0 | 1>>;
 };
 export default useSingle;

package/es/hooks/useSingle/index.js

@@ -78,6 +78,28 @@ function useSingle(inParam) {
   /**@name 编辑表单Ref */
 
   var editFormRef = useRef();
+  /**@name 查看历史数据 */
+
+  var _useState7 = useState(0),
+      _useState8 = _slicedToArray(_useState7, 2),
+      ifHistoryData = _useState8[0],
+      setIfHistoryData = _useState8[1];
+  /** 判断是否已审核，只有传入审核状态和状态字段才进行判断 */
+
+
+  var isAudit = useCallback(function () {
+    var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    if (!auditStatus || !statusField) return false;
+    if (!row && !selectedRows.length) return false;
+
+    if (row) {
+      return Number(row[statusField] || 0) >= auditStatus;
+    }
+
+    return selectedRows.findIndex(function (o) {
+      return Number(o[statusField] || 0) >= auditStatus;
+    }) > -1;
+  }, [auditStatus, statusField, selectedRows]);
   /** 新增按钮事件 */
 
   var onAdd = /*#__PURE__*/function () {
@@ -505,7 +527,7 @@ function useSingle(inParam) {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(params, sort, filter) {
       var _tableRef$current, _tableRef$current$cle;
 
-      var current, pageSize, sumProperties, rest, param, key, _key, sortArr, _key2, result;
+      var current, pageSize, sumProperties, rest, param, key, k, sortArr, _key, result;
 
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
@@ -540,9 +562,9 @@ function useSingle(inParam) {
               if (filter && Object.keys(filter).length) {
                 param.where = param.where || {};
 
-                for (_key in filter) {
-                  if (filter[_key] && !param.where[_key]) {
-                    param.where[_key] = filter[_key];
+                for (k in filter) {
+                  if (filter[k] && !param.where[k]) {
+                    param.where[k] = filter[k];
                   }
                 }
 
@@ -555,32 +577,36 @@ function useSingle(inParam) {
               if (!sumProperties && sort && Object.keys(sort).length) {
                 sortArr = [];
 
-                for (_key2 in sort) {
-                  sortArr.push(_key2 + ' ' + (sort[_key2] === 'ascend' ? 'asc' : 'desc'));
+                for (_key in sort) {
+                  sortArr.push(_key + ' ' + (sort[_key] === 'ascend' ? 'asc' : 'desc'));
                 }
 
                 param.sort = sortArr.join(',');
               }
 
+              if (ifHistoryData) {
+                param.history = 1;
+              }
+
               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 = 16;
+                _context6.next = 17;
                 break;
               }
 
-              _context6.next = 14;
+              _context6.next = 15;
               return beforeLoad(param);
 
-            case 14:
+            case 15:
               _context6.t1 = _context6.sent;
               _context6.t0 = _context6.t1 === false;
 
-            case 16:
+            case 17:
               if (!_context6.t0) {
-                _context6.next = 18;
+                _context6.next = 19;
                 break;
               }
 
@@ -590,15 +616,15 @@ function useSingle(inParam) {
                 total: 0
               });
 
-            case 18:
+            case 19:
               if (sumProperties && param.sort) {
                 delete param.sort;
               }
 
-              _context6.next = 21;
+              _context6.next = 22;
               return service.load(param);
 
-            case 21:
+            case 22:
               result = _context6.sent;
               result.data = result.rows || [];
               result.success = true;
@@ -609,7 +635,7 @@ function useSingle(inParam) {
 
               return _context6.abrupt("return", result);
 
-            case 26:
+            case 27:
             case "end":
               return _context6.stop();
           }
@@ -701,6 +727,12 @@ function useSingle(inParam) {
       return _ref7.apply(this, arguments);
     };
   }();
+  /**
+   * 判断按钮状态
+   * @param key
+   * @returns
+   */
+
 
   var btnDisabled = function btnDisabled(key) {
     if (btnStatus && typeof btnStatus(key) === 'boolean') return btnStatus(key);
@@ -716,23 +748,8 @@ function useSingle(inParam) {
       default:
         return false;
     }
-  };
-  /** 判断是否已审核，只有传入审核状态和状态字段才进行判断 */
-
+  }; // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
 
-  var isAudit = useCallback(function () {
-    var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    if (!auditStatus || !statusField) return false;
-    if (!row && !selectedRows.length) return false;
-
-    if (row) {
-      return Number(row[statusField] || 0) >= auditStatus;
-    }
-
-    return selectedRows.findIndex(function (o) {
-      return Number(o[statusField] || 0) >= auditStatus;
-    }) > -1;
-  }, [auditStatus, statusField, selectedRows]); // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
 
   var tableTools = useMemo(function () {
     return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && canAdd ? /*#__PURE__*/React.createElement(_Button, {
@@ -782,7 +799,7 @@ function useSingle(inParam) {
       },
       disabled: btnDisabled('export'),
       icon: /*#__PURE__*/React.createElement(ExportOutlined, null)
-    }, "\u5BFC\u51FA") : false].filter(function (o) {
+    }, "\u5BFC\u51FA") : false].filter(function () {
       return Boolean;
     });
   }, [selectedRows]);
@@ -807,7 +824,9 @@ function useSingle(inParam) {
     resourceId: resourceId,
     checkRight: checkRight,
     loginName: loginName,
-    isAudit: isAudit
+    isAudit: isAudit,
+    ifHistoryData: ifHistoryData,
+    setIfHistoryData: setIfHistoryData
   };
 }
 

package/es/http/index.js

@@ -6,10 +6,18 @@ import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showEr
 var request = extend({
   timeout: 60000
 });
+var httpStatus = {
+  404: '服务不存在',
+  429: '接口限流',
+  502: '网关出错',
+  503: '当前服务器异常',
+  504: '请求超时'
+};
 /** 请求拦截器,统一添加token */
 
 request.interceptors.request.use(function (url, options) {
   var token = getCookie("token");
+  console.log('我的拦截', token);
   options.headers = options.headers || {}; // 处理 token
 
   if (token && url.indexOf('noToken=1') === -1) {