ls-pro-common 1.0.43 → 1.0.46

package/es/components/AreaCascader.d.ts

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

package/es/components/AreaCascader.js

@@ -0,0 +1,89 @@
+import "antd/es/cascader/style";
+import _Cascader from "antd/es/cascader";
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useRef, useState, useEffect, useImperativeHandle } from 'react';
+import { httpGet } from '../http';
+import { getCache, setCache, treeEach } from '../utils';
+var AreaCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      options = _useState2[0],
+      setOptions = _useState2[1];
+
+  var areaRef = useRef();
+  useImperativeHandle(ref, function () {
+    return areaRef.current;
+  });
+  useEffect(function () {
+    initOptions();
+  }, []);
+
+  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("areaOptions", true);
+
+              if (!(cacheItems && Array.isArray(cacheItems))) {
+                _context.next = 4;
+                break;
+              }
+
+              setOptions(cacheItems);
+              return _context.abrupt("return");
+
+            case 4:
+              api = '/petrel/petrel-location-center-api/sysAdministrativeDivision/allByTree';
+              _context.next = 7;
+              return httpGet(api, {}, false);
+
+            case 7:
+              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.level;
+                delete item.parentId;
+              });
+              setCache('areaOptions', opts, true);
+              setOptions(opts);
+
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function initOptions() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  return /*#__PURE__*/React.createElement(_Cascader, _extends({
+    options: options,
+    style: {
+      width: '100%'
+    },
+    changeOnSelect: true,
+    placeholder: "\u8BF7\u9009\u62E9"
+  }, props, {
+    ref: areaRef
+  }));
+});
+export default AreaCascader;

package/es/components/common.less

@@ -1,3 +1,46 @@
+body {
+    --ant-primary-color: #4997E6;
+    --ant-primary-color-hover: #74b7f2;
+    --ant-primary-color-active: #3475bf;
+    --ant-primary-color-outline: rgba(73, 151, 230, 0.2);
+    --ant-primary-1: #f0faff;
+    --ant-primary-2: #f0f9ff;
+    --ant-primary-3: #ccebff;
+    --ant-primary-4: #a3d7ff;
+    --ant-primary-5: #74b7f2;
+    --ant-primary-6: #4997E6;
+    --ant-primary-7: #3475bf;
+    --ant-primary-color-deprecated-pure: #e6f1fc;
+    --ant-primary-color-deprecated-l-35: #e6f1fc;
+    --ant-primary-color-deprecated-l-20: #a3caf2;
+    --ant-primary-color-deprecated-t-20: #6daceb;
+    --ant-primary-color-deprecated-t-50: #a4cbf3;
+    --ant-primary-color-deprecated-f-12: rgba(73, 151, 230, 0.12);
+    --ant-primary-color-active-deprecated-f-30: rgba(240, 250, 255, 0.3);
+    --ant-primary-color-active-deprecated-d-02: #e6f7ff;
+    --ant-success-color: #52c41a;
+    --ant-success-color-hover: #73d13d;
+    --ant-success-color-active: #389e0d;
+    --ant-success-color-outline: rgba(82, 196, 26, 0.2);
+    --ant-success-color-deprecated-bg: #f6ffed;
+    --ant-success-color-deprecated-border: #b7eb8f;
+    --ant-error-color: #ff4d4f;
+    --ant-error-color-hover: #ff7875;
+    --ant-error-color-active: #d9363e;
+    --ant-error-color-outline: rgba(255, 77, 79, 0.2);
+    --ant-error-color-deprecated-bg: #fff2f0;
+    --ant-error-color-deprecated-border: #ffccc7;
+    --ant-warning-color: #faad14;
+    --ant-warning-color-hover: #ffc53d;
+    --ant-warning-color-active: #d48806;
+    --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
+    --ant-warning-color-deprecated-bg: #fffbe6;
+    --ant-warning-color-deprecated-border: #ffe58f;
+    --ant-info-color: #4997E6;
+    --ant-info-color-deprecated-bg: #f0faff;
+    --ant-info-color-deprecated-border: #ccebff;
+  }
+
 .dtl-layout {
     position      : absolute;
     top           : 0;
@@ -86,4 +129,25 @@
     text-align : center;
     padding-top: 20%;
     background : #fff;
-}
+}
+
+.ant-btn {
+    border-radius: 4px;
+    border-color : var(--ant-primary-color);
+    color        : var(--ant-primary-color);
+  
+    &:active {
+      border-color: var(--ant-primary-color-hover);
+      color       : var(--ant-primary-color-hover);
+    }
+  }
+  
+  .ant-btn-primary {
+    color: #fff;
+  }
+
+  .ant-btn-dangerous {  
+    color: var(--ant-error-color);   
+    border-color: var(--ant-error-color);
+    background: #fff;
+  }

package/es/hooks/useDtl/index.js

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["current", "pageSize"];
 import React from "react";
 import { useState, useRef, useCallback, useMemo } from 'react';
-import { PlusOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined } from '@ant-design/icons';
+import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined } from '@ant-design/icons';
 import { showConfirm, showWarn, showError, showSuccess } from '../../utils';
 import { httpPost } from '../../http';
 
@@ -968,7 +968,7 @@ function useDtl(dtlParam) {
         return onAddDtl();
       },
       disabled: btnDisabled('add'),
-      icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
+      icon: /*#__PURE__*/React.createElement(PlusCircleOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() ? /*#__PURE__*/React.createElement(_Button, {
       key: "edit",
       disabled: btnDisabled('edit'),

package/es/hooks/useSingle/index.js

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["current", "pageSize"];
 import React from "react";
 import { useState, useRef, useMemo, useCallback } from 'react';
-import { PlusOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined, CheckOutlined } from '@ant-design/icons';
+import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined, CheckOutlined } from '@ant-design/icons';
 import { showConfirm, showWarn, showSuccess, showError } from '../../utils';
 import { httpPost } from '../../http';
 import usePermission from '../usePermission';
@@ -718,7 +718,7 @@ function useSingle(inParam) {
         return onAdd(null);
       },
       disabled: btnDisabled('add'),
-      icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
+      icon: /*#__PURE__*/React.createElement(PlusCircleOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && checkRight(4) ? /*#__PURE__*/React.createElement(_Button, {
       key: "edit",
       disabled: btnDisabled('edit'),

package/es/index.d.ts

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

package/es/index.js

@@ -4,6 +4,7 @@ import Page404 from './components/404';
 import Loading from './components/Loading';
 import IconSelector from './components/IconSelector';
 import InputMultiLine from './components/InputMultiLine';
+import AreaCascader from './components/AreaCascader';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -12,4 +13,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, InputMultiLine, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, InputMultiLine, AreaCascader, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/lib/components/AreaCascader.d.ts

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

package/lib/components/AreaCascader.js

@@ -0,0 +1,111 @@
+"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"));
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _http = require("../http");
+
+var _utils = require("../utils");
+
+var AreaCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _useState = (0, _react.useState)([]),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      options = _useState2[0],
+      setOptions = _useState2[1];
+
+  var areaRef = (0, _react.useRef)();
+  (0, _react.useImperativeHandle)(ref, function () {
+    return areaRef.current;
+  });
+  (0, _react.useEffect)(function () {
+    initOptions();
+  }, []);
+
+  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)("areaOptions", true);
+
+              if (!(cacheItems && Array.isArray(cacheItems))) {
+                _context.next = 4;
+                break;
+              }
+
+              setOptions(cacheItems);
+              return _context.abrupt("return");
+
+            case 4:
+              api = '/petrel/petrel-location-center-api/sysAdministrativeDivision/allByTree';
+              _context.next = 7;
+              return (0, _http.httpGet)(api, {}, false);
+
+            case 7:
+              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.level;
+                delete item.parentId;
+              });
+              (0, _utils.setCache)('areaOptions', opts, true);
+              setOptions(opts);
+
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function initOptions() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  return /*#__PURE__*/_react.default.createElement(_cascader.default, (0, _extends2.default)({
+    options: options,
+    style: {
+      width: '100%'
+    },
+    changeOnSelect: true,
+    placeholder: "\u8BF7\u9009\u62E9"
+  }, props, {
+    ref: areaRef
+  }));
+});
+
+var _default = AreaCascader;
+exports.default = _default;

package/lib/components/common.less

@@ -1,3 +1,46 @@
+body {
+    --ant-primary-color: #4997E6;
+    --ant-primary-color-hover: #74b7f2;
+    --ant-primary-color-active: #3475bf;
+    --ant-primary-color-outline: rgba(73, 151, 230, 0.2);
+    --ant-primary-1: #f0faff;
+    --ant-primary-2: #f0f9ff;
+    --ant-primary-3: #ccebff;
+    --ant-primary-4: #a3d7ff;
+    --ant-primary-5: #74b7f2;
+    --ant-primary-6: #4997E6;
+    --ant-primary-7: #3475bf;
+    --ant-primary-color-deprecated-pure: #e6f1fc;
+    --ant-primary-color-deprecated-l-35: #e6f1fc;
+    --ant-primary-color-deprecated-l-20: #a3caf2;
+    --ant-primary-color-deprecated-t-20: #6daceb;
+    --ant-primary-color-deprecated-t-50: #a4cbf3;
+    --ant-primary-color-deprecated-f-12: rgba(73, 151, 230, 0.12);
+    --ant-primary-color-active-deprecated-f-30: rgba(240, 250, 255, 0.3);
+    --ant-primary-color-active-deprecated-d-02: #e6f7ff;
+    --ant-success-color: #52c41a;
+    --ant-success-color-hover: #73d13d;
+    --ant-success-color-active: #389e0d;
+    --ant-success-color-outline: rgba(82, 196, 26, 0.2);
+    --ant-success-color-deprecated-bg: #f6ffed;
+    --ant-success-color-deprecated-border: #b7eb8f;
+    --ant-error-color: #ff4d4f;
+    --ant-error-color-hover: #ff7875;
+    --ant-error-color-active: #d9363e;
+    --ant-error-color-outline: rgba(255, 77, 79, 0.2);
+    --ant-error-color-deprecated-bg: #fff2f0;
+    --ant-error-color-deprecated-border: #ffccc7;
+    --ant-warning-color: #faad14;
+    --ant-warning-color-hover: #ffc53d;
+    --ant-warning-color-active: #d48806;
+    --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
+    --ant-warning-color-deprecated-bg: #fffbe6;
+    --ant-warning-color-deprecated-border: #ffe58f;
+    --ant-info-color: #4997E6;
+    --ant-info-color-deprecated-bg: #f0faff;
+    --ant-info-color-deprecated-border: #ccebff;
+  }
+
 .dtl-layout {
     position      : absolute;
     top           : 0;
@@ -86,4 +129,25 @@
     text-align : center;
     padding-top: 20%;
     background : #fff;
-}
+}
+
+.ant-btn {
+    border-radius: 4px;
+    border-color : var(--ant-primary-color);
+    color        : var(--ant-primary-color);
+  
+    &:active {
+      border-color: var(--ant-primary-color-hover);
+      color       : var(--ant-primary-color-hover);
+    }
+  }
+  
+  .ant-btn-primary {
+    color: #fff;
+  }
+
+  .ant-btn-dangerous {  
+    color: var(--ant-error-color);   
+    border-color: var(--ant-error-color);
+    background: #fff;
+  }

package/lib/hooks/useDtl/index.js

@@ -989,7 +989,7 @@ function useDtl(dtlParam) {
         return onAddDtl();
       },
       disabled: btnDisabled('add'),
-      icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
+      icon: /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
       disabled: btnDisabled('edit'),

package/lib/hooks/useSingle/index.js

@@ -739,7 +739,7 @@ function useSingle(inParam) {
         return onAdd(null);
       },
       disabled: btnDisabled('add'),
-      icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null)
+      icon: /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && checkRight(4) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
       disabled: btnDisabled('edit'),

package/lib/index.d.ts

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

package/lib/index.js

@@ -7,6 +7,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "AreaCascader", {
+  enumerable: true,
+  get: function get() {
+    return _AreaCascader.default;
+  }
+});
 Object.defineProperty(exports, "BaseService", {
   enumerable: true,
   get: function get() {
@@ -123,6 +129,8 @@ var _IconSelector = _interopRequireDefault(require("./components/IconSelector"))
 
 var _InputMultiLine = _interopRequireDefault(require("./components/InputMultiLine"));
 
+var _AreaCascader = _interopRequireDefault(require("./components/AreaCascader"));
+
 var _BaseService = _interopRequireDefault(require("./service/BaseService"));
 
 var _http = _interopRequireWildcard(require("./http"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.43",
+  "version": "1.0.46",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.34",
+    "ls-pro-table": "2.62.35",
     "ls-pro-form": "1.52.27",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",