linkmore-design 1.0.66 → 1.0.67

package/lib/Approval/index.js

@@ -31,6 +31,10 @@ var colors = ['#36BCF1', '#AE86DC', '#8BD248', '#F5A173'];
 var statusMap = new Map([[1, '审核中'], [2, '已审核'], [3, '未通过']]);
 var defaultStatus = 1;
 
+var getLastChar = function getLastChar(name) {
+  return name.substring(name.length - 1, name.length);
+};
+
 var LMDrawer = function LMDrawer(props) {
   var _props$visible = props.visible,
       visible = _props$visible === void 0 ? false : _props$visible,
@@ -64,7 +68,19 @@ var LMDrawer = function LMDrawer(props) {
     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, {
+    }, // 审核中
+    status === 1 && /*#__PURE__*/_react.default.createElement(_.IconFont, {
+      className: 'icon blue',
+      type: "lmweb-yuanxing-gengduo"
+    }), // 已审核
+    status === 2 && /*#__PURE__*/_react.default.createElement(_.IconFont, {
+      className: 'icon green',
+      type: "lmweb-check-circle-fill"
+    }), // 未通过
+    status === 3 && /*#__PURE__*/_react.default.createElement(_.IconFont, {
+      className: 'icon grey',
+      type: "lmweb-stop"
+    }), /*#__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, {
@@ -89,31 +105,41 @@ var ApprovalItem = function ApprovalItem(props) {
       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;
+      type = _props$type === void 0 ? 'start' : _props$type,
+      _props$everyoneAgree = props.everyoneAgree,
+      everyoneAgree = _props$everyoneAgree === void 0 ? false : _props$everyoneAgree,
+      _props$comment = props.comment,
+      comment = _props$comment === void 0 ? null : _props$comment,
+      approverList = props.approverList,
+      carbonCopyList = props.carbonCopyList,
+      _cacheColorMap = props._cacheColorMap,
+      _color = props._color,
+      _status = props._status;
   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 === 1) {
+      return /*#__PURE__*/_react.default.createElement(_.IconFont, {
+        className: 'icon blue',
+        type: "lmweb-yuanxing-gengduo"
       });
     }
 
-    if (status === 2) {
-      return /*#__PURE__*/_react.default.createElement("i", {
-        className: 'icon iconfont lmweb-icon_china1'
-      }); // return <img className='icon' src={fulfilledSvg} alt="" />
+    if (_status === 2) {
+      return /*#__PURE__*/_react.default.createElement(_.IconFont, {
+        className: 'icon green',
+        type: "lmweb-check-circle-fill"
+      });
     }
 
-    if (status === 3) {
-      return /*#__PURE__*/_react.default.createElement("i", {
-        className: 'icon iconfont lmweb-icon_china1'
-      }); // return <img className='icon' src={rejectdSvg} alt="" />
+    if (_status === 3) {
+      return /*#__PURE__*/_react.default.createElement(_.IconFont, {
+        className: 'icon red',
+        type: "lmweb-close-circle-fill"
+      });
     }
 
     return null;
@@ -128,7 +154,7 @@ var ApprovalItem = function ApprovalItem(props) {
 
     if (type === 'start') {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: 'desc'
+        className: 'desc green'
       }, "\u53D1\u8D77\u5BA1\u6279");
     }
 
@@ -146,14 +172,77 @@ var ApprovalItem = function ApprovalItem(props) {
 
     if (type === 'agree') {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: 'desc'
+        className: 'desc green'
       }, "\u5DF2\u540C\u610F");
     }
 
+    if (type === 'pending') {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: 'desc blue'
+      }, "\u5BA1\u6838\u4E2D");
+    }
+
+    return null;
+  };
+
+  var renderTip = function renderTip() {
+    if (type === 'pending') {
+      if (everyoneAgree) {
+        return /*#__PURE__*/_react.default.createElement("div", {
+          className: "agree-tip"
+        }, "\u9700\u8981\u6240\u6709\u5BA1\u6279\u4EBA\u90FD\u540C\u610F");
+      }
+
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: "agree-tip"
+      }, "\u81F3\u5C11\u4E00\u4E2A\u5BA1\u6279\u4EBA\u540C\u610F\u5373\u53EF");
+    }
+
+    return null;
+  };
+
+  var renderComment = function renderComment() {
+    if (comment) {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: 'comment'
+      }, comment);
+    }
+
+    return null;
+  };
+
+  var renderList = function renderList() {
+    var list = approverList || carbonCopyList || [];
+
+    if (list.length) {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: 'lm-approver-box'
+      }, list.map(function (item, i) {
+        var circleColor;
+
+        if (_cacheColorMap.has(item)) {
+          circleColor = _cacheColorMap.get(item);
+        } else {
+          circleColor = colors[parseInt(Math.random() * 4 + '')];
+
+          _cacheColorMap.set(item, circleColor);
+        }
+
+        return /*#__PURE__*/_react.default.createElement("div", {
+          className: 'lm-approver-cell',
+          key: item + i
+        }, /*#__PURE__*/_react.default.createElement("div", {
+          className: 'lm-approver-circle',
+          style: {
+            backgroundColor: circleColor
+          }
+        }, getLastChar(item)), /*#__PURE__*/_react.default.createElement("span", null, item));
+      }));
+    }
+
     return null;
   };
 
-  var subname = name.substring(name.length - 1, name.length);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: itemCls
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -167,9 +256,9 @@ var ApprovalItem = function ApprovalItem(props) {
   }), getIcon()) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: 'subname',
     style: {
-      backgroundColor: color
+      backgroundColor: _color
     }
-  }, subname), getIcon())), /*#__PURE__*/_react.default.createElement("div", {
+  }, getLastChar(name)), getIcon())), /*#__PURE__*/_react.default.createElement("div", {
     className: "content"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: 'name'
@@ -177,7 +266,7 @@ var ApprovalItem = function ApprovalItem(props) {
     className: "right"
   }, time)), type !== 'start' && /*#__PURE__*/_react.default.createElement("div", {
     className: itemBodyCls
-  }, "sdf"));
+  }, renderTip(), renderComment(), renderList()));
 };
 
 var Approval = function Approval(props) {
@@ -185,27 +274,31 @@ var Approval = function Approval(props) {
       status = _props$status2 === void 0 ? 1 : _props$status2,
       _props$steps = props.steps,
       steps = _props$steps === void 0 ? [] : _props$steps;
-  var cacheColorMap = new Map();
+
+  var _cacheColorMap = new Map();
+
   steps.forEach(function (step, i) {
     if (i === 0) {
-      step.status = status;
+      step._status = status;
     } else {
-      step.status = 2;
+      step._status = 2;
     }
 
-    if (!step.color) {
-      if (cacheColorMap.has(step.name)) {
-        step.color = cacheColorMap.get(step.name);
+    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);
+        step._color = colors[parseInt(Math.random() * 4 + '')];
+
+        _cacheColorMap.set(step.name, step._color);
       }
     }
   });
-  var list = steps.map(function (step) {
-    return /*#__PURE__*/_react.default.createElement(ApprovalItem, Object.assign({}, step));
+  var list = steps.map(function (step, i) {
+    return /*#__PURE__*/_react.default.createElement(ApprovalItem, Object.assign({
+      key: step.name + i,
+      _cacheColorMap: _cacheColorMap
+    }, step));
   });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, list);
 };

package/lib/Approval/style/index.css

@@ -507,18 +507,28 @@ html {
   display: flex;
   line-height: 20px;
   height: 20px;
-  background: rgba(0, 0, 0, 0.04);
+  background: var(--color-4);
   padding: 0 8px;
   margin: 2px 0 0 16px;
 }
-.lm_approval_title_status img {
+.lm_approval_title_status .icon {
   display: inline-block;
   width: 12px;
   height: 12px;
   margin-top: 4px;
 }
+.lm_approval_title_status .icon.blue {
+  color: #1890FC;
+}
+.lm_approval_title_status .icon.grey {
+  color: var(--color-85);
+  transform: rotate(90deg);
+}
+.lm_approval_title_status .icon.green {
+  color: #52C41A;
+}
 .lm_approval_title_status span {
-  color: rgba(0, 0, 0, 0.85);
+  color: var(--color-85);
   margin-left: 4px;
   font-size: 12px;
 }
@@ -547,8 +557,17 @@ html {
   position: absolute;
   background-color: #fff;
   border-radius: 50%;
-  bottom: 1px;
-  right: 1px;
+  bottom: 0px;
+  right: 0px;
+}
+.lm_approval_item .lm_approval_item_header .avator .icon.blue {
+  color: #1890FC;
+}
+.lm_approval_item .lm_approval_item_header .avator .icon.green {
+  color: #52C41A;
+}
+.lm_approval_item .lm_approval_item_header .avator .icon.red {
+  color: #FA4F53;
 }
 .lm_approval_item .lm_approval_item_header .avator .subname {
   width: 100%;
@@ -566,27 +585,74 @@ html {
 .lm_approval_item .lm_approval_item_header .content .name {
   font-size: 12px;
   line-height: 20px;
-  color: rgba(0, 0, 0, 0.85);
+  color: var(--color-85);
 }
 .lm_approval_item .lm_approval_item_header .content .desc {
   font-size: 12px;
   line-height: 20px;
+}
+.lm_approval_item .lm_approval_item_header .content .desc.green {
   color: #52C41A;
 }
 .lm_approval_item .lm_approval_item_header .content .desc.red {
   color: #FA4F53;
 }
 .lm_approval_item .lm_approval_item_header .content .desc.grey {
-  color: rgba(0, 0, 0, 0.45);
+  color: var(--color-45);
+}
+.lm_approval_item .lm_approval_item_header .content .desc.blue {
+  color: #1890FC;
 }
 .lm_approval_item .lm_approval_item_header .right {
   font-size: 12px;
   line-height: 20px;
-  color: rgba(0, 0, 0, 0.45);
+  color: var(--color-45);
 }
 .lm_approval_item .lm_approval_item_body {
   min-height: 32px;
   margin: 4px 0 4px 20px;
-  border-left: 1px solid rgba(0, 0, 0, 0.06);
+  border-left: 1px solid var(--color-6);
   padding-left: 36px;
 }
+.lm_approval_item .lm_approval_item_body .agree-tip {
+  font-size: var(--font-size-sm);
+  line-height: 20px;
+  color: var(--color-45);
+}
+.lm_approval_item .lm_approval_item_body .comment {
+  font-size: var(--font-size-sm);
+  line-height: 20px;
+  color: var(--color-85);
+  padding: 4px 8px;
+  background-color: var(--color-4);
+  border-radius: 2px;
+}
+.lm_approval_item .lm_approval_item_body .lm-approver-box {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 4px;
+}
+.lm_approval_item .lm_approval_item_body .lm-approver-box .lm-approver-cell {
+  display: flex;
+  margin: 0 8px 8px 0;
+  height: 24px;
+  line-height: 24px;
+  border-radius: 12px;
+  padding-right: 8px;
+  background-color: var(--color-4);
+}
+.lm_approval_item .lm_approval_item_body .lm-approver-box .lm-approver-cell .lm-approver-circle {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  font-size: 12px;
+  color: #fff;
+  line-height: 20px;
+  margin-top: 2px;
+  text-align: center;
+}
+.lm_approval_item .lm_approval_item_body .lm-approver-box .lm-approver-cell span {
+  color: var(--color-85);
+  font-size: var(--font-size-sm);
+  margin-left: 4px;
+}

package/lib/Approval/type.d.ts

@@ -0,0 +1,24 @@
+/// <reference types="react" />
+export declare type VoidFunction = () => void;
+export interface IApprovalItemProps {
+    avator?: string;
+    name?: string;
+    time?: string;
+    type?: 'start' | 'comment' | 'carbonCopy' | 'agree' | 'refuse' | 'pending';
+    everyoneAgree?: boolean;
+    approverList: Array<string>;
+    [prop: string]: any;
+}
+export interface IApprovalProps {
+    visible?: boolean;
+    title?: string;
+    close?: () => void;
+    className?: string;
+    style?: React.CSSProperties;
+    userType?: 'self' | 'approver';
+    status?: 1 | 2 | 3;
+    steps?: Array<IApprovalItemProps>;
+    onComment: VoidFunction;
+    onRefuse: VoidFunction;
+    onAgree: VoidFunction;
+}

package/lib/Approval/type.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/CustomTableOption/index.js

@@ -52,7 +52,7 @@ var optionsWithDisabled = [{
 }];
 var prefixCls = 'lm_custom-table-option';
 var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var _a;
+  var _a, _b, _c;
 
   var className = props.className,
       _props$tooltip = props.tooltip,
@@ -132,7 +132,7 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     })
   })), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, {
     className: (0, _classnames.default)(className, prefixCls),
-    title: "\u7B5B\u9009\u8BBE\u7F6E",
+    title: "\u4E2A\u6027\u5316\u8BBE\u7F6E",
     visible: visible,
     extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       size: "small",
@@ -149,21 +149,21 @@ var LMCustomTableOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     }
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Tabs, {
     defaultActiveKey: "1"
-  }, /*#__PURE__*/_react.default.createElement(TabPane, {
-    tab: "\u4E2A\u6027\u5316\u7B5B\u9009",
+  }, ((_a = lmOptions.filter) === null || _a === void 0 ? void 0 : _a.length) && /*#__PURE__*/_react.default.createElement(TabPane, {
+    tab: "\u7B5B\u9009\u8BBE\u7F6E",
     key: "1",
     forceRender: true
   }, /*#__PURE__*/_react.default.createElement(_filterSort.default, {
     ref: filterRef,
     filter: lmOptions.filter
-  })), /*#__PURE__*/_react.default.createElement(TabPane, {
+  })), ((_b = lmOptions.columns) === null || _b === void 0 ? void 0 : _b.length) && /*#__PURE__*/_react.default.createElement(TabPane, {
     tab: "\u5217\u8868\u5B57\u6BB5\u8BBE\u7F6E",
     key: "2",
     forceRender: true
   }, /*#__PURE__*/_react.default.createElement(_columnsSort.default, {
     ref: columnsRef,
     columns: lmOptions.columns
-  })), ((_a = lmOptions.card) === null || _a === void 0 ? void 0 : _a.length) && /*#__PURE__*/_react.default.createElement(TabPane, {
+  })), ((_c = lmOptions.card) === null || _c === void 0 ? void 0 : _c.length) && /*#__PURE__*/_react.default.createElement(TabPane, {
     tab: "\u5361\u7247\u5B57\u6BB5\u8BBE\u7F6E",
     key: "4",
     forceRender: true

package/lib/LmEditTable/DragHandle.js

@@ -26,7 +26,8 @@ var Dragger = function Dragger(_ref) {
     type: "lmweb-icon-m-receipt1"
   }, listeners, {
     style: {
-      touchAction: 'none'
+      touchAction: 'none',
+      cursor: 'move'
     },
     className: 'icon_drag' + (isDragging ? 'bing' : '')
   }));