@titaui/pc 1.10.12 → 1.10.15

package/lib/components/communication/CommunicationRecord.js

@@ -87,9 +87,7 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
     userId: communicationTrack.publishUser.userId
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__communication-time")
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__communication-time-point")
-  }, "\xB7"), communicationTrack.createDate)) : /*#__PURE__*/_react["default"].createElement("span", {
+  }, communicationTrack.createDate)) : /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__communication-item")
   }, /*#__PURE__*/_react["default"].createElement(_ConvertUserName["default"], {
     userName: communicationTrack.publishUser.name,
@@ -101,9 +99,7 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
     userId: communicationTrack.parentUser.userId
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__communication-time")
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__communication-time-point")
-  }, "\xB7"), communicationTrack.createDate), /*#__PURE__*/_react["default"].createElement(_Portals["default"], null, /*#__PURE__*/_react["default"].createElement(_reactTooltip["default"], {
+  }, communicationTrack.createDate), /*#__PURE__*/_react["default"].createElement(_Portals["default"], null, /*#__PURE__*/_react["default"].createElement(_reactTooltip["default"], {
     html: true,
     className: "tt-react-tooltip",
     place: "top",

package/lib/components/communication/index.css

@@ -49,11 +49,7 @@
   font-weight: 400;
   color: #89919F;
   line-height: 18px;
-  margin-left: 6px;
-}
-
-.titaui-communication__communication-time-point {
-  margin-right: 4px;
+  margin-left: 12px;
 }
 
 .titaui-communication__communication-bottom {

package/lib/components/dynamic/dynamic-list/index.js

@@ -65,7 +65,8 @@ var DynamicList = function DynamicList(_ref) {
     }]
   }, data.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "".concat(prefix, "__item-wrapper")
+      className: "".concat(prefix, "__item-wrapper"),
+      key: item.feedId
     }, /*#__PURE__*/_react["default"].createElement(_dynamicItem["default"], {
       data: item,
       onDeleteFeed: handleDeleteFeed,

package/lib/components/menus/export-modules/demo-menus/index.js

@@ -64,7 +64,7 @@ var DemoMenus = function DemoMenus(props) {
       setExpandedKeys = _useState4[1];
 
   var _useState5 = (0, _react.useState)(function () {
-    okrMenusData.current = new _menus["default"]();
+    okrMenusData.current = new _menus["default"](isManager);
     return okrMenusData.current.getMenus();
   }),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -72,7 +72,7 @@ var DemoMenus = function DemoMenus(props) {
       setMenus = _useState6[1];
 
   (0, _react.useEffect)(function () {
-    okrMenusData.current = new _menus["default"](isManager === 1);
+    okrMenusData.current = new _menus["default"](isManager);
     setMenus(okrMenusData.current.getMenus());
     setExpandedKeys(["demofree"]);
   }, [isManager]);

package/lib/components/menus/export-modules/demo-menus/menu-highlight.js

@@ -25,7 +25,7 @@ var _default = /*#__PURE__*/function () {
   _createClass(_default, [{
     key: "highlight",
     value: function highlight(cb) {
-      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);
+      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);else if (this.isRechargeList()) cb(_menus.PAGE_RECHARGE_LIST);else if (this.isRechargeStatistics()) cb(_menus.PAGE_RECHARGE_STATISTICS);
     }
   }, {
     key: "isChart",
@@ -33,6 +33,18 @@ var _default = /*#__PURE__*/function () {
       var pathname = this.history.location.pathname;
       return pathname.match(/demofree\/charts/);
     }
+  }, {
+    key: "isRechargeList",
+    value: function isRechargeList() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/recharge\/list/);
+    }
+  }, {
+    key: "isRechargeStatistics",
+    value: function isRechargeStatistics() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/recharge\/statistics/);
+    }
   }, {
     key: "isUnAssigned",
     value: function isUnAssigned() {

package/lib/components/menus/export-modules/demo-menus/menus.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_ASSIGNED_DEMOFREE = void 0;
+exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_ASSIGNED_DEMOFREE = void 0;
 
 var _index = require("../../components/menu-tree/tree-node/index");
 
@@ -13,6 +13,15 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
+var EManagerType;
+
+(function (EManagerType) {
+  EManagerType[EManagerType["Manager"] = 1] = "Manager";
+  EManagerType[EManagerType["Supervisor"] = 2] = "Supervisor";
+  EManagerType[EManagerType["Sales"] = 0] = "Sales";
+  EManagerType[EManagerType["ReCharge"] = 3] = "ReCharge";
+})(EManagerType || (EManagerType = {}));
+
 var defaultRefObject = {
   menus: [],
   getMenus: function getMenus() {}
@@ -30,11 +39,13 @@ var PAGE_IGNORED_DEMOFREE = "ignore";
 exports.PAGE_IGNORED_DEMOFREE = PAGE_IGNORED_DEMOFREE;
 var PAGE_CHARTS_DEMOFREE = "charts";
 exports.PAGE_CHARTS_DEMOFREE = PAGE_CHARTS_DEMOFREE;
+var PAGE_RECHARGE_LIST = "rechargeList";
+exports.PAGE_RECHARGE_LIST = PAGE_RECHARGE_LIST;
+var PAGE_RECHARGE_STATISTICS = "rechargeStatistics";
+exports.PAGE_RECHARGE_STATISTICS = PAGE_RECHARGE_STATISTICS;
 
 var DemoMenuData = /*#__PURE__*/function () {
-  function DemoMenuData() {
-    var isManager = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
+  function DemoMenuData(isManager) {
     _classCallCheck(this, DemoMenuData);
 
     this.isManager = isManager;
@@ -43,46 +54,65 @@ var DemoMenuData = /*#__PURE__*/function () {
       label: "任务状态",
       key: "demofree",
       href: this.isManager ? "#/demofree/list?selected=unassigned" : "#/demofree/list?selected=assigned",
-      isShow: true,
+      isShow: this.isManager !== EManagerType.ReCharge,
       children: [{
         icon: "",
         label: "未分配",
         key: "unassigned",
         href: "#/demofree/list?selected=unassigned",
-        isShow: this.isManager
+        isShow: this.isManager === EManagerType.Manager
       }, {
         icon: "",
         label: "已分配",
         key: "assigned",
         href: "#/demofree/list?selected=assigned",
-        isShow: true
+        isShow: this.isManager !== EManagerType.ReCharge
       }, {
         icon: "",
         label: "已预约",
         key: "reserved",
         href: "#/demofree/list?selected=reserved",
-        isShow: true
+        isShow: this.isManager !== EManagerType.ReCharge
       }, {
         icon: "",
         label: "已完成",
         key: "done",
         href: "#/demofree/list?selected=done",
-        isShow: true
+        isShow: this.isManager !== EManagerType.ReCharge
       }, {
         icon: "",
         label: "已忽略",
         key: "ignore",
         href: "#/demofree/list?selected=ignore",
-        isShow: this.isManager
+        isShow: this.isManager === EManagerType.Manager
       }]
     }, {
       icon: "KH-help",
       label: "预约演示报表",
       key: "charts",
       href: "#/demofree/charts",
-      isShow: this.isManager,
+      isShow: this.isManager === EManagerType.Manager,
       children: [],
       type: _index.MENU_ITEM_NOE
+    }, {
+      icon: "KH-help",
+      label: "客户续费",
+      key: "recharge",
+      href: "#/demofree/recharge",
+      isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
+      children: [{
+        icon: "",
+        label: "到期客户",
+        key: PAGE_RECHARGE_LIST,
+        href: "#/demofree/recharge/list",
+        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+      }, {
+        icon: "",
+        label: "数据统计",
+        key: PAGE_RECHARGE_STATISTICS,
+        href: "#/demofree/recharge/statistics",
+        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+      }]
     }];
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.12",
+  "version": "1.10.15",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",