@titaui/pc 1.15.51 → 1.15.54

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

@@ -49,9 +49,10 @@ var DemoMenus = function DemoMenus(props) {
   var _props$onSelect = props.onSelect,
       onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
       history = props.history,
-      isManager = props.isManager;
+      roleList = props.roleList,
+      showCompeteCustomer = props.showCompeteCustomer;
   var menuRef = (0, _react.useRef)();
-  var okrMenusData = (0, _react.useRef)(_menus.defaultRefObject);
+  var demoMenusData = (0, _react.useRef)(_menus.defaultRefObject);
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -64,18 +65,18 @@ var DemoMenus = function DemoMenus(props) {
       setExpandedKeys = _useState4[1];
 
   var _useState5 = (0, _react.useState)(function () {
-    okrMenusData.current = new _menus["default"](isManager);
-    return okrMenusData.current.getMenus();
+    demoMenusData.current = new _menus["default"](roleList, showCompeteCustomer);
+    return demoMenusData.current.getMenus();
   }),
       _useState6 = _slicedToArray(_useState5, 2),
       menus = _useState6[0],
       setMenus = _useState6[1];
 
   (0, _react.useEffect)(function () {
-    okrMenusData.current = new _menus["default"](isManager);
-    setMenus(okrMenusData.current.getMenus());
+    demoMenusData.current = new _menus["default"](roleList, showCompeteCustomer);
+    setMenus(demoMenusData.current.getMenus());
     setExpandedKeys(["demofree"]);
-  }, [isManager]);
+  }, [roleList, showCompeteCustomer]);
   var flipRef = (0, _react.useRef)({
     next: function next() {},
     goback: function goback() {}
@@ -95,11 +96,11 @@ var DemoMenus = function DemoMenus(props) {
 
 
   (0, _react.useEffect)(function () {
-    var menuHighlight = new _menuHighlight["default"](history, isManager);
+    var menuHighlight = new _menuHighlight["default"](history, roleList.includes(_menus.ERoleType.Manager));
     menuHighlight.highlight(function (menu) {
       return setSelectedMenuKeys([menu]);
     });
-  }, [history.location.pathname, history.location.search, isManager]);
+  }, [history.location.pathname, history.location.search, roleList]);
 
   var onSelectHandler = function onSelectHandler(selectedKyes, _ref) {
     var node = _ref.node;

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);else if (this.isRechargeList()) cb(_menus.PAGE_RECHARGE_LIST);else if (this.isRechargeStatistics()) cb(_menus.PAGE_RECHARGE_STATISTICS);else if (this.isRechargeStatus()) cb(_menus.PAGE_RECHARGE_STATUS);else if (this.isDueDateOrder()) cb(_menus.PAGE_DUEDATE_ORDER);else if (this.isAllCustomer()) cb(_menus.PAGE_ALL_CUSTOMER);else if (this.isPublicCustomer()) cb(_menus.PAGE_PUBLIC_CUSTOMER);else if (this.isMyCustomer()) cb(_menus.PAGE_MY_CUSTOMER);
+      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);else if (this.isRechargeStatus()) cb(_menus.PAGE_RECHARGE_STATUS);else if (this.isDueDateOrder()) cb(_menus.PAGE_DUEDATE_ORDER);else if (this.isAllCustomer()) cb(_menus.PAGE_ALL_CUSTOMER);else if (this.isPublicCustomer()) cb(_menus.PAGE_PUBLIC_CUSTOMER);else if (this.isMyCustomer()) cb(_menus.PAGE_MY_CUSTOMER);else if (this.isLimitCustomer()) cb(_menus.PAGE_LIMIT_CUSTOMER);
     }
   }, {
     key: "isChart",
@@ -64,7 +64,7 @@ var _default = /*#__PURE__*/function () {
           pathname = _this$history$locatio.pathname,
           search = _this$history$locatio.search;
 
-      if (this.isManager === 1) {
+      if (this.isManager) {
         return pathname.match(/demofree\/list/) && (!search || search.match(/selected[\s]*?=[\s]*?unassigned/));
       }
 
@@ -120,6 +120,12 @@ var _default = /*#__PURE__*/function () {
       var pathname = this.history.location.pathname;
       return pathname.match(/demofree\/customer\/all/);
     }
+  }, {
+    key: "isLimitCustomer",
+    value: function isLimitCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/limit/);
+    }
   }]);
 
   return _default;

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_RECHARGE_STATUS = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_PUBLIC_CUSTOMER = exports.PAGE_MY_CUSTOMER = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DUEDATE_ORDER = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_CHARTS = exports.PAGE_ASSIGNED_DEMOFREE = exports.PAGE_ALL_CUSTOMER = void 0;
+exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_RECHARGE_STATUS = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_PUBLIC_CUSTOMER = exports.PAGE_MY_CUSTOMER = exports.PAGE_LIMIT_CUSTOMER = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DUEDATE_ORDER = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_CHARTS = exports.PAGE_ASSIGNED_DEMOFREE = exports.PAGE_ALL_CUSTOMER = exports.ERoleType = void 0;
 
 var _index = require("../../components/menu-tree/tree-node/index");
 
@@ -13,17 +13,20 @@ 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;
+var ERoleType;
+exports.ERoleType = ERoleType;
 
-(function (EManagerType) {
-  EManagerType[EManagerType["Sales"] = 0] = "Sales";
-  EManagerType[EManagerType["Manager"] = 1] = "Manager";
-  EManagerType[EManagerType["Supervisor"] = 2] = "Supervisor";
-  EManagerType[EManagerType["ReCharge"] = 3] = "ReCharge";
-  EManagerType[EManagerType["DemoFreeReadOnly"] = 4] = "DemoFreeReadOnly";
-  EManagerType[EManagerType["ReadOnlyAll"] = 5] = "ReadOnlyAll";
-})(EManagerType || (EManagerType = {}));
+(function (ERoleType) {
+  ERoleType["Sales"] = "sales";
+  ERoleType["Manager"] = "manager";
+  ERoleType["Supervisor"] = "supervisor";
+  ERoleType["SalesOperation"] = "salesOperation";
+  ERoleType["CRM"] = "CRM";
+  ERoleType["PublicCustomer"] = "publicCustomer";
+  ERoleType["DemoReadOnly"] = "demoReadOnly";
+})(ERoleType || (exports.ERoleType = ERoleType = {}));
 
+var demoRole = [ERoleType.Sales, ERoleType.Manager, ERoleType.Supervisor, ERoleType.SalesOperation, ERoleType.DemoReadOnly];
 var defaultRefObject = {
   menus: [],
   getMenus: function getMenus() {}
@@ -45,6 +48,8 @@ var PAGE_ALL_CUSTOMER = "allCustomer";
 exports.PAGE_ALL_CUSTOMER = PAGE_ALL_CUSTOMER;
 var PAGE_PUBLIC_CUSTOMER = "publicCustomer";
 exports.PAGE_PUBLIC_CUSTOMER = PAGE_PUBLIC_CUSTOMER;
+var PAGE_LIMIT_CUSTOMER = 'limitCustomer';
+exports.PAGE_LIMIT_CUSTOMER = PAGE_LIMIT_CUSTOMER;
 var PAGE_MY_CUSTOMER = "myCustomer";
 exports.PAGE_MY_CUSTOMER = PAGE_MY_CUSTOMER;
 var PAGE_CHARTS = "charts";
@@ -59,90 +64,117 @@ var PAGE_RECHARGE_STATUS = "rechargeStatus";
 exports.PAGE_RECHARGE_STATUS = PAGE_RECHARGE_STATUS;
 
 var DemoMenuData = /*#__PURE__*/function () {
-  function DemoMenuData(isManager) {
+  function DemoMenuData(roleList, showCompeteCustomer) {
     _classCallCheck(this, DemoMenuData);
 
-    this.isManager = isManager;
+    this.roleList = roleList;
+    this.showDemo = this.roleList.some(function (role) {
+      return demoRole.includes(role);
+    });
+    this.isManager = this.roleList.includes(ERoleType.Manager);
+    this.showCompeteCustomer = showCompeteCustomer;
     this.menus = [{
       icon: "kaohe",
       label: "任务状态",
       key: "demofree",
       href: this.isManager ? "#/demofree/list?selected=unassigned" : "#/demofree/list?selected=assigned",
-      isShow: this.isManager !== EManagerType.ReCharge,
+      isShow: this.showDemo,
       children: [{
         icon: "",
         label: "未分配",
         key: "unassigned",
         href: "#/demofree/list?selected=unassigned",
-        isShow: this.isManager === EManagerType.Manager
+        isShow: this.isManager
       }, {
         icon: "",
         label: "已分配",
         key: "assigned",
         href: "#/demofree/list?selected=assigned",
-        isShow: this.isManager !== EManagerType.ReCharge
+        isShow: this.showDemo
       }, {
         icon: "",
         label: "已预约",
         key: "reserved",
         href: "#/demofree/list?selected=reserved",
-        isShow: this.isManager !== EManagerType.ReCharge
+        isShow: this.showDemo
       }, {
         icon: "",
         label: "已完成",
         key: "done",
         href: "#/demofree/list?selected=done",
-        isShow: this.isManager !== EManagerType.ReCharge
+        isShow: this.showDemo
       }, {
         icon: "",
         label: "已忽略",
         key: "ignore",
         href: "#/demofree/list?selected=ignore",
-        isShow: this.isManager === EManagerType.Manager
+        isShow: this.isManager
       }]
     }, {
       icon: "KH-help",
       label: "公海资源",
       key: "customer",
       href: "#/demofree/customer/public",
-      isShow: true,
+      isShow: this.roleList.some(function (role) {
+        return [ERoleType.SalesOperation, ERoleType.Manager, ERoleType.PublicCustomer].includes(role);
+      }),
       children: [{
         icon: "",
         label: "全部客户",
         key: PAGE_ALL_CUSTOMER,
         href: "#/demofree/customer/all",
-        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+        isShow: this.roleList.some(function (role) {
+          return [ERoleType.SalesOperation, ERoleType.Manager].includes(role);
+        })
       }, {
         icon: "",
         label: "公海资源",
         key: PAGE_PUBLIC_CUSTOMER,
         href: "#/demofree/customer/public",
-        isShow: this.isManager !== EManagerType.ReCharge
+        isShow: this.roleList.some(function (role) {
+          return [ERoleType.SalesOperation, ERoleType.Manager].includes(role);
+        })
+      }, {
+        icon: "",
+        label: "限时资源",
+        key: PAGE_LIMIT_CUSTOMER,
+        href: "#/demofree/customer/limit",
+        isShow: this.roleList.some(function (role) {
+          return [ERoleType.SalesOperation, ERoleType.Manager, ERoleType.PublicCustomer].includes(role);
+        }) && this.showCompeteCustomer
       }, {
         icon: "",
         label: "我的资源",
         key: PAGE_MY_CUSTOMER,
         href: "#/demofree/customer/my",
-        isShow: this.isManager !== EManagerType.ReCharge
+        isShow: this.roleList.some(function (role) {
+          return [ERoleType.SalesOperation, ERoleType.Manager, ERoleType.PublicCustomer].includes(role);
+        })
       }]
     }, {
       icon: "KH-help",
       label: "客户续费",
       key: "recharge",
       href: "#/demofree/recharge",
-      isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager || this.isManager === EManagerType.ReadOnlyAll,
+      isShow: this.roleList.some(function (role) {
+        return [ERoleType.CRM, ERoleType.Manager].includes(role);
+      }),
       children: [{
         icon: "",
         label: "客户",
         key: PAGE_RECHARGE_LIST,
         href: "#/demofree/recharge/list",
-        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager || this.isManager === EManagerType.ReadOnlyAll
+        isShow: this.roleList.some(function (role) {
+          return [ERoleType.CRM, ERoleType.Manager].includes(role);
+        })
       }, {
         icon: "",
         label: "到期订单",
         key: PAGE_DUEDATE_ORDER,
         href: "#/demofree/recharge/order",
-        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager || this.isManager === EManagerType.ReadOnlyAll
+        isShow: this.roleList.some(function (role) {
+          return [ERoleType.CRM, ERoleType.Manager].includes(role);
+        })
       }]
     }];
   }

package/lib/pages/personal-info/components/edit-base-info/index.js

@@ -21,8 +21,6 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var _i18nFrontTranslate = require("../../../../utils/i18n-front-translate");
 
-var _bsGlobal = require("../../../../utils/bs-global");
-
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -53,6 +51,8 @@ var Fields = _form["default"].Fields;
 var prefix = "titaui-edit-personal-info";
 
 var EditBaseInfo = function EditBaseInfo(props) {
+  var _window$BSGlobal$tena;
+
   var visible = props.visible,
       _onCancel = props.onCancel,
       handleSuccessEditBaseInfo = props.handleSuccessEditBaseInfo,
@@ -187,7 +187,7 @@ var EditBaseInfo = function EditBaseInfo(props) {
       tip: (0, _i18nFrontTranslate.i18nLimitCharacters)(50),
       test: /^[\s\S]{0,50}$/
     }],
-    disabled: (0, _bsGlobal.isWx)(),
+    disabled: (_window$BSGlobal$tena = window.BSGlobal.tenantInfo) === null || _window$BSGlobal$tena === void 0 ? void 0 : _window$BSGlobal$tena.isTranslate,
     value: userInfo.name,
     onChange: handleNameChange
   }), /*#__PURE__*/_react["default"].createElement(Fields.Input, {

package/package.json

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