ls-pro-common 1.0.27 → 1.0.30

package/lib/components/IconSelector.js

@@ -0,0 +1,322 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/modal/style");
+
+var _modal = _interopRequireDefault(require("antd/es/modal"));
+
+require("antd/es/card/style");
+
+var _card = _interopRequireDefault(require("antd/es/card"));
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+require("antd/es/upload/style");
+
+var _upload = _interopRequireDefault(require("antd/es/upload"));
+
+require("antd/es/button/style");
+
+var _button = _interopRequireDefault(require("antd/es/button"));
+
+require("antd/es/input/style");
+
+var _input = _interopRequireDefault(require("antd/es/input"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+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"];
+var fileCenter = (0, _utils.getCache)('file-center-api') || '/zuul/petrel-file-center-api/';
+var pageSize = 16;
+
+function IconSelector(prop) {
+  //@ts-ignore?
+  var _useContext = (0, _react.useContext)(_lsProForm.ProFormContext),
+      formRef = _useContext.formRef;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(''),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      imgUrl = _useState4[0],
+      setImgUrl = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(1),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      page = _useState6[0],
+      setPage = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(0),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      total = _useState8[0],
+      setTotal = _useState8[1];
+
+  var _useState9 = (0, _react.useState)([]),
+      _useState10 = (0, _slicedToArray2.default)(_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 = (0, _objectWithoutProperties2.default)(prop, _excluded);
+  var uploadImgApi = (0, _react.useMemo)(function () {
+    return (0, _utils.toGatewayUrl)(fileCenter + 'file/upload/' + type);
+  }, [type]);
+  var showImgApi = (0, _react.useMemo)(function () {
+    return fileCenter + 'file/show/' + type;
+  }, [type]);
+
+  var loadData = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(pageIndex) {
+      var url, param, result, rows;
+      return _regenerator.default.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 (0, _http.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);
+    };
+  }();
+
+  (0, _react.useEffect)(function () {
+    if (!visible) return;
+    loadData(page);
+  }, [visible, page]);
+  var totalPage = (0, _react.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) {
+      (0, _utils.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";
+        (0, _http.httpPost)(url, data, true, false).then(function (res) {
+          if (res.flag.retCode === "0") {
+            (0, _utils.showSuccess)("上传成功");
+
+            if (page !== totalPage) {
+              setPage(totalPage);
+            } else {
+              loadData(totalPage);
+            }
+          } else {
+            (0, _utils.showSuccess)(result.flag.retMsg);
+          }
+        });
+      } else {
+        var _result$flag2;
+
+        (0, _utils.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') {
+      (0, _utils.showError)('上传数据失败,请联系管理员');
+    }
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_lsProForm.ProFormText, (0, _extends2.default)({
+    name: name
+  }, rest), /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+    addonAfter: imgUrl ? /*#__PURE__*/_react.default.createElement("img", {
+      style: {
+        maxWidth: 22,
+        maxHeight: 22
+      },
+      src: imgUrl,
+      onClick: function onClick() {
+        return setVisible(true);
+      }
+    }) : /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, {
+      onClick: function onClick() {
+        return setVisible(true);
+      }
+    })
+  }, rest.fieldProps, {
+    readOnly: readonly,
+    allowClear: allowClear
+  }))), /*#__PURE__*/_react.default.createElement(_modal.default, {
+    title: title,
+    visible: visible,
+    width: modalWidth,
+    destroyOnClose: true,
+    onCancel: function onCancel() {
+      return setVisible(false);
+    },
+    bodyStyle: {
+      padding: 8
+    },
+    footer: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
+      style: {
+        display: 'inline-block',
+        marginRight: 8
+      }
+    }, /*#__PURE__*/_react.default.createElement(_upload.default, {
+      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.default.createElement(_button.default, {
+      icon: /*#__PURE__*/_react.default.createElement(_icons.UploadOutlined, null)
+    }, "\u4E0A\u4F20\u65B0\u56FE"))), /*#__PURE__*/_react.default.createElement(_button.default, {
+      disabled: page === 1,
+      onClick: function onClick() {
+        setPage(page - 1);
+      }
+    }, "\u4E0A\u4E00\u9875"), /*#__PURE__*/_react.default.createElement("span", {
+      style: {
+        padding: 8
+      }
+    }, page, "/", totalPage), /*#__PURE__*/_react.default.createElement(_button.default, {
+      disabled: page === totalPage,
+      onClick: function onClick() {
+        setPage(page + 1);
+      }
+    }, "\u4E0B\u4E00\u9875"), /*#__PURE__*/_react.default.createElement(_button.default, {
+      onClick: function onClick() {
+        return loadData(page);
+      }
+    }, "\u5237\u65B0"))
+  }, list.map(function (o) {
+    return /*#__PURE__*/_react.default.createElement(_card.default, {
+      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) {
+          (0, _utils.showWarn)('选择图标组件未设置name属性');
+          return;
+        }
+
+        var formVal = formRef.current.getFieldsValue();
+        var val = (0, _objectSpread2.default)({}, formVal); //@ts-ignore
+
+        val[name] = o.mongoUrl;
+        formRef.current.setFieldsValue(val);
+        setImgUrl((0, _utils.toGatewayUrl)(o.mongoUrl));
+        setVisible(false);
+      }
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      style: {
+        height: 80
+      }
+    }, /*#__PURE__*/_react.default.createElement("img", {
+      title: o.mongoName,
+      style: {
+        maxWidth: '80px',
+        maxHeight: '80px'
+      },
+      src: (0, _utils.toGatewayUrl)(o.mongoUrl)
+    })), /*#__PURE__*/_react.default.createElement("div", {
+      style: {
+        whiteSpace: 'nowrap',
+        textOverflow: 'ellipsis',
+        overflow: 'hidden'
+      }
+    }, o.mongoName));
+  })));
+}
+
+var _default = IconSelector;
+exports.default = _default;

package/lib/components/InputTable.js

@@ -43,7 +43,7 @@ var _icons = require("@ant-design/icons");
 
 var _http = require("../http");
 
-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"];
 
 function InputTable(prop) {
@@ -93,6 +93,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 = (0, _objectWithoutProperties2.default)(prop, _excluded);
   var textNameProp = textName || name + '__text';
 
@@ -175,7 +176,6 @@ function InputTable(prop) {
   var tableDom = /*#__PURE__*/_react.default.createElement(_lsProTable.default, (0, _extends2.default)({
     columns: columns,
     request: loadData,
-    rowKey: valueField,
     manualRequest: false,
     actionRef: tableRef,
     search: {
@@ -247,7 +247,7 @@ function InputTable(prop) {
     name: name
   })), rest.label ? /*#__PURE__*/_react.default.createElement(_lsProForm.ProFormText, (0, _extends2.default)({
     name: textNameProp
-  }, rest), /*#__PURE__*/_react.default.createElement(_input.default, {
+  }, rest), /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
     suffix: /*#__PURE__*/_react.default.createElement(_popover.default, {
       content: /*#__PURE__*/_react.default.createElement("div", {
         style: {
@@ -260,9 +260,14 @@ function InputTable(prop) {
       trigger: "click",
       visible: visible,
       onVisibleChange: setVisible
-    }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, null)),
+    }, /*#__PURE__*/_react.default.createElement(_icons.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;
@@ -285,7 +290,7 @@ function InputTable(prop) {
     },
     readOnly: readonly,
     allowClear: allowClear
-  })) : /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+  }, fieldProps))) : /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
     suffix: /*#__PURE__*/_react.default.createElement(_popover.default, {
       content: /*#__PURE__*/_react.default.createElement("div", {
         style: {
@@ -298,9 +303,14 @@ function InputTable(prop) {
       trigger: "click",
       visible: visible,
       onVisibleChange: setVisible
-    }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, null)),
+    }, /*#__PURE__*/_react.default.createElement(_icons.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;
@@ -327,7 +337,7 @@ function InputTable(prop) {
     readOnly: readonly,
     value: text,
     allowClear: allowClear
-  }, rest === null || rest === void 0 ? void 0 : rest.fieldProps)));
+  }, fieldProps)));
 }
 
 var _default = InputTable;

package/lib/index.d.ts

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

package/lib/index.js

@@ -19,6 +19,12 @@ Object.defineProperty(exports, "DtlLayout", {
     return _DtlLayout.default;
   }
 });
+Object.defineProperty(exports, "IconSelector", {
+  enumerable: true,
+  get: function get() {
+    return _IconSelector.default;
+  }
+});
 Object.defineProperty(exports, "InputTable", {
   enumerable: true,
   get: function get() {
@@ -107,6 +113,8 @@ var _ = _interopRequireDefault(require("./components/404"));
 
 var _Loading = _interopRequireDefault(require("./components/Loading"));
 
+var _IconSelector = _interopRequireDefault(require("./components/IconSelector"));
+
 var _BaseService = _interopRequireDefault(require("./service/BaseService"));
 
 var _http = _interopRequireWildcard(require("./http"));

package/lib/utils/index.d.ts

@@ -82,6 +82,14 @@ export declare const treeEach: (list: any[], fn: (item: any, index: any, list: a
  * @returns 返回符合条件的第一条对象
  */
 export declare const treeFind: (list: any[], key: string, val: any, children?: string) => any;
+/**
+ * 处理普通的尺码横排
+ * @param orgSizeHeader 后端返回的原始尺码组表头
+ * @param typeWidth 尺码组宽 sizeTypeNo，默认120
+ * @param sizeWidth 尺码宽f1~f100， 默认100
+ * @returns 返回已处理好的表头[{dataIndex:sizeTypeNo,title:'国标码',width:120,children[...]},{dataIndex:'f1',...}...]
+ */
+export declare const handleSizeCols: (orgSizeHeader: any[], typeWidth?: number, sizeWidth?: number) => any[];
 export declare const isDev: boolean;
 export declare type UserType = {
     id?: string;

package/lib/utils/index.js

@@ -25,7 +25,7 @@ Object.defineProperty(exports, "getUrlQuery", {
     return _utils.getUrlQuery;
   }
 });
-exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.isDev = exports.getUserName = exports.getUserInfo = void 0;
+exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
 Object.defineProperty(exports, "setUrlQuery", {
   enumerable: true,
   get: function get() {
@@ -306,8 +306,104 @@ var treeFind = function treeFind(list, key, val) {
 
   return item;
 };
+/**
+ * 处理普通的尺码横排
+ * @param orgSizeHeader 后端返回的原始尺码组表头
+ * @param typeWidth 尺码组宽 sizeTypeNo，默认120
+ * @param sizeWidth 尺码宽f1~f100， 默认100
+ * @returns 返回已处理好的表头[{dataIndex:sizeTypeNo,title:'国标码',width:120,children[...]},{dataIndex:'f1',...}...]
+ */
+
 
 exports.treeFind = treeFind;
+
+var handleSizeCols = function handleSizeCols(orgSizeHeader) {
+  var typeWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 120;
+  var sizeWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 100;
+  // f1~f100 当所有尺码组都为null时，删除不需要的尺码。
+  var arr = orgSizeHeader.map(function (o) {
+    var _loop = function _loop(key) {
+      if (orgSizeHeader.every(function (item) {
+        return !item['f' + key];
+      })) {
+        delete o['f' + key];
+      }
+    };
+
+    for (var key = 1; key <= 100; key++) {
+      _loop(key);
+    }
+
+    return o;
+  }); // 多表头时找到最底层的表头
+
+  var findNext = function findNext(item) {
+    if (item.children.length) {
+      return findNext(item.children[0]);
+    }
+
+    return item;
+  };
+
+  var headers = []; // 用于保存返回表头
+
+  var header; // 用于保存每个配码的表头信息
+
+  arr.forEach(function (h, i) {
+    // 先处理尺码组
+    header = {
+      dataIndex: 'sizeTypeNo',
+      title: h.sizeTypeNo,
+      width: typeWidth,
+      ellipsis: true
+    }; //当返回多个尺码组时，需要用children支持多表头
+
+    if (arr.length > i + 1) {
+      header.children = [];
+    } // 第一个尺码组，直接添加，第二个之后，加到上一个的children中。
+
+
+    if (i === 0) {
+      headers.push(header);
+    } else {
+      findNext(headers.find(function (o) {
+        return o.dataIndex === 'sizeTypeNo';
+      })).children.push(header);
+    } // 处理 f1~f100
+
+
+    var _loop2 = function _loop2(k) {
+      if (k === 'sizeTypeNo') return "continue";
+      header = {
+        dataIndex: k,
+        title: h[k] || ' ',
+        width: sizeWidth,
+        ellipsis: true
+      };
+
+      if (arr.length > i + 1) {
+        header.children = [];
+      }
+
+      if (i === 0) {
+        headers.push(header);
+      } else {
+        findNext(headers.find(function (o) {
+          return o.dataIndex === k;
+        })).children.push(header);
+      }
+    };
+
+    for (var k in h) {
+      var _ret = _loop2(k);
+
+      if (_ret === "continue") continue;
+    }
+  });
+  return headers;
+};
+
+exports.handleSizeCols = handleSizeCols;
 var isDev = location.href.includes("//localhost");
 /** @name 用户信息 */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.27",
+  "version": "1.0.30",
   "description": "ls-pro-common",
   "keywords": [
     "antd",