ls-pro-common 3.0.2 → 3.0.4

package/es/components/DtlLayout.js

@@ -4,9 +4,10 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
-import { SaveOutlined, AuditOutlined, ArrowLeftOutlined } from '@ant-design/icons';
+import { SaveOutlined, AuditOutlined } from '@ant-design/icons';
 import './common.less';
 import usePermission from '../hooks/usePermission';
+import IconBack from './IconBack';
 function DtlLayout(props) {
   var title = props.title,
     _props$keyField = props.keyField,
@@ -56,7 +57,7 @@ function DtlLayout(props) {
       onClick: function onClick() {
         return props.onExit(false);
       },
-      icon: /*#__PURE__*/React.createElement(ArrowLeftOutlined, null)
+      icon: /*#__PURE__*/React.createElement(IconBack, null)
     }, btnExitText);
     var btnList = [back];
     // 有新增或更改权限且未审核，开放出保存按钮

package/es/components/IconBell.js

@@ -9,8 +9,8 @@ var Svg = function Svg() {
     fill: "currentColor",
     xmlns: "http://www.w3.org/2000/svg"
   }, /*#__PURE__*/React.createElement("path", {
-    "fill-rule": "evenodd",
-    "clip-rule": "evenodd",
+    fillRule: "evenodd",
+    clipRule: "evenodd",
     d: "M9 0C5.41015 0 2.5 2.91015 2.5 6.5V11C1.39543 11 0.5 11.8954 0.5 13C0.5 14.1046 1.39543 15 2.5 15H5.53544C5.77806 16.6961 7.23676 18 9 18C10.7632 18 12.2219 16.6961 12.4646 15H15.5C16.6046 15 17.5 14.1046 17.5 13C17.5 11.8954 16.6046 11 15.5 11V6.5C15.5 2.91015 12.5899 0 9 0ZM3.5 6.5C3.5 3.46243 5.96243 1 9 1C12.0376 1 14.5 3.46243 14.5 6.5V12H15.5C16.0523 12 16.5 12.4477 16.5 13C16.5 13.5523 16.0523 14 15.5 14H2.5C1.94772 14 1.5 13.5523 1.5 13C1.5 12.4477 1.94772 12 2.5 12H3.5V6.5ZM11.45 15H6.55001C6.78164 16.1411 7.79052 17 9 17C10.2095 17 11.2184 16.1411 11.45 15Z"
   }));
 };

package/es/components/IconQuestion.js

@@ -13,8 +13,8 @@ var Svg = function Svg() {
   }), /*#__PURE__*/React.createElement("path", {
     d: "M8.928 13C9.132 13 9.3 12.928 9.444 12.796C9.588 12.664 9.66 12.496 9.66 12.28C9.66 12.076 9.588 11.908 9.456 11.776C9.312 11.632 9.132 11.572 8.928 11.572C8.724 11.572 8.556 11.632 8.412 11.776C8.268 11.908 8.208 12.076 8.208 12.28C8.208 12.484 8.268 12.652 8.412 12.796C8.556 12.928 8.724 13 8.928 13Z"
   }), /*#__PURE__*/React.createElement("path", {
-    "fill-rule": "evenodd",
-    "clip-rule": "evenodd",
+    fillRule: "evenodd",
+    clipRule: "evenodd",
     d: "M9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0ZM1 9C1 4.58172 4.58172 1 9 1C13.4183 1 17 4.58172 17 9C17 13.4183 13.4183 17 9 17C4.58172 17 1 13.4183 1 9Z"
   }));
 };

package/es/components/IconSearch.js

@@ -9,8 +9,8 @@ var Svg = function Svg() {
     fill: "currentColor",
     xmlns: "http://www.w3.org/2000/svg"
   }, /*#__PURE__*/React.createElement("path", {
-    "fill-rule": "evenodd",
-    "clip-rule": "evenodd",
+    fillRule: "evenodd",
+    clipRule: "evenodd",
     d: "M3.62502 1.42221C0.516115 3.21714 -0.549073 7.19248 1.24585 10.3014C2.95672 13.2647 6.64857 14.3712 9.68286 12.914C9.6858 12.9195 9.68885 12.9251 9.69202 12.9305L11.692 16.3946C11.8301 16.6338 12.1359 16.7157 12.375 16.5777C12.6142 16.4396 12.6961 16.1338 12.558 15.8946L10.558 12.4305C10.5549 12.4251 10.5516 12.4197 10.5483 12.4143C13.3274 10.5152 14.215 6.76468 12.5042 3.80138C10.7093 0.692476 6.73392 -0.372712 3.62502 1.42221ZM2.11188 9.80138C0.593094 7.17077 1.49441 3.80702 4.12502 2.28824C6.75563 0.769455 10.1194 1.67077 11.6382 4.30138C13.1569 6.93199 12.2556 10.2957 9.62502 11.8145C6.99441 13.3333 3.63066 12.432 2.11188 9.80138Z"
   }));
 };

package/es/components/ImageSelector.d.ts

@@ -16,10 +16,16 @@ export declare type ImageSelectorProps = ProFormItemProps<InputProps> & {
      * @name 最大值, 默认2M
      */
     maxSize?: number;
+    /**弹框的属性 */
     modalProps?: ModalProps;
+    /**是否输入框模式 */
     isInput?: boolean;
+    /**非输入框模式上传提示语 默认为：支持 png | jpg | gif 格式图片 */
     desc?: string;
+    /** 非输入框模式下 展示图片class */
     imageClass?: string;
+    /** 一次最多选择多少张图片 默认为 1 */
+    maxCount?: number;
 };
 declare function ImageSelector(prop: ImageSelectorProps): JSX.Element;
 export default ImageSelector;

package/es/components/ImageSelector.js

@@ -16,7 +16,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 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 = ["type", "uploadable", "readonly", "allowClear", "title", "modalWidth", "name", "maxSize", "modalProps", "code", "isInput", "desc", "imageClass"];
+var _excluded = ["type", "uploadable", "readonly", "allowClear", "title", "modalWidth", "name", "maxSize", "modalProps", "code", "isInput", "desc", "imageClass", "maxCount"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from "react";
 import { useMemo, useState, useEffect, useContext, useRef } from 'react';
@@ -74,6 +74,8 @@ function ImageSelector(prop) {
     desc = _prop$desc === void 0 ? '支持 png | jpg | gif 格式图片' : _prop$desc,
     _prop$imageClass = prop.imageClass,
     imageClass = _prop$imageClass === void 0 ? '' : _prop$imageClass,
+    _prop$maxCount = prop.maxCount,
+    maxCount = _prop$maxCount === void 0 ? 1 : _prop$maxCount,
     rest = _objectWithoutProperties(prop, _excluded);
   // 上传地址
   var uploadImgApi = useMemo(function () {
@@ -87,6 +89,10 @@ function ImageSelector(prop) {
   var showImgApi = useMemo(function () {
     return fileCenter + 'show/' + code;
   }, [code]);
+  var _useState11 = useState([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    selectedUrl = _useState12[0],
+    setSelectedUrl = _useState12[1];
   var loadData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(keys) {
       var _result$data, _result$data2;
@@ -143,8 +149,14 @@ function ImageSelector(prop) {
   }, [visible, searchKey]);
   useEffect(function () {
     var val = formRef.current.getFieldsValue();
-    if (val && val[name]) {
-      setImgUrl(val[name]);
+    var url = val === null || val === void 0 ? void 0 : val[name];
+    if (!url) {
+      url = formRef.current.getFieldValue(name);
+    }
+    if (url) {
+      var urls = url.toString().split(',');
+      setImgUrl(urls[0]);
+      setSelectedUrl(urls);
     }
   }, []);
   // 验证上传文件大小
@@ -208,6 +220,28 @@ function ImageSelector(prop) {
       }
     } catch (e) {}
   }, [imgUrl]);
+  var toggleSelectImage = function toggleSelectImage(url) {
+    if (selectedUrl.includes(url)) {
+      setSelectedUrl(function (val) {
+        return val.filter(function (o) {
+          return o !== url;
+        });
+      });
+    } else if (selectedUrl.length < maxCount && maxCount > 1) {
+      setSelectedUrl([].concat(_toConsumableArray(selectedUrl), [url]));
+    } else if (maxCount === 1) {
+      setSelectedUrl([url]);
+    }
+  };
+  var confirmImage = function confirmImage() {
+    var formVal = formRef.current.getFieldsValue();
+    var val = _objectSpread({}, formVal);
+    //@ts-ignore
+    val[name] = selectedUrl.join(',');
+    formRef.current.setFieldsValue(val);
+    setImgUrl(selectedUrl.join(','));
+    setVisible(false);
+  };
   var clearValue = function clearValue(e) {
     if (!e || !e.target.value) {
       var _formRef$current;
@@ -225,7 +259,7 @@ function ImageSelector(prop) {
         maxWidth: 22,
         maxHeight: 22
       },
-      src: imgUrl,
+      src: (imgUrl || '').split(',')[0],
       onClick: function onClick() {
         return showSelect();
       }
@@ -259,7 +293,7 @@ function ImageSelector(prop) {
     className: "img-wrapper"
   }, /*#__PURE__*/React.createElement("img", {
     className: "img-preview ".concat(imageClass),
-    src: imgUrl
+    src: (imgUrl || '').split(',')[0]
   }), (rest === null || rest === void 0 ? void 0 : rest.disabled) !== true && (rest === null || rest === void 0 ? void 0 : (_rest$fieldProps3 = rest.fieldProps) === null || _rest$fieldProps3 === void 0 ? void 0 : _rest$fieldProps3.disabled) !== true && /*#__PURE__*/React.createElement("div", {
     className: "clear-btn"
   }, /*#__PURE__*/React.createElement(CloseOutlined, {
@@ -330,11 +364,19 @@ function ImageSelector(prop) {
       onClick: function onClick() {
         return loadData(searchKey);
       }
-    }, nextMarker ? '加载更多' : '刷新')),
-    getContainer: false
+    }, nextMarker ? '加载更多' : '刷新'), maxCount > 1 && /*#__PURE__*/React.createElement(_Button, {
+      onClick: confirmImage
+    }, "\u786E\u8BA4")),
+    getContainer: function getContainer() {
+      return document.body;
+    }
   }, modalProps), /*#__PURE__*/React.createElement("div", {
     style: {
-      minHeight: '120px'
+      minHeight: '120px',
+      display: 'flex',
+      marginLeft: 16,
+      gap: 16,
+      flexWrap: 'wrap'
     }
   }, list.map(function (o) {
     return /*#__PURE__*/React.createElement(_Card, {
@@ -342,9 +384,8 @@ function ImageSelector(prop) {
       style: {
         width: '125px',
         height: '130px',
-        display: 'inline-block',
-        margin: '10px',
-        verticalAlign: 'middle'
+        verticalAlign: 'middle',
+        background: selectedUrl.includes(o.url) ? '#efefef' : '#fff'
       },
       bodyStyle: {
         padding: '15px 8px',
@@ -361,8 +402,12 @@ function ImageSelector(prop) {
         val[name] = o.url;
         formRef.current.setFieldsValue(val);
         setImgUrl(o.url);
+        setSelectedUrl([o.url]);
         setVisible(false);
       },
+      onClick: function onClick() {
+        toggleSelectImage(o.url);
+      },
       key: o.path
     }, /*#__PURE__*/React.createElement("div", {
       style: {
@@ -374,7 +419,7 @@ function ImageSelector(prop) {
         maxWidth: '80px',
         maxHeight: '80px'
       },
-      src: showImgApi + '?fileName=' + o.path
+      src: o.url
     })), /*#__PURE__*/React.createElement("div", {
       style: {
         whiteSpace: 'nowrap',

package/es/components/antd-custom.less

@@ -34,8 +34,11 @@
 }
 
 .ant-modal-content {
-  border-radius   : 8px !important;
-  // box-shadow   : 0px 4px 6px rgba(0, 0, 0, 0.05) !important;
+  border-radius: 8px !important;
+
+  .ant-modal-header {
+    border-radius: 8px 8px 0 0 !important;
+  }
 }
 
 .ant-input-number,
@@ -45,6 +48,11 @@
   border-radius: 4px !important;
 }
 
+.ant-input-group .ant-input-affix-wrapper:not(:last-child) {
+  border-top-right-radius   : 0 !important;
+  border-bottom-right-radius: 0 !important;
+}
+
 .ant-picker-range-separator {
   padding: 0 2px !important;
 
@@ -58,7 +66,7 @@
   height          : 32px;
   background-color: #E6F4FF;
   border-color    : transparent;
-  color           : #595959;
+  color           : var(--ant-primary-color);
   border-radius   : 4px;
 
   &.ant-btn-lg {
@@ -67,15 +75,15 @@
 
   &:hover,
   &:focus {
-    background-color: #E6F4FF;
+    background-color: #B5DBFF;
     border-color    : transparent;
-    color           : #000;
+    color           : var(--ant-primary-color);
   }
 
   &:active {
     background-color: #BDDFFF;
     border-color    : transparent;
-    color           : #141414;
+    color           :  var(--ant-primary-color);
   }
 
   &[disabled],
@@ -88,8 +96,6 @@
   }
 }
 
-
-
 .ant-btn-primary {
   background-color: var(--ant-primary-color);
   border-color    : transparent;
@@ -210,4 +216,9 @@
   &[disabled]:active {
     color: #d9d9d9;
   }
+}
+
+.ant-checkbox-checked::after {
+  animation          : none !important;
+  animation-fill-mode: none !important;
 }

package/es/components/common.less

@@ -88,11 +88,11 @@ body {
 }
 
 * ::-webkit-scrollbar-thumb {
-  background-color: rgba(101, 100, 99, 0.5);
+  background-color: #EFF2F4;
   border-radius   : 6px;
 
   &:hover {
-    background-color: rgba(101, 100, 99, 0.8);
+    background-color: #E4E7EA;
     border-radius   : 6px;
   }
 }

package/es/utils/index.d.ts

@@ -248,3 +248,4 @@ export declare const openPageInMain: (option: {
 }) => void;
 export declare const showLoading: (text?: string) => void;
 export declare const exitLoading: () => void;
+export declare const handleTheme: () => void;

package/es/utils/index.js

@@ -662,4 +662,10 @@ export var exitLoading = function exitLoading() {
     var _loading$parentNode;
     (_loading$parentNode = loading.parentNode) === null || _loading$parentNode === void 0 ? void 0 : _loading$parentNode.removeChild(loading);
   }
+};
+export var handleTheme = function handleTheme() {
+  var theme = getCache('theme');
+  if (theme) {
+    document.body.classList.add('theme-' + theme);
+  }
 };

package/lib/components/DtlLayout.js

@@ -15,6 +15,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _icons = require("@ant-design/icons");
 require("./common.less");
 var _usePermission2 = _interopRequireDefault(require("../hooks/usePermission"));
+var _IconBack = _interopRequireDefault(require("./IconBack"));
 function DtlLayout(props) {
   var title = props.title,
     _props$keyField = props.keyField,
@@ -64,7 +65,7 @@ function DtlLayout(props) {
       onClick: function onClick() {
         return props.onExit(false);
       },
-      icon: /*#__PURE__*/_react.default.createElement(_icons.ArrowLeftOutlined, null)
+      icon: /*#__PURE__*/_react.default.createElement(_IconBack.default, null)
     }, btnExitText);
     var btnList = [back];
     // 有新增或更改权限且未审核，开放出保存按钮

package/lib/components/IconBell.js

@@ -16,8 +16,8 @@ var Svg = function Svg() {
     fill: "currentColor",
     xmlns: "http://www.w3.org/2000/svg"
   }, /*#__PURE__*/_react.default.createElement("path", {
-    "fill-rule": "evenodd",
-    "clip-rule": "evenodd",
+    fillRule: "evenodd",
+    clipRule: "evenodd",
     d: "M9 0C5.41015 0 2.5 2.91015 2.5 6.5V11C1.39543 11 0.5 11.8954 0.5 13C0.5 14.1046 1.39543 15 2.5 15H5.53544C5.77806 16.6961 7.23676 18 9 18C10.7632 18 12.2219 16.6961 12.4646 15H15.5C16.6046 15 17.5 14.1046 17.5 13C17.5 11.8954 16.6046 11 15.5 11V6.5C15.5 2.91015 12.5899 0 9 0ZM3.5 6.5C3.5 3.46243 5.96243 1 9 1C12.0376 1 14.5 3.46243 14.5 6.5V12H15.5C16.0523 12 16.5 12.4477 16.5 13C16.5 13.5523 16.0523 14 15.5 14H2.5C1.94772 14 1.5 13.5523 1.5 13C1.5 12.4477 1.94772 12 2.5 12H3.5V6.5ZM11.45 15H6.55001C6.78164 16.1411 7.79052 17 9 17C10.2095 17 11.2184 16.1411 11.45 15Z"
   }));
 };

package/lib/components/IconQuestion.js

@@ -20,8 +20,8 @@ var Svg = function Svg() {
   }), /*#__PURE__*/_react.default.createElement("path", {
     d: "M8.928 13C9.132 13 9.3 12.928 9.444 12.796C9.588 12.664 9.66 12.496 9.66 12.28C9.66 12.076 9.588 11.908 9.456 11.776C9.312 11.632 9.132 11.572 8.928 11.572C8.724 11.572 8.556 11.632 8.412 11.776C8.268 11.908 8.208 12.076 8.208 12.28C8.208 12.484 8.268 12.652 8.412 12.796C8.556 12.928 8.724 13 8.928 13Z"
   }), /*#__PURE__*/_react.default.createElement("path", {
-    "fill-rule": "evenodd",
-    "clip-rule": "evenodd",
+    fillRule: "evenodd",
+    clipRule: "evenodd",
     d: "M9 0C4.02944 0 0 4.02944 0 9C0 13.9706 4.02944 18 9 18C13.9706 18 18 13.9706 18 9C18 4.02944 13.9706 0 9 0ZM1 9C1 4.58172 4.58172 1 9 1C13.4183 1 17 4.58172 17 9C17 13.4183 13.4183 17 9 17C4.58172 17 1 13.4183 1 9Z"
   }));
 };

package/lib/components/IconSearch.js

@@ -16,8 +16,8 @@ var Svg = function Svg() {
     fill: "currentColor",
     xmlns: "http://www.w3.org/2000/svg"
   }, /*#__PURE__*/_react.default.createElement("path", {
-    "fill-rule": "evenodd",
-    "clip-rule": "evenodd",
+    fillRule: "evenodd",
+    clipRule: "evenodd",
     d: "M3.62502 1.42221C0.516115 3.21714 -0.549073 7.19248 1.24585 10.3014C2.95672 13.2647 6.64857 14.3712 9.68286 12.914C9.6858 12.9195 9.68885 12.9251 9.69202 12.9305L11.692 16.3946C11.8301 16.6338 12.1359 16.7157 12.375 16.5777C12.6142 16.4396 12.6961 16.1338 12.558 15.8946L10.558 12.4305C10.5549 12.4251 10.5516 12.4197 10.5483 12.4143C13.3274 10.5152 14.215 6.76468 12.5042 3.80138C10.7093 0.692476 6.73392 -0.372712 3.62502 1.42221ZM2.11188 9.80138C0.593094 7.17077 1.49441 3.80702 4.12502 2.28824C6.75563 0.769455 10.1194 1.67077 11.6382 4.30138C13.1569 6.93199 12.2556 10.2957 9.62502 11.8145C6.99441 13.3333 3.63066 12.432 2.11188 9.80138Z"
   }));
 };

package/lib/components/ImageSelector.d.ts

@@ -16,10 +16,16 @@ export declare type ImageSelectorProps = ProFormItemProps<InputProps> & {
      * @name 最大值, 默认2M
      */
     maxSize?: number;
+    /**弹框的属性 */
     modalProps?: ModalProps;
+    /**是否输入框模式 */
     isInput?: boolean;
+    /**非输入框模式上传提示语 默认为：支持 png | jpg | gif 格式图片 */
     desc?: string;
+    /** 非输入框模式下 展示图片class */
     imageClass?: string;
+    /** 一次最多选择多少张图片 默认为 1 */
+    maxCount?: number;
 };
 declare function ImageSelector(prop: ImageSelectorProps): JSX.Element;
 export default ImageSelector;

package/lib/components/ImageSelector.js

@@ -30,7 +30,7 @@ var _lsProForm = require("ls-pro-form");
 var _icons = require("@ant-design/icons");
 var _http = require("../http");
 var _utils = require("../utils");
-var _excluded = ["type", "uploadable", "readonly", "allowClear", "title", "modalWidth", "name", "maxSize", "modalProps", "code", "isInput", "desc", "imageClass"];
+var _excluded = ["type", "uploadable", "readonly", "allowClear", "title", "modalWidth", "name", "maxSize", "modalProps", "code", "isInput", "desc", "imageClass", "maxCount"];
 var fileCenter = (0, _utils.getCache)('ossPath') || '/petrel/petrel-file-center-api/lesoon/oss/file/';
 function ImageSelector(prop) {
   var _rest$fieldProps3;
@@ -81,6 +81,8 @@ function ImageSelector(prop) {
     desc = _prop$desc === void 0 ? '支持 png | jpg | gif 格式图片' : _prop$desc,
     _prop$imageClass = prop.imageClass,
     imageClass = _prop$imageClass === void 0 ? '' : _prop$imageClass,
+    _prop$maxCount = prop.maxCount,
+    maxCount = _prop$maxCount === void 0 ? 1 : _prop$maxCount,
     rest = (0, _objectWithoutProperties2.default)(prop, _excluded);
   // 上传地址
   var uploadImgApi = (0, _react.useMemo)(function () {
@@ -94,6 +96,10 @@ function ImageSelector(prop) {
   var showImgApi = (0, _react.useMemo)(function () {
     return fileCenter + 'show/' + code;
   }, [code]);
+  var _useState11 = (0, _react.useState)([]),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    selectedUrl = _useState12[0],
+    setSelectedUrl = _useState12[1];
   var loadData = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(keys) {
       var _result$data, _result$data2;
@@ -150,8 +156,14 @@ function ImageSelector(prop) {
   }, [visible, searchKey]);
   (0, _react.useEffect)(function () {
     var val = formRef.current.getFieldsValue();
-    if (val && val[name]) {
-      setImgUrl(val[name]);
+    var url = val === null || val === void 0 ? void 0 : val[name];
+    if (!url) {
+      url = formRef.current.getFieldValue(name);
+    }
+    if (url) {
+      var urls = url.toString().split(',');
+      setImgUrl(urls[0]);
+      setSelectedUrl(urls);
     }
   }, []);
   // 验证上传文件大小
@@ -215,6 +227,28 @@ function ImageSelector(prop) {
       }
     } catch (e) {}
   }, [imgUrl]);
+  var toggleSelectImage = function toggleSelectImage(url) {
+    if (selectedUrl.includes(url)) {
+      setSelectedUrl(function (val) {
+        return val.filter(function (o) {
+          return o !== url;
+        });
+      });
+    } else if (selectedUrl.length < maxCount && maxCount > 1) {
+      setSelectedUrl([].concat((0, _toConsumableArray2.default)(selectedUrl), [url]));
+    } else if (maxCount === 1) {
+      setSelectedUrl([url]);
+    }
+  };
+  var confirmImage = function confirmImage() {
+    var formVal = formRef.current.getFieldsValue();
+    var val = (0, _objectSpread2.default)({}, formVal);
+    //@ts-ignore
+    val[name] = selectedUrl.join(',');
+    formRef.current.setFieldsValue(val);
+    setImgUrl(selectedUrl.join(','));
+    setVisible(false);
+  };
   var clearValue = function clearValue(e) {
     if (!e || !e.target.value) {
       var _formRef$current;
@@ -232,7 +266,7 @@ function ImageSelector(prop) {
         maxWidth: 22,
         maxHeight: 22
       },
-      src: imgUrl,
+      src: (imgUrl || '').split(',')[0],
       onClick: function onClick() {
         return showSelect();
       }
@@ -266,7 +300,7 @@ function ImageSelector(prop) {
     className: "img-wrapper"
   }, /*#__PURE__*/_react.default.createElement("img", {
     className: "img-preview ".concat(imageClass),
-    src: imgUrl
+    src: (imgUrl || '').split(',')[0]
   }), (rest === null || rest === void 0 ? void 0 : rest.disabled) !== true && (rest === null || rest === void 0 ? void 0 : (_rest$fieldProps3 = rest.fieldProps) === null || _rest$fieldProps3 === void 0 ? void 0 : _rest$fieldProps3.disabled) !== true && /*#__PURE__*/_react.default.createElement("div", {
     className: "clear-btn"
   }, /*#__PURE__*/_react.default.createElement(_icons.CloseOutlined, {
@@ -337,11 +371,19 @@ function ImageSelector(prop) {
       onClick: function onClick() {
         return loadData(searchKey);
       }
-    }, nextMarker ? '加载更多' : '刷新')),
-    getContainer: false
+    }, nextMarker ? '加载更多' : '刷新'), maxCount > 1 && /*#__PURE__*/_react.default.createElement(_button.default, {
+      onClick: confirmImage
+    }, "\u786E\u8BA4")),
+    getContainer: function getContainer() {
+      return document.body;
+    }
   }, modalProps), /*#__PURE__*/_react.default.createElement("div", {
     style: {
-      minHeight: '120px'
+      minHeight: '120px',
+      display: 'flex',
+      marginLeft: 16,
+      gap: 16,
+      flexWrap: 'wrap'
     }
   }, list.map(function (o) {
     return /*#__PURE__*/_react.default.createElement(_card.default, {
@@ -349,9 +391,8 @@ function ImageSelector(prop) {
       style: {
         width: '125px',
         height: '130px',
-        display: 'inline-block',
-        margin: '10px',
-        verticalAlign: 'middle'
+        verticalAlign: 'middle',
+        background: selectedUrl.includes(o.url) ? '#efefef' : '#fff'
       },
       bodyStyle: {
         padding: '15px 8px',
@@ -368,8 +409,12 @@ function ImageSelector(prop) {
         val[name] = o.url;
         formRef.current.setFieldsValue(val);
         setImgUrl(o.url);
+        setSelectedUrl([o.url]);
         setVisible(false);
       },
+      onClick: function onClick() {
+        toggleSelectImage(o.url);
+      },
       key: o.path
     }, /*#__PURE__*/_react.default.createElement("div", {
       style: {
@@ -381,7 +426,7 @@ function ImageSelector(prop) {
         maxWidth: '80px',
         maxHeight: '80px'
       },
-      src: showImgApi + '?fileName=' + o.path
+      src: o.url
     })), /*#__PURE__*/_react.default.createElement("div", {
       style: {
         whiteSpace: 'nowrap',

package/lib/components/antd-custom.less

@@ -34,8 +34,11 @@
 }
 
 .ant-modal-content {
-  border-radius   : 8px !important;
-  // box-shadow   : 0px 4px 6px rgba(0, 0, 0, 0.05) !important;
+  border-radius: 8px !important;
+
+  .ant-modal-header {
+    border-radius: 8px 8px 0 0 !important;
+  }
 }
 
 .ant-input-number,
@@ -45,6 +48,11 @@
   border-radius: 4px !important;
 }
 
+.ant-input-group .ant-input-affix-wrapper:not(:last-child) {
+  border-top-right-radius   : 0 !important;
+  border-bottom-right-radius: 0 !important;
+}
+
 .ant-picker-range-separator {
   padding: 0 2px !important;
 
@@ -58,7 +66,7 @@
   height          : 32px;
   background-color: #E6F4FF;
   border-color    : transparent;
-  color           : #595959;
+  color           : var(--ant-primary-color);
   border-radius   : 4px;
 
   &.ant-btn-lg {
@@ -67,15 +75,15 @@
 
   &:hover,
   &:focus {
-    background-color: #E6F4FF;
+    background-color: #B5DBFF;
     border-color    : transparent;
-    color           : #000;
+    color           : var(--ant-primary-color);
   }
 
   &:active {
     background-color: #BDDFFF;
     border-color    : transparent;
-    color           : #141414;
+    color           :  var(--ant-primary-color);
   }
 
   &[disabled],
@@ -88,8 +96,6 @@
   }
 }
 
-
-
 .ant-btn-primary {
   background-color: var(--ant-primary-color);
   border-color    : transparent;
@@ -210,4 +216,9 @@
   &[disabled]:active {
     color: #d9d9d9;
   }
+}
+
+.ant-checkbox-checked::after {
+  animation          : none !important;
+  animation-fill-mode: none !important;
 }

package/lib/components/common.less

@@ -88,11 +88,11 @@ body {
 }
 
 * ::-webkit-scrollbar-thumb {
-  background-color: rgba(101, 100, 99, 0.5);
+  background-color: #EFF2F4;
   border-radius   : 6px;
 
   &:hover {
-    background-color: rgba(101, 100, 99, 0.8);
+    background-color: #E4E7EA;
     border-radius   : 6px;
   }
 }

package/lib/utils/index.d.ts

@@ -248,3 +248,4 @@ export declare const openPageInMain: (option: {
 }) => void;
 export declare const showLoading: (text?: string) => void;
 export declare const exitLoading: () => void;
+export declare const handleTheme: () => void;

package/lib/utils/index.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "getUrlQuery", {
     return _lsProTable.getUrlQuery;
   }
 });
-exports.setTitle = exports.setCookie = exports.setCache = exports.reLogin = exports.rangeToSearch = exports.printView = exports.printAsync = exports.openPageInMain = exports.on = exports.off = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.httpError = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
+exports.setTitle = exports.setCookie = exports.setCache = exports.reLogin = exports.rangeToSearch = exports.printView = exports.printAsync = exports.openPageInMain = exports.on = exports.off = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.httpError = exports.handleTheme = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
 Object.defineProperty(exports, "setUrlQuery", {
   enumerable: true,
   get: function get() {
@@ -757,4 +757,11 @@ var exitLoading = function exitLoading() {
     (_loading$parentNode = loading.parentNode) === null || _loading$parentNode === void 0 ? void 0 : _loading$parentNode.removeChild(loading);
   }
 };
-exports.exitLoading = exitLoading;
+exports.exitLoading = exitLoading;
+var handleTheme = function handleTheme() {
+  var theme = getCache('theme');
+  if (theme) {
+    document.body.classList.add('theme-' + theme);
+  }
+};
+exports.handleTheme = handleTheme;