@titaui/pc 1.9.145 → 1.9.146

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

@@ -75,8 +75,9 @@ var BookDemoPC = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
 
     if (window.titaTracker) {
       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/package.json

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