@titaui/pc 1.9.144 → 1.9.147

package/lib/components/book-demo/components/pc/components/content/index.js

@@ -192,7 +192,7 @@ var BookDemoPCContent = function BookDemoPCContent(_ref) {
         localStorage.setItem("isSubmitted", "1");
         var trickerContent = _constant.trackerInfo[type];
 
-        if (window.titaTracker) {
+        if (window.titaTracker && !localStorage.getItem("titaccc")) {
           window.titaTracker("action").record(_objectSpread({
             actionName: "提交预约演示",
             productName: "预约演示"
@@ -305,7 +305,7 @@ var BookDemoPCContent = function BookDemoPCContent(_ref) {
     }));
     var trickerContent = _constant.trackerInfo[type];
 
-    if (window.titaTracker) {
+    if (window.titaTracker && !localStorage.getItem("titaccc")) {
       window.titaTracker("action").record({
         actionName: "点开预约演示",
         productName: "预约演示",

package/lib/components/book-demo/components/pc/index.js

@@ -73,10 +73,11 @@ var BookDemoPC = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     });
     content += "source: ".concat(source || Source);
 
-    if (window.titaTracker) {
+    if (window.titaTracker && !localStorage.getItem("titaccc")) {
       window.titaTracker("action").record({
-        actionGroup: "申请演示__取消提交",
-        actionName: "\u586B\u5199\u60C5\u51B5\uFF1A".concat(content)
+        productName: "预约演示",
+        actionGroup: "取消预约演示",
+        actionName: "\u53D6\u6D88\u9884\u7EA6\u6F14\u793A:\u586B\u5199\u60C5\u51B5\uFF1A".concat(content)
       });
     }
 
@@ -87,6 +88,14 @@ var BookDemoPC = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     }
   };
 
+  var handleSuccessCloseBookDemo = function handleSuccessCloseBookDemo() {
+    setDialogVisible(false);
+
+    if (visibleChange) {
+      visibleChange(false);
+    }
+  };
+
   var handleChangeData = function handleChangeData(result) {
     setData(result);
   };
@@ -153,7 +162,7 @@ var BookDemoPC = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     onChange: handleChangeData,
     source: source,
     type: type,
-    onSubmitSuccess: handleCloseBookDemo
+    onSubmitSuccess: handleSuccessCloseBookDemo
   }));
 });
 BookDemoPC.defaultProps = {

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

@@ -95,11 +95,11 @@ var DemoMenus = function DemoMenus(props) {
 
 
   (0, _react.useEffect)(function () {
-    var menuHighlight = new _menuHighlight["default"](history);
+    var menuHighlight = new _menuHighlight["default"](history, isManager);
     menuHighlight.highlight(function (menu) {
       return setSelectedMenuKeys([menu]);
     });
-  }, [history.location.pathname, history.location.search]);
+  }, [history.location.pathname, history.location.search, isManager]);
 
   var onSelectHandler = function onSelectHandler(selectedKyes, _ref) {
     var node = _ref.node;

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

@@ -14,11 +14,12 @@ 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 _default = /*#__PURE__*/function () {
-  function _default(history) {
+  function _default(history, isManager) {
     _classCallCheck(this, _default);
 
     this.history = null;
     this.history = history;
+    this.isManager = isManager;
   }
 
   _createClass(_default, [{
@@ -32,7 +33,12 @@ var _default = /*#__PURE__*/function () {
       var _this$history$locatio = this.history.location,
           pathname = _this$history$locatio.pathname,
           search = _this$history$locatio.search;
-      return pathname.match(/demofree/) && (!search || search.match(/selected[\s]*?=[\s]*?unassigned/));
+
+      if (this.isManager === 1) {
+        return pathname.match(/demofree/) && (!search || search.match(/selected[\s]*?=[\s]*?unassigned/));
+      }
+
+      return pathname.match(/demofree/) && search.match(/selected[\s]*?=[\s]*?unassigned/);
     }
   }, {
     key: "isAssigned",
@@ -40,7 +46,7 @@ var _default = /*#__PURE__*/function () {
       var _this$history$locatio2 = this.history.location,
           pathname = _this$history$locatio2.pathname,
           search = _this$history$locatio2.search;
-      return pathname.match(/demofree/) && search.match(/selected[\s]*?=[\s]*?assigned/);
+      return pathname.match(/demofree/) && (!search || search.match(/selected[\s]*?=[\s]*?assigned/));
     }
   }, {
     key: "isReserved",

package/lib/components/nav-top/constant.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.userId = exports.tm = exports.popupAlignPhoto = exports.getVersionTextMap = exports.apiServer = exports.DEMO_FREE_MENU_CONFIG = void 0;
+exports.userId = exports.tm = exports.popupAlignPhoto = exports.getVersionTextMap = exports.apiServer = void 0;
 
 var _getLocale = require("../../utils/getLocale");
 
@@ -35,28 +35,4 @@ var getVersionTextMap = function getVersionTextMap() {
   return _ref = {}, _defineProperty(_ref, _constant.Versions.Standard, (0, _getLocale.getLocale)("Sw_ProEdit")), _defineProperty(_ref, _constant.Versions.WeixinAssess, (0, _getLocale.getLocale)("Sw_PerEdit")), _defineProperty(_ref, _constant.Versions.Professional, (0, _getLocale.getLocale)("Sw_OKREdit")), _defineProperty(_ref, _constant.Versions.Flagship, (0, _getLocale.getLocale)("Sw_Flagship")), _ref;
 };
 
-exports.getVersionTextMap = getVersionTextMap;
-var DEMO_FREE_MENU_CONFIG = {
-  DataSource: null,
-  appCode: null,
-  appId: 119,
-  children: [],
-  code: "",
-  color: "#F28D49",
-  defaultExpand: false,
-  domain: "",
-  groupId: 0,
-  href: "#demofree/list",
-  iconName: "",
-  id: 99998,
-  labelName: null,
-  menuPoint: null,
-  orderId: 2000,
-  originUrl: null,
-  signUrl: "",
-  status: 0,
-  tenantId: 0,
-  title: "预约演示",
-  type: "hash"
-};
-exports.DEMO_FREE_MENU_CONFIG = DEMO_FREE_MENU_CONFIG;
+exports.getVersionTextMap = getVersionTextMap;

package/lib/components/nav-top/utils.js

@@ -9,8 +9,6 @@ var _bsGlobal = require("../../utils/bs-global");
 
 var _logoWhite = _interopRequireDefault(require("./images/logo-white.png"));
 
-var _constant = require("./constant");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var getMenus = function getMenus() {
@@ -19,12 +17,6 @@ var getMenus = function getMenus() {
   navs.sort(function (pre, next) {
     return pre.orderId - next.orderId;
   });
-  var isTita = (0, _bsGlobal.getTenantInfo)().Id === 352728;
-
-  if (isTita) {
-    navs = navs.concat(_constant.DEMO_FREE_MENU_CONFIG);
-  }
-
   return navs;
 };
 

package/lib/utils/format-time.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.timeFormat = exports.showWeekLastDay = exports.showWeekFirstDay = exports.showNextWeekFirstDay = exports.showNextMonthFirstDay = exports.showMonthLastDay = exports.showMonthFirstDay = exports.getTimeString = exports.getNextDayOfYear = exports.getFirstDayOfYear = void 0;
+exports.timeFormat = exports.showWeekLastDay = exports.showWeekFirstDay = exports.showNextWeekFirstDay = exports.showNextMonthFirstDay = exports.showMonthLastDay = exports.showMonthFirstDay = exports.getTimeString = exports.getNextDayOfYear = exports.getFirstDayOfYear = exports["default"] = void 0;
 
 var _constant = require("./constant");
 
@@ -44,11 +44,11 @@ var getTimeString = function getTimeString(time, nowTime) {
   }
 
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return "".concat((0, _getLocale.getLocale)("OKR_MyO_Pr_Text_Yesterday"), " ", "".concat(timeHours, ":").concat(timeMinutes));
+    return "".concat((0, _getLocale.getLocale)("OKR_MyO_Pr_Text_Yesterday"), " ", "".concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes));
   }
 
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
-    return "".concat((0, _getLocale.getLocale)("Mood_2daysago"), " ", "".concat(timeHours, ":").concat(timeMinutes));
+    return "".concat((0, _getLocale.getLocale)("Mood_2daysago"), " ", "".concat(timeHours < 10 ? "0".concat(timeHours) : timeHours, ":").concat(timeMinutes < 10 ? "0".concat(timeMinutes) : timeMinutes));
   }
 
   if (timeYear === nowYear) {
@@ -166,4 +166,6 @@ var showNextMonthFirstDay = function showNextMonthFirstDay() {
   return "".concat(MonthFirstDay.getFullYear(), "/").concat(M, "/").concat(MonthFirstDay.getDate(), " 0:0:0");
 };
 
-exports.showNextMonthFirstDay = showNextMonthFirstDay;
+exports.showNextMonthFirstDay = showNextMonthFirstDay;
+var _default = getTimeString;
+exports["default"] = _default;

package/package.json

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