@titaui/pc 1.9.145 → 1.9.148

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

@@ -44,39 +44,20 @@
   padding-right: 22px;
 }
 
-.titaui-book-demo-pc-content__right-form-privacy {
-  display: flex;
-  align-items: center;
-  grid-column-start: 1;
-  grid-column-end: 3;
-  font-size: 12px;
-  line-height: 18px;
-  padding-bottom: 20px;
-  position: relative;
-}
-
-.titaui-book-demo-pc-content__right-form-privacy-aggre {
-  margin-left: 4px;
-  color: #3f4755;
-}
-
-.titaui-book-demo-pc-content__right-form-privacy-link {
-  margin-left: 4px;
-  color: #2879ff;
-}
-
 .titaui-book-demo-pc-content__right-commit {
   height: 88px;
   background: #ffffff;
   border-radius: 0px 0px 24px 0px;
   display: flex;
   justify-content: center;
+  align-items: center;
+  flex-direction: column;
   position: absolute;
   bottom: 0;
 }
 
 .titaui-book-demo-pc-content__right-commit-btn {
-  margin-top: 16px;
+  margin-top: 12px;
   width: 310px;
   height: 40px;
   background: #2879ff;
@@ -111,3 +92,25 @@
   bottom: 76px;
   right: 44px;
 }
+
+.titaui-book-demo-pc-content__privacy {
+  margin-top: 12px;
+  display: flex;
+  align-items: center;
+  grid-column-start: 1;
+  grid-column-end: 3;
+  font-size: 12px;
+  line-height: 18px;
+  padding-bottom: 8px;
+  position: relative;
+}
+
+.titaui-book-demo-pc-content__privacy-aggre {
+  margin-left: 4px;
+  color: #3f4755;
+}
+
+.titaui-book-demo-pc-content__privacy-link {
+  margin-left: 4px;
+  color: #2879ff;
+}

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

@@ -336,17 +336,7 @@ var BookDemoPCContent = function BookDemoPCContent(_ref) {
     ref: formRef
   }, data.formField.map(function (item) {
     return renderItem(item);
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(preCls, "__right-form-privacy")
-  }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
-    onChange: handleChangeAggrePrivacyValue
-  }), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(preCls, "__right-form-privacy-aggre")
-  }, "\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F "), /*#__PURE__*/_react["default"].createElement("a", {
-    href: "/Account/Register/ServiceTreaty?tenantId=0&isvId=10000",
-    target: "_blank",
-    className: "".concat(preCls, "__right-form-privacy-link")
-  }, "\u670D\u52A1\u53CA\u9690\u79C1\u6761\u6B3E")))), /*#__PURE__*/_react["default"].createElement("div", {
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(_defineProperty({}, "".concat(preCls, "__right-commit--shadow"), isFormOverflow))
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__right-commit"))
@@ -356,7 +346,23 @@ var BookDemoPCContent = function BookDemoPCContent(_ref) {
     onClick: handleCommit
   }, "\u63D0\u4EA4", /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: isLoading
-  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u4E2D\u3002\u3002\u3002"))))));
+  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u4E2D\u3002\u3002\u3002"))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__privacy")
+  }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    onChange: handleChangeAggrePrivacyValue
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(preCls, "__privacy-aggre")
+  }, "\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F "), /*#__PURE__*/_react["default"].createElement("a", {
+    href: "https://okr.tita.com/#/privacy",
+    target: "_blank",
+    className: "".concat(preCls, "__privacy-link"),
+    rel: "noreferrer"
+  }, "\u300A\u9690\u79C1\u653F\u7B56\u300B"), "\u548C", /*#__PURE__*/_react["default"].createElement("a", {
+    target: "_blank",
+    className: "".concat(preCls, "__privacy-link"),
+    href: "https://okr.tita.com/#/userAgreement",
+    rel: "noreferrer"
+  }, "\u300A\u7528\u6237\u670D\u52A1\u534F\u8BAE\u300B")))));
 };
 
 BookDemoPCContent.defaultProps = {

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/package.json

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