ls-pro-common 1.0.26 → 1.0.29

package/es/components/DtlLayout.d.ts

@@ -10,6 +10,8 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     renderButton?: (defaultBtn: JSX.Element[]) => JSX.Element[];
     /** 审核方法 */
     onAudit?: () => void;
+    /**按钮状态 */
+    btnStatus?: (btnKey: string) => boolean | void;
     /** 保存按钮文本 */
     btnSaveText?: string;
     /** 返回按钮文本 */

package/es/components/DtlLayout.js

@@ -20,7 +20,8 @@ function DtlLayout(props) {
       _props$btnSaveText = props.btnSaveText,
       btnSaveText = _props$btnSaveText === void 0 ? '保存' : _props$btnSaveText,
       _props$btnExitText = props.btnExitText,
-      btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText;
+      btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText,
+      btnStatus = props.btnStatus;
   var dtlTitle = useMemo(function () {
     if (title) return title;
     if (!masterObject) return '';
@@ -38,6 +39,7 @@ function DtlLayout(props) {
 
         formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
       },
+      disabled: btnStatus ? btnStatus('btnSave') || false : false,
       icon: /*#__PURE__*/React.createElement(SaveOutlined, null)
     }, btnSaveText), /*#__PURE__*/React.createElement(_Button, {
       key: "btnBack",
@@ -50,6 +52,11 @@ function DtlLayout(props) {
     if (props.onAudit) {
       b.unshift( /*#__PURE__*/React.createElement(_Button, {
         key: "btnAudit",
+        disabled: btnStatus ? btnStatus('btnAudit') || false : false,
+        onClick: function onClick() {
+          if (!props.onAudit) return;
+          props.onAudit();
+        },
         icon: /*#__PURE__*/React.createElement(CheckOutlined, null)
       }, "\u5BA1\u6838"));
     }

package/es/components/IconSelector.d.ts

@@ -0,0 +1,19 @@
+/// <reference types="react" />
+import type { InputProps } from 'antd';
+import type { ProFormItemProps } from 'ls-pro-form';
+export declare type IconSelectorProps = ProFormItemProps<InputProps> & {
+    /** @name 图标类型 */
+    type: string;
+    /** @name 是否可上传，默认可上传 */
+    uploadable?: boolean;
+    /** @name 弹框title */
+    title?: string;
+    /** @name 弹框宽度 */
+    modalWidth?: string;
+    /**
+     * @name 最大值, 默认2M
+     */
+    maxSize?: number;
+};
+declare function IconSelector(prop: IconSelectorProps): JSX.Element;
+export default IconSelector;

package/es/components/IconSelector.js

@@ -0,0 +1,293 @@
+import "antd/es/modal/style";
+import _Modal from "antd/es/modal";
+import "antd/es/card/style";
+import _Card from "antd/es/card";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/upload/style";
+import _Upload from "antd/es/upload";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import _extends from "@babel/runtime/helpers/esm/extends";
+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 = ["type", "uploadable", "readonly", "allowClear", "title", "modalWidth", "name", "maxSize"];
+import React from "react";
+import { useMemo, useState, useEffect, useContext } from 'react';
+import { ProFormText, ProFormContext } from 'ls-pro-form';
+import { PlusOutlined, UploadOutlined } from '@ant-design/icons';
+import { httpGet, httpPost } from '../http';
+import { getCache, toGatewayUrl, showError, showWarn, showSuccess } from '../utils';
+var fileCenter = getCache('file-center-api') || '/zuul/petrel-file-center-api/';
+var pageSize = 16;
+
+function IconSelector(prop) {
+  //@ts-ignore?
+  var _useContext = useContext(ProFormContext),
+      formRef = _useContext.formRef;
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _useState3 = useState(''),
+      _useState4 = _slicedToArray(_useState3, 2),
+      imgUrl = _useState4[0],
+      setImgUrl = _useState4[1];
+
+  var _useState5 = useState(1),
+      _useState6 = _slicedToArray(_useState5, 2),
+      page = _useState6[0],
+      setPage = _useState6[1];
+
+  var _useState7 = useState(0),
+      _useState8 = _slicedToArray(_useState7, 2),
+      total = _useState8[0],
+      setTotal = _useState8[1];
+
+  var _useState9 = useState([]),
+      _useState10 = _slicedToArray(_useState9, 2),
+      list = _useState10[0],
+      setList = _useState10[1];
+
+  var type = prop.type,
+      _prop$uploadable = prop.uploadable,
+      uploadable = _prop$uploadable === void 0 ? true : _prop$uploadable,
+      _prop$readonly = prop.readonly,
+      readonly = _prop$readonly === void 0 ? true : _prop$readonly,
+      allowClear = prop.allowClear,
+      _prop$title = prop.title,
+      title = _prop$title === void 0 ? "选择图标" : _prop$title,
+      _prop$modalWidth = prop.modalWidth,
+      modalWidth = _prop$modalWidth === void 0 ? '600px' : _prop$modalWidth,
+      name = prop.name,
+      _prop$maxSize = prop.maxSize,
+      maxSize = _prop$maxSize === void 0 ? 2 : _prop$maxSize,
+      rest = _objectWithoutProperties(prop, _excluded);
+
+  var uploadImgApi = useMemo(function () {
+    return toGatewayUrl(fileCenter + 'file/upload/' + type);
+  }, [type]);
+  var showImgApi = useMemo(function () {
+    return fileCenter + 'file/show/' + type;
+  }, [type]);
+
+  var loadData = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(pageIndex) {
+      var url, param, result, rows;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              url = "/petrel-itg-api/sysMongo/page";
+              param = {
+                "search.status": 1,
+                "search.collectName": type,
+                "page.pn": pageIndex,
+                "page.size": pageSize
+              };
+              _context.next = 4;
+              return httpGet(url, param);
+
+            case 4:
+              result = _context.sent;
+              rows = result.rows || [];
+              setList(rows);
+              setTotal(result.total || 0);
+
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function loadData(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  useEffect(function () {
+    if (!visible) return;
+    loadData(page);
+  }, [visible, page]);
+  var totalPage = useMemo(function () {
+    if (total === 0) return 1;
+    return Math.ceil(total / pageSize);
+  }, [total]); // 验证上传文件大小
+
+  var beforeUpload = function beforeUpload(file) {
+    var sizeLimit = file.size / 1024 / 1024 >= maxSize;
+
+    if (sizeLimit) {
+      showError("\u4E0A\u4F20\u7684\u6587\u4EF6\u4E0D\u80FD\u5927\u4E8E".concat(maxSize, "M"));
+    }
+
+    return !sizeLimit;
+  }; // 上传图片并调用 sysMongo 接口保存
+
+
+  var onUpload = function onUpload(info) {
+    if (info.file.status === 'done') {
+      var _result$flag;
+
+      var result = info.file.response;
+
+      if ((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0') {
+        var f = result.data[0];
+        var data = {
+          collectName: type,
+          mongoUrl: showImgApi + "/" + f.fileId,
+          mongoName: f.fileName || "",
+          remarks: "",
+          status: 1
+        };
+        var url = "/petrel/petrel-itg-api/sysMongo";
+        httpPost(url, data, true, false).then(function (res) {
+          if (res.flag.retCode === "0") {
+            showSuccess("上传成功");
+
+            if (page !== totalPage) {
+              setPage(totalPage);
+            } else {
+              loadData(totalPage);
+            }
+          } else {
+            showSuccess(result.flag.retMsg);
+          }
+        });
+      } else {
+        var _result$flag2;
+
+        showError((result === null || result === void 0 ? void 0 : (_result$flag2 = result.flag) === null || _result$flag2 === void 0 ? void 0 : _result$flag2.retMsg) || '上传图片失败,请联系管理员');
+      }
+    } else if (info.file.status === 'error') {
+      showError('上传数据失败,请联系管理员');
+    }
+  };
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProFormText, _extends({
+    name: name
+  }, rest), /*#__PURE__*/React.createElement(_Input, _extends({
+    addonAfter: imgUrl ? /*#__PURE__*/React.createElement("img", {
+      style: {
+        maxWidth: 22,
+        maxHeight: 22
+      },
+      src: imgUrl,
+      onClick: function onClick() {
+        return setVisible(true);
+      }
+    }) : /*#__PURE__*/React.createElement(PlusOutlined, {
+      onClick: function onClick() {
+        return setVisible(true);
+      }
+    })
+  }, rest.fieldProps, {
+    readOnly: readonly,
+    allowClear: allowClear
+  }))), /*#__PURE__*/React.createElement(_Modal, {
+    title: title,
+    visible: visible,
+    width: modalWidth,
+    destroyOnClose: true,
+    onCancel: function onCancel() {
+      return setVisible(false);
+    },
+    bodyStyle: {
+      padding: 8
+    },
+    footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+      style: {
+        display: 'inline-block',
+        marginRight: 8
+      }
+    }, /*#__PURE__*/React.createElement(_Upload, {
+      beforeUpload: beforeUpload,
+      onChange: onUpload,
+      action: uploadImgApi,
+      showUploadList: false,
+      name: "file",
+      maxCount: 1,
+      headers: {
+        token: localStorage.getItem('token') || ''
+      },
+      accept: ".png,.gif,.jpg,.jpeg,.bmp"
+    }, /*#__PURE__*/React.createElement(_Button, {
+      icon: /*#__PURE__*/React.createElement(UploadOutlined, null)
+    }, "\u4E0A\u4F20\u65B0\u56FE"))), /*#__PURE__*/React.createElement(_Button, {
+      disabled: page === 1,
+      onClick: function onClick() {
+        setPage(page - 1);
+      }
+    }, "\u4E0A\u4E00\u9875"), /*#__PURE__*/React.createElement("span", {
+      style: {
+        padding: 8
+      }
+    }, page, "/", totalPage), /*#__PURE__*/React.createElement(_Button, {
+      disabled: page === totalPage,
+      onClick: function onClick() {
+        setPage(page + 1);
+      }
+    }, "\u4E0B\u4E00\u9875"), /*#__PURE__*/React.createElement(_Button, {
+      onClick: function onClick() {
+        return loadData(page);
+      }
+    }, "\u5237\u65B0"))
+  }, list.map(function (o) {
+    return /*#__PURE__*/React.createElement(_Card, {
+      hoverable: true,
+      style: {
+        width: '125px',
+        height: '130px',
+        display: 'inline-block',
+        margin: '10px',
+        verticalAlign: 'middle'
+      },
+      bodyStyle: {
+        padding: '15px 8px',
+        textAlign: 'center'
+      },
+      onDoubleClick: function onDoubleClick() {
+        if (!name) {
+          showWarn('选择图标组件未设置name属性');
+          return;
+        }
+
+        var formVal = formRef.current.getFieldsValue();
+
+        var val = _objectSpread({}, formVal); //@ts-ignore
+
+
+        val[name] = o.mongoUrl;
+        formRef.current.setFieldsValue(val);
+        setImgUrl(toGatewayUrl(o.mongoUrl));
+        setVisible(false);
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        height: 80
+      }
+    }, /*#__PURE__*/React.createElement("img", {
+      title: o.mongoName,
+      style: {
+        maxWidth: '80px',
+        maxHeight: '80px'
+      },
+      src: toGatewayUrl(o.mongoUrl)
+    })), /*#__PURE__*/React.createElement("div", {
+      style: {
+        whiteSpace: 'nowrap',
+        textOverflow: 'ellipsis',
+        overflow: 'hidden'
+      }
+    }, o.mongoName));
+  })));
+}
+
+export default IconSelector;

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", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect"],
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps"],
     _excluded2 = ["current", "pageSize"];
 import React from "react";
 import { useRef, useState, useEffect, useContext } from 'react';
@@ -66,6 +66,7 @@ function InputTable(prop) {
       allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
       _prop$keepSelect = prop.keepSelect,
       keepSelect = _prop$keepSelect === void 0 ? false : _prop$keepSelect,
+      fieldProps = prop.fieldProps,
       rest = _objectWithoutProperties(prop, _excluded);
 
   var textNameProp = textName || name + '__text';
@@ -148,7 +149,6 @@ function InputTable(prop) {
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     columns: columns,
     request: loadData,
-    rowKey: valueField,
     manualRequest: false,
     actionRef: tableRef,
     search: {
@@ -219,7 +219,7 @@ function InputTable(prop) {
     name: name
   })), rest.label ? /*#__PURE__*/React.createElement(ProFormText, _extends({
     name: textNameProp
-  }, rest), /*#__PURE__*/React.createElement(_Input, {
+  }, rest), /*#__PURE__*/React.createElement(_Input, _extends({
     suffix: /*#__PURE__*/React.createElement(_Popover, {
       content: /*#__PURE__*/React.createElement("div", {
         style: {
@@ -232,9 +232,14 @@ function InputTable(prop) {
       trigger: "click",
       visible: visible,
       onVisibleChange: setVisible
-    }, /*#__PURE__*/React.createElement(MoreOutlined, null)),
+    }, /*#__PURE__*/React.createElement(MoreOutlined, {
+      onClick: function onClick(e) {
+        setVisible(true);
+        e.stopPropagation && e.stopPropagation();
+      }
+    })),
     onClick: function onClick() {
-      return setVisible(true);
+      setVisible(true);
     },
     onInput: function onInput(e) {
       var _formRef$current6;
@@ -257,7 +262,7 @@ function InputTable(prop) {
     },
     readOnly: readonly,
     allowClear: allowClear
-  })) : /*#__PURE__*/React.createElement(_Input, _extends({
+  }, fieldProps))) : /*#__PURE__*/React.createElement(_Input, _extends({
     suffix: /*#__PURE__*/React.createElement(_Popover, {
       content: /*#__PURE__*/React.createElement("div", {
         style: {
@@ -270,9 +275,14 @@ function InputTable(prop) {
       trigger: "click",
       visible: visible,
       onVisibleChange: setVisible
-    }, /*#__PURE__*/React.createElement(MoreOutlined, null)),
+    }, /*#__PURE__*/React.createElement(MoreOutlined, {
+      onClick: function onClick(e) {
+        setVisible(true);
+        e.stopPropagation && e.stopPropagation();
+      }
+    })),
     onClick: function onClick() {
-      return setVisible(true);
+      setVisible(true);
     },
     onInput: function onInput(e) {
       var _formRef$current8;
@@ -299,7 +309,7 @@ function InputTable(prop) {
     readOnly: readonly,
     value: text,
     allowClear: allowClear
-  }, rest === null || rest === void 0 ? void 0 : rest.fieldProps)));
+  }, fieldProps)));
 }
 
 export default InputTable;

package/es/hooks/useDtl/index.js

@@ -143,7 +143,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              showSuccess(result.flag.retMsg);
+              showSuccess(result.flag.retMsg || '操作成功');
               Object.assign(masterObject, result.data);
               setEditItem({});
               return _context.abrupt("return", true);
@@ -252,7 +252,7 @@ function useDtl(dtlParam) {
                 break;
               }
 
-              showSuccess(result.flag.retMsg);
+              showSuccess(result.flag.retMsg || '删除成功');
               return _context2.abrupt("return", true);
 
             case 28:
@@ -791,53 +791,48 @@ function useDtl(dtlParam) {
               return _context9.abrupt("return");
 
             case 3:
-              obj = _objectSpread({}, masterObject); // beforeAudit 强式终止
-
-              _context9.t0 = beforeAudit;
+              obj = _objectSpread({}, masterObject);
 
-              if (!_context9.t0) {
-                _context9.next = 10;
+              if (masterObject[mstKeyField]) {
+                _context9.next = 7;
                 break;
               }
 
-              _context9.next = 8;
-              return beforeAudit(obj);
+              showWarn('当前数据未保存，不能审核');
+              return _context9.abrupt("return");
 
-            case 8:
-              _context9.t1 = _context9.sent;
-              _context9.t0 = _context9.t1 === false;
+            case 7:
+              _context9.prev = 7;
+              _context9.next = 10;
+              return showConfirm('确认要审核此数据？', '审核提示');
 
             case 10:
-              if (!_context9.t0) {
-                _context9.next = 12;
-                break;
-              }
-
-              return _context9.abrupt("return");
+              _context9.next = 16;
+              break;
 
             case 12:
               _context9.prev = 12;
-              _context9.next = 15;
-              return mstService.audit([obj]);
+              _context9.t0 = _context9["catch"](7);
+              console.log('终止审核', _context9.t0);
+              return _context9.abrupt("return");
 
-            case 15:
-              result = _context9.sent;
-              _context9.t2 = afterAudit;
+            case 16:
+              _context9.t1 = beforeAudit;
 
-              if (!_context9.t2) {
+              if (!_context9.t1) {
                 _context9.next = 22;
                 break;
               }
 
               _context9.next = 20;
-              return afterAudit(result, [obj]);
+              return beforeAudit(obj);
 
             case 20:
-              _context9.t3 = _context9.sent;
-              _context9.t2 = _context9.t3 === false;
+              _context9.t2 = _context9.sent;
+              _context9.t1 = _context9.t2 === false;
 
             case 22:
-              if (!_context9.t2) {
+              if (!_context9.t1) {
                 _context9.next = 24;
                 break;
               }
@@ -845,25 +840,54 @@ function useDtl(dtlParam) {
               return _context9.abrupt("return");
 
             case 24:
+              _context9.prev = 24;
+              _context9.next = 27;
+              return mstService.audit([obj]);
+
+            case 27:
+              result = _context9.sent;
+              _context9.t3 = afterAudit;
+
+              if (!_context9.t3) {
+                _context9.next = 34;
+                break;
+              }
+
+              _context9.next = 32;
+              return afterAudit(result, [obj]);
+
+            case 32:
+              _context9.t4 = _context9.sent;
+              _context9.t3 = _context9.t4 === false;
+
+            case 34:
+              if (!_context9.t3) {
+                _context9.next = 36;
+                break;
+              }
+
+              return _context9.abrupt("return");
+
+            case 36:
               if ((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) === '0') {
-                showSuccess(result.flag.retMsg);
+                showSuccess(result.flag.retMsg || '审核成功');
                 Object.assign(masterObject, result.data);
               }
 
-              _context9.next = 30;
+              _context9.next = 42;
               break;
 
-            case 27:
-              _context9.prev = 27;
-              _context9.t4 = _context9["catch"](12);
-              console.log(_context9.t4);
+            case 39:
+              _context9.prev = 39;
+              _context9.t5 = _context9["catch"](24);
+              console.log('审核异常', _context9.t5);
 
-            case 30:
+            case 42:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, null, [[12, 27]]);
+      }, _callee9, null, [[7, 12], [24, 39]]);
     }));
 
     return function onAudit() {
@@ -914,6 +938,7 @@ function useDtl(dtlParam) {
       onClick: function onClick() {
         return onAddDtl();
       },
+      disabled: btnDisabled('add'),
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
     }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() ? /*#__PURE__*/React.createElement(_Button, {
       key: "edit",
@@ -935,12 +960,14 @@ function useDtl(dtlParam) {
       onClick: function onClick() {
         onImport();
       },
+      disabled: btnDisabled('import'),
       icon: /*#__PURE__*/React.createElement(ImportOutlined, null)
     }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) ? /*#__PURE__*/React.createElement(_Button, {
       key: "export",
       onClick: function onClick() {
         onExport();
       },
+      disabled: btnDisabled('export'),
       icon: /*#__PURE__*/React.createElement(ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;