ls-pro-common 1.1.0 → 1.1.1

package/es/index.d.ts

@@ -6,6 +6,7 @@ import IconSelector from './components/IconSelector';
 import ImageSelector from './components/ImageSelector';
 import InputMultiLine from './components/InputMultiLine';
 import AreaCascader from './components/AreaCascader';
+import AreaCascaderPanel from './components/AreaCascaderPanel';
 import DescritionCard from './components/DescritionCard';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
@@ -19,4 +20,4 @@ import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typin
 import type { DtlLyaoutProps } from './components/DtlLayout';
 import type { DescritionCardProps } from './components/DescritionCard';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, DescritionCard, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/es/index.js

@@ -6,6 +6,7 @@ import IconSelector from './components/IconSelector';
 import ImageSelector from './components/ImageSelector';
 import InputMultiLine from './components/InputMultiLine';
 import AreaCascader from './components/AreaCascader';
+import AreaCascaderPanel from './components/AreaCascaderPanel';
 import DescritionCard from './components/DescritionCard';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
@@ -15,4 +16,4 @@ import * as utils from './utils';
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
 import usePermission from './hooks/usePermission';
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, DescritionCard, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/lib/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/lib/components/AreaCascaderPanel.js

@@ -0,0 +1,287 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/cascader/style");
+
+var _cascader = _interopRequireDefault(require("antd/es/cascader"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+require("antd/es/button/style");
+
+var _button = _interopRequireDefault(require("antd/es/button"));
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _http = require("../http");
+
+var _utils = require("../utils");
+
+require("./common.less");
+
+var AreaPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var propsConfig = (0, _objectSpread2.default)({
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      var _document;
+
+      return (_document = document) === null || _document === void 0 ? void 0 : _document.body;
+    },
+    placeholder: "请选择"
+  }, props);
+
+  var _useState = (0, _react.useState)((0, _utils.getCache)('areaOptionsPanel', true) || []),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      options = _useState2[0],
+      setOptions = _useState2[1]; //显示数据
+
+
+  var _useState3 = (0, _react.useState)((0, _utils.getCache)('areaOptionsPanel', true) || []),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      showData = _useState4[0],
+      setShowData = _useState4[1]; //暂存值
+
+
+  var _useState5 = (0, _react.useState)([]),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      listData = _useState6[0],
+      setListData = _useState6[1]; //省市区实际值
+
+
+  var _useState7 = (0, _react.useState)(props.value || []),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      actualData = _useState8[0],
+      setActualData = _useState8[1]; //标题显示值
+
+
+  var _useState9 = (0, _react.useState)('province'),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      areaTitle = _useState10[0],
+      setAreaTitle = _useState10[1];
+
+  var areaRef = (0, _react.useRef)();
+  (0, _react.useImperativeHandle)(ref, function () {
+    return areaRef.current;
+  });
+  (0, _react.useEffect)(function () {
+    initOptions();
+  }, []);
+  (0, _react.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]);
+  (0, _react.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 = (0, _slicedToArray2.default)(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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var cacheItems, api, result, opts;
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              cacheItems = (0, _utils.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 (0, _http.httpGet)(api, {}, false);
+
+            case 6:
+              result = _context.sent;
+              opts = result.rows || [];
+              (0, _utils.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;
+              });
+              (0, _utils.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.default.createElement("div", {
+      className: "ls-area-cascaded-header"
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "ls-word-box-display"
+    }, /*#__PURE__*/_react.default.createElement(_button.default, {
+      type: "text",
+      onClick: function onClick() {
+        setAreaTitle('province');
+        setShowData(options);
+        setListData(function (val) {
+          return val.length ? [val[0]] : [];
+        });
+      }
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: 'ls-myself-select-title-style'
+    }, listData[0] ? (_listData$ = listData[0]) === null || _listData$ === void 0 ? void 0 : _listData$.label : '省/直辖市'))), /*#__PURE__*/_react.default.createElement("div", {
+      className: "ls-word-box-display"
+    }, /*#__PURE__*/_react.default.createElement(_button.default, {
+      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.default.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.default.createElement("div", {
+      className: "ls-word-box-display"
+    }, /*#__PURE__*/_react.default.createElement(_button.default, {
+      type: "text",
+      disabled: listData.length < 3
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: 'ls-myself-select-title-style'
+    }, listData[2] ? listData[2].label : '区'))));
+
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "ls-area-cascaded-box"
+    }, title, /*#__PURE__*/_react.default.createElement("div", {
+      className: "ls-area-cascaded-body"
+    }, showData.map(function (item) {
+      return /*#__PURE__*/_react.default.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.default.createElement(_cascader.default, (0, _extends2.default)({
+    options: options,
+    style: {
+      width: '100%'
+    },
+    className: 'ls-area-box-position',
+    changeOnSelect: true,
+    ref: areaRef,
+    onClear: function onClear() {
+      setActualData([]);
+      setListData([]);
+      setShowData(options);
+    },
+    dropdownRender: dropdownRender
+  }, propsConfig));
+});
+
+var _default = AreaPicker;
+exports.default = _default;

package/lib/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/lib/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/lib/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/lib/hooks/useDtl/index.js

@@ -55,7 +55,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 = (0, _usePermission2.default)(),
       canAdd = _usePermission.canAdd,
@@ -863,23 +865,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;
               }
 
@@ -888,15 +895,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;
@@ -907,7 +914,7 @@ function useDtl(dtlParam) {
 
               return _context8.abrupt("return", result);
 
-            case 30:
+            case 31:
             case "end":
               return _context8.stop();
           }
@@ -977,17 +984,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);
               (0, _utils.showError)(_context9.t0.message);
               return _context9.abrupt("return", false);
 
-            case 27:
+            case 26:
             case "end":
               return _context9.stop();
           }

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