linkmore-design 1.0.64 → 1.0.66

package/es/LmEditTable/EditTable.js

@@ -407,6 +407,7 @@ var EditableCell = function EditableCell(props) {
             return ((_b = (_a = option.children) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.indexOf(input.toLowerCase())) >= 0;
           }
         }, componentProps, {
+          // open={true}
           onChange: handleFormItemChange
         }));
 
@@ -806,8 +807,60 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       setDataSource(res);
     }
   };
+  /** 判断columne中有没有带optionOnly参数  */
+
+
+  var hasDisableOptions = useMemo(function () {
+    var hasOnlyOptionsDatas = columns.filter(function (item) {
+      var _a;
+
+      return (_a = item === null || item === void 0 ? void 0 : item.componentProps) === null || _a === void 0 ? void 0 : _a.optionOnly;
+    });
+
+    if (hasOnlyOptionsDatas.length) {
+      return hasOnlyOptionsDatas.map(function (item) {
+        return item.dataIndex;
+      });
+    }
+
+    return false;
+  }, [columns]);
+  /** 动态获取disabled的props数据源 */
+
+  var DisableOptions = useMemo(function () {
+    var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
+      var _ref3 = item.componentProps || {},
+          optionOnly = _ref3.optionOnly,
+          options = _ref3.options;
+
+      if (optionOnly && options) {
+        var dataIndex = item.dataIndex;
+        var dataIndexData = dataSource.map(function (d) {
+          return d[dataIndex];
+        });
+        var newOptions = options.map(function (o) {
+          return Object.assign(Object.assign({}, o), {
+            disabled: dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value) ? true : false
+          });
+        });
+        return Object.assign(Object.assign({}, item), {
+          componentProps: Object.assign(Object.assign({}, item.componentProps), {
+            options: newOptions
+          })
+        });
+      } else {
+        return item;
+      }
+    });
+    return newColumns;
+  }, [columns, dataSource]);
+  var memoOptions = useMemo(function () {
+    return hasDisableOptions ? [DisableOptions] : [];
+  }, [hasDisableOptions, DisableOptions]);
+  /** 组装之后的最终columns */
 
   var resultColumns = useMemo(function () {
+    var rColumns = hasDisableOptions ? DisableOptions : columns;
     var localColumns = [sortOpen ? {
       title: '',
       dataIndex: 'sort',
@@ -818,7 +871,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
           id: record[_rowKey] || record.id
         });
       }
-    } : null].concat(_toConsumableArray(columns), [useQuickOpetate ? {
+    } : null].concat(_toConsumableArray(rColumns), [useQuickOpetate ? {
       title: '操作',
       dataIndex: 'lm_edit_opetate',
       width: 68,
@@ -859,18 +912,12 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         shouldCellUpdate: function shouldCellUpdate(record, prevRecord) {
           var dataIndex = col.dataIndex;
 
-          if (col === null || col === void 0 ? void 0 : col.fixed) {
+          if ((col === null || col === void 0 ? void 0 : col.fixed) || hasDisableOptions && hasDisableOptions.includes(dataIndex)) {
             return true;
           }
 
           return record[dataIndex] === prevRecord[dataIndex] ? false : true;
         },
-        // render: (text: string, record: Record<string, any>, index: number) => {
-        //   const { editable, render } = record
-        //   if (!editable && render) {
-        //     return render?.(text, record ,index)
-        //   }
-        // },
         onCell: function onCell(record) {
           return {
             getLength: function getLength() {
@@ -898,9 +945,8 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       });
     });
-    console.log(res, '---res');
     return res;
-  }, [columns, isAdd, sortOpen, useQuickOpetate, sortEditTable]);
+  }, [columns, isAdd, sortOpen, useQuickOpetate, sortEditTable, _toConsumableArray(memoOptions)]);
   var DraggableContainer = useCallback(function (_a) {
     var _b;
 

package/es/LmFilter/components/DropdownFIlter.js

@@ -106,7 +106,6 @@ var getLabel = function getLabel(filterValue, item) {
       data = item.data; // 不存在筛选时
 
   if (!(0, _utils.getIsHas)(filterValue)) {
-    console.log('label', filterValue, item);
     return getPlacehodler(item);
   } // 存在筛选数据时 ⬇️
   // 级联数据转换平级结构

package/es/LmFilter/filterFns/index.js

@@ -346,6 +346,11 @@ var useCoreOptions = function useCoreOptions(_ref) {
       type: 'changeBasicQuery',
       basicQuery: basicQuery
     });
+    var globalQuery = {
+      filters: [{
+        conditions: tranformQuery(state.customFilter.data)
+      }]
+    };
     var filterQuery = {
       filters: [{
         conditions: (_Object$keys7 = Object.keys(basicQuery)) === null || _Object$keys7 === void 0 ? void 0 : _Object$keys7.map(function (k) {
@@ -355,6 +360,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
     };
     return {
       basicFilter: basicFilter,
+      globalQuery: globalQuery,
       filterQuery: filterQuery,
       type: 'basic'
     };

package/lib/Approval/index.d.ts

@@ -0,0 +1,24 @@
+import React from 'react';
+declare type VoidFunction = () => void;
+export interface IApprovalItemProps {
+    avator?: string;
+    name?: string;
+    time?: string;
+    type?: 'start' | 'comment' | 'carbonCopy' | 'agree' | 'refuse';
+    [prop: string]: any;
+}
+export interface IApprovalProps {
+    visible?: boolean;
+    title?: string;
+    close?: () => void;
+    className?: string;
+    style?: React.CSSProperties;
+    userType?: 'self' | 'approver';
+    status?: number;
+    steps?: [];
+    onComment: VoidFunction;
+    onRefuse: VoidFunction;
+    onAgree: VoidFunction;
+}
+declare const LMApproval: React.FC<IApprovalProps>;
+export default LMApproval;

package/lib/Approval/index.js

@@ -0,0 +1,223 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _ = require("..");
+
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+var prefixCls = 'lm_approval';
+var colors = ['#36BCF1', '#AE86DC', '#8BD248', '#F5A173'];
+var statusMap = new Map([[1, '审核中'], [2, '已审核'], [3, '未通过']]);
+var defaultStatus = 1;
+
+var LMDrawer = function LMDrawer(props) {
+  var _props$visible = props.visible,
+      visible = _props$visible === void 0 ? false : _props$visible,
+      _props$title = props.title,
+      title = _props$title === void 0 ? '' : _props$title,
+      _props$status = props.status,
+      status = _props$status === void 0 ? defaultStatus : _props$status,
+      _props$userType = props.userType,
+      userType = _props$userType === void 0 ? 'self' : _props$userType,
+      close = props.close,
+      children = props.children,
+      _props$onComment = props.onComment,
+      onComment = _props$onComment === void 0 ? function () {} : _props$onComment,
+      _props$onRefuse = props.onRefuse,
+      onRefuse = _props$onRefuse === void 0 ? function () {} : _props$onRefuse,
+      _props$onAgree = props.onAgree,
+      onAgree = _props$onAgree === void 0 ? function () {} : _props$onAgree;
+  var currentStatusCls = (0, _classnames.default)(prefixCls + '_title_status');
+  var drawerCls = (0, _classnames.default)(prefixCls + '_drawer');
+  var statusText = statusMap.has(status) ? statusMap.get(status) : statusMap.get(1);
+
+  var handleClose = function handleClose() {
+    visible = false;
+    close();
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_.Drawer, {
+    className: drawerCls,
+    visible: visible,
+    title: title,
+    onClose: handleClose,
+    extra: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+      className: currentStatusCls
+    }, /*#__PURE__*/_react.default.createElement("span", null, statusText)), status === 1 && userType === 'approver' && /*#__PURE__*/_react.default.createElement(_.Space, null, /*#__PURE__*/_react.default.createElement(_.Button, {
+      size: "small",
+      onClick: onComment
+    }, "\u4EC5\u8BC4\u8BBA"), /*#__PURE__*/_react.default.createElement(_.Button, {
+      size: "small",
+      onClick: onRefuse,
+      style: {
+        borderColor: '#FA4F53',
+        color: '#FA4F53'
+      }
+    }, "\u62D2\u7EDD"), /*#__PURE__*/_react.default.createElement(_.Button, {
+      size: "small",
+      onClick: onAgree,
+      type: "primary"
+    }, "\u540C\u610F")))
+  }, children);
+};
+
+var ApprovalItem = function ApprovalItem(props) {
+  var _props$avator = props.avator,
+      avator = _props$avator === void 0 ? '' : _props$avator,
+      _props$name = props.name,
+      name = _props$name === void 0 ? '' : _props$name,
+      _props$time = props.time,
+      time = _props$time === void 0 ? '' : _props$time,
+      color = props.color,
+      status = props.status,
+      _props$type = props.type,
+      type = _props$type === void 0 ? 'start' : _props$type;
+  var itemCls = (0, _classnames.default)(prefixCls + '_item');
+  var itemHeaderCls = (0, _classnames.default)(itemCls + '_header');
+  var itemBodyCls = (0, _classnames.default)(itemCls + '_body');
+
+  var getIcon = function getIcon() {
+    if (status === 1) {
+      return /*#__PURE__*/_react.default.createElement("i", {
+        className: 'icon iconfont lmweb-icon_china1'
+      });
+    }
+
+    if (status === 2) {
+      return /*#__PURE__*/_react.default.createElement("i", {
+        className: 'icon iconfont lmweb-icon_china1'
+      }); // return <img className='icon' src={fulfilledSvg} alt="" />
+    }
+
+    if (status === 3) {
+      return /*#__PURE__*/_react.default.createElement("i", {
+        className: 'icon iconfont lmweb-icon_china1'
+      }); // return <img className='icon' src={rejectdSvg} alt="" />
+    }
+
+    return null;
+  };
+
+  var getApprovalText = function getApprovalText() {
+    if (type === 'refuse') {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: 'desc red'
+      }, "\u62D2\u7EDD");
+    }
+
+    if (type === 'start') {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: 'desc'
+      }, "\u53D1\u8D77\u5BA1\u6279");
+    }
+
+    if (type === 'comment') {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: 'desc grey'
+      }, "\u4EC5\u8BC4\u8BBA");
+    }
+
+    if (type === 'carbonCopy') {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: 'desc grey'
+      }, "\u5DF2\u6284\u90018\u4EBA");
+    }
+
+    if (type === 'agree') {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: 'desc'
+      }, "\u5DF2\u540C\u610F");
+    }
+
+    return null;
+  };
+
+  var subname = name.substring(name.length - 1, name.length);
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: itemCls
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: itemHeaderCls
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "avator"
+  }, avator ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("img", {
+    className: 'picture',
+    src: avator,
+    alt: ""
+  }), getIcon()) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: 'subname',
+    style: {
+      backgroundColor: color
+    }
+  }, subname), getIcon())), /*#__PURE__*/_react.default.createElement("div", {
+    className: "content"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: 'name'
+  }, name), getApprovalText()), /*#__PURE__*/_react.default.createElement("div", {
+    className: "right"
+  }, time)), type !== 'start' && /*#__PURE__*/_react.default.createElement("div", {
+    className: itemBodyCls
+  }, "sdf"));
+};
+
+var Approval = function Approval(props) {
+  var _props$status2 = props.status,
+      status = _props$status2 === void 0 ? 1 : _props$status2,
+      _props$steps = props.steps,
+      steps = _props$steps === void 0 ? [] : _props$steps;
+  var cacheColorMap = new Map();
+  steps.forEach(function (step, i) {
+    if (i === 0) {
+      step.status = status;
+    } else {
+      step.status = 2;
+    }
+
+    if (!step.color) {
+      if (cacheColorMap.has(step.name)) {
+        step.color = cacheColorMap.get(step.name);
+      } else {
+        var index = parseInt(Math.random() * 4 + '');
+        var color = colors[index];
+        step.color = color;
+        cacheColorMap.set(step.name, color);
+      }
+    }
+  });
+  var list = steps.map(function (step) {
+    return /*#__PURE__*/_react.default.createElement(ApprovalItem, Object.assign({}, step));
+  });
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, list);
+};
+
+var LMApproval = function LMApproval(props) {
+  var className = props.className,
+      others = __rest(props, ["className"]);
+
+  return /*#__PURE__*/_react.default.createElement(LMDrawer, Object.assign({
+    className: (0, _classnames.default)(className, prefixCls)
+  }, others), /*#__PURE__*/_react.default.createElement(Approval, Object.assign({}, others)));
+};
+
+var _default = LMApproval;
+exports.default = _default;