@titaui/pc 1.9.96 → 1.9.100

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

@@ -46,7 +46,7 @@ var DEMO_FREE_MENU_CONFIG = {
   defaultExpand: false,
   domain: "",
   groupId: 0,
-  href: "#demofree/list?selected=assigned",
+  href: "#demofree/list",
   iconName: "",
   id: 99998,
   labelName: null,
@@ -56,7 +56,7 @@ var DEMO_FREE_MENU_CONFIG = {
   signUrl: "",
   status: 0,
   tenantId: 0,
-  title: "demofree",
+  title: "预约演示",
   type: "hash"
 };
 exports.DEMO_FREE_MENU_CONFIG = DEMO_FREE_MENU_CONFIG;

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

@@ -9,6 +9,8 @@ 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() {
@@ -17,6 +19,12 @@ 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/components/table/index.js

@@ -23,6 +23,8 @@ require("rc-table/assets/index.css");
 
 require("./index.css");
 
+var _excluded = ["prefixCls", "columns", "tableData", "tableLayout", "total", "rowSelection", "pageNum", "setPageNum", "disablePagination", "pageSize", "setPageSize", "id", "setTableXScroll"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -31,6 +33,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -51,6 +55,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 var preCls = "tita-pc";
 
 var initTableData = function initTableData(tableData) {
@@ -79,7 +87,8 @@ function _default(props) {
       setPageSize = props.setPageSize,
       _props$id = props.id,
       id = _props$id === void 0 ? "" : _props$id,
-      setTableXScroll = props.setTableXScroll;
+      setTableXScroll = props.setTableXScroll,
+      restProps = _objectWithoutProperties(props, _excluded);
 
   var _useState = (0, _react.useState)(function () {
     return initTableData(tableData);
@@ -232,14 +241,14 @@ function _default(props) {
   if (!tableData || !tableData.length) return null;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__table"))
-  }, /*#__PURE__*/_react["default"].createElement(_rcTable["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_rcTable["default"], _extends({
     id: id,
     className: (0, _classnames["default"])("".concat(preCls, "__table")),
     prefixCls: prefixCls || "rc-table",
     columns: getColumns(),
     data: tdata,
     tableLayout: tableLayout || "auto"
-  }), !disablePagination && /*#__PURE__*/_react["default"].createElement("div", {
+  }, restProps)), !disablePagination && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__table-pagination"))
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__table-pagination-left"))

package/lib/utils/bs-global.js

@@ -19,7 +19,7 @@ var getTenantInfo = function getTenantInfo() {
 exports.getTenantInfo = getTenantInfo;
 
 var getBSGlobal = function getBSGlobal(key) {
-  return window.BSGlobal[key];
+  return window.BSGlobal && window.BSGlobal[key];
 };
 
 exports.getBSGlobal = getBSGlobal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.96",
+  "version": "1.9.100",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/nav-top/constant.ts

@@ -29,7 +29,7 @@ export const DEMO_FREE_MENU_CONFIG = {
   defaultExpand: false,
   domain: "",
   groupId: 0,
-  href: "#demofree/list?selected=assigned",
+  href: "#demofree/list",
   iconName: "",
   id: 99998,
   labelName: null,
@@ -39,6 +39,6 @@ export const DEMO_FREE_MENU_CONFIG = {
   signUrl: "",
   status: 0,
   tenantId: 0,
-  title: "demofree",
+  title: "预约演示",
   type: "hash",
 };

package/src/components/nav-top/utils.ts

@@ -1,11 +1,16 @@
 import { getTenantInfo } from "../../utils/bs-global";
 import { INavType } from "./interface";
 import defaultLogo from "./images/logo-white.png";
+import { DEMO_FREE_MENU_CONFIG } from "./constant";
 
 export const getMenus = () => {
   // @ts-ignore
-  const navs: INavType[] = window.BSGlobal.newNavigation;
+  let navs: INavType[] = window.BSGlobal.newNavigation;
   navs.sort((pre, next) => pre.orderId - next.orderId);
+  const isTita = getTenantInfo().Id === 352728;
+  if (isTita) {
+    navs = navs.concat(DEMO_FREE_MENU_CONFIG);
+  }
   return navs;
 };
 

package/src/components/table/index.js

@@ -36,6 +36,7 @@ export default function (props) {
     setPageSize,
     id = "",
     setTableXScroll,
+    ...restProps
   } = props;
 
   const [tdata, setTdata] = useState(() => initTableData(tableData));
@@ -165,6 +166,7 @@ export default function (props) {
         columns={getColumns()}
         data={tdata}
         tableLayout={tableLayout || "auto"}
+        {...restProps}
       />
       {!disablePagination
       && (

package/src/utils/bs-global.js

@@ -2,7 +2,7 @@ export const getUserInfo = () => window.BSGlobal && window.BSGlobal.loginUserInf
 
 export const getTenantInfo = () => window.BSGlobal && window.BSGlobal.tenantInfo;
 
-export const getBSGlobal = (key) => window.BSGlobal[key];
+export const getBSGlobal = (key) => window.BSGlobal && window.BSGlobal[key];
 
 export const getOkrAdvancedSetting = () => window.BSGlobal.OkrAdvancedSetting;