@titaui/pc 1.9.13 → 1.9.14

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

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -25,9 +25,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 
@@ -95,7 +95,8 @@ var BaseInfo = function BaseInfo() {
   }), /*#__PURE__*/_react["default"].createElement(_editBaseInfo["default"], {
     visible: visible,
     onCancel: handleCancelEdit,
-    handleSuccessEditBaseInfo: handleSuccessEditBaseInfo
+    handleSuccessEditBaseInfo: handleSuccessEditBaseInfo,
+    info: userInfo
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__form")
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -25,9 +25,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 
@@ -48,8 +48,9 @@ var prefix = "titaui-edit-personal-info";
 
 var EditBaseInfo = function EditBaseInfo(props) {
   var visible = props.visible,
-      onCancel = props.onCancel,
-      handleSuccessEditBaseInfo = props.handleSuccessEditBaseInfo;
+      _onCancel = props.onCancel,
+      handleSuccessEditBaseInfo = props.handleSuccessEditBaseInfo,
+      info = props.info;
   var modalRef = (0, _react.useRef)();
   var formContainerRef = (0, _react.useRef)();
   var formRef = (0, _react.useRef)();
@@ -122,7 +123,8 @@ var EditBaseInfo = function EditBaseInfo(props) {
           });
 
           handleSuccessEditBaseInfo(userInfo);
-          onCancel();
+
+          _onCancel();
         } else {
           _toast["default"].Error(resp.Message, {
             canClose: false
@@ -150,8 +152,24 @@ var EditBaseInfo = function EditBaseInfo(props) {
     title: '基本信息设置',
     noHeadLine: true,
     maskClosable: false,
-    onClose: onCancel,
-    onCancel: onCancel,
+    onClose: function onClose() {
+      _onCancel();
+
+      setUserInfo({
+        name: info.name,
+        mobile: info.mobile,
+        email: info.email
+      });
+    },
+    onCancel: function onCancel() {
+      _onCancel();
+
+      setUserInfo({
+        name: info.name,
+        mobile: info.mobile,
+        email: info.email
+      });
+    },
     okText: "\u786E\u5B9A",
     noFooterLine: true,
     onOk: handleSaveUserInfo,

package/lib/pages/personal-info/components/person-photo/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true

package/lib/utils/auth.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -9,7 +9,7 @@ exports.hasSuperior = exports.OAuth = exports.KRAuth = exports.EAuth = exports.D
 
 var _bsGlobal = require("./bs-global");
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
@@ -27,7 +27,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
 var BaseAuth = /*#__PURE__*/function () {
   function BaseAuth() {

package/lib/utils/format-time.js

@@ -66,7 +66,7 @@ var timeFormat = function timeFormat(NowDate) {
 
   var d = date.getDate(); //日
 
-  return y + "-" + m + "-" + d + " 0:0:0";
+  return y + "/" + m + "/" + d + " 0:0:0";
 }; // 获取当年第一天
 
 
@@ -97,7 +97,7 @@ var showWeekFirstDay = function showWeekFirstDay() {
 
   var WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000);
   var M = Number(WeekFirstDay.getMonth()) + 1;
-  return WeekFirstDay.getFullYear() + "-" + M + "-" + WeekFirstDay.getDate() + " 0:0:0";
+  return WeekFirstDay.getFullYear() + "/" + M + "/" + WeekFirstDay.getDate() + " 0:0:0";
 }; // 本周最后一天
 
 
@@ -111,7 +111,7 @@ var showWeekLastDay = function showWeekLastDay() {
 
   var WeekLastDay = new Date((WeekFirstDay / 1000 + 6 * 86400) * 1000);
   var M = Number(WeekLastDay.getMonth()) + 1;
-  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate();
+  return WeekLastDay.getFullYear() + "/" + M + "/" + WeekLastDay.getDate();
 }; // 下周第一天
 
 
@@ -125,7 +125,7 @@ var showNextWeekFirstDay = function showNextWeekFirstDay() {
 
   var WeekLastDay = new Date((WeekFirstDay / 1000 + 7 * 86400) * 1000);
   var M = Number(WeekLastDay.getMonth()) + 1;
-  return WeekLastDay.getFullYear() + "-" + M + "-" + WeekLastDay.getDate() + " 0:0:0";
+  return WeekLastDay.getFullYear() + "/" + M + "/" + WeekLastDay.getDate() + " 0:0:0";
 }; // 本月第一天
 
 
@@ -135,7 +135,7 @@ var showMonthFirstDay = function showMonthFirstDay() {
   var Nowdate = new Date();
   var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth(), 1);
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate() + " 0:0:0";
+  return MonthFirstDay.getFullYear() + "/" + M + "/" + MonthFirstDay.getDate() + " 0:0:0";
 }; // 本月最后一天
 
 
@@ -147,7 +147,7 @@ var showMonthLastDay = function showMonthLastDay() {
 
   var MonthLastDay = new Date(MonthNextFirstDay - 86400000);
   var M = Number(MonthLastDay.getMonth()) + 1;
-  return MonthLastDay.getFullYear() + "-" + M + "-" + MonthLastDay.getDate();
+  return MonthLastDay.getFullYear() + "/" + M + "/" + MonthLastDay.getDate();
 }; // 下个月第一天
 
 
@@ -157,7 +157,7 @@ var showNextMonthFirstDay = function showNextMonthFirstDay() {
   var Nowdate = new Date();
   var MonthFirstDay = new Date(Nowdate.getFullYear(), Nowdate.getMonth() + 1, 1);
   var M = Number(MonthFirstDay.getMonth()) + 1;
-  return MonthFirstDay.getFullYear() + "-" + M + "-" + MonthFirstDay.getDate() + " 0:0:0";
+  return MonthFirstDay.getFullYear() + "/" + M + "/" + MonthFirstDay.getDate() + " 0:0:0";
 };
 
 exports.showNextMonthFirstDay = showNextMonthFirstDay;

package/lib/utils/local-storage.js

@@ -11,7 +11,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
 var localStorage = /*#__PURE__*/function () {
   function localStorage() {

package/lib/utils/open-data.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -15,9 +15,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 

package/lib/utils/request-v1.js

@@ -10,9 +10,9 @@ exports.taker = taker;
 
 var _bsGlobal = require("./bs-global");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 

package/lib/utils/roundWeight.js

@@ -8,9 +8,9 @@ exports.AccMul = AccMul;
 exports.ReCalibratePrecision = ReCalibratePrecision;
 exports.RoundWeight = RoundWeight;
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 

package/package.json

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

package/src/components/change-okr-modal/constant.ts

@@ -1,3 +1,4 @@
+import { getBSGlobal } from "&/utils/bs-global";
 import { getLocale, isEn } from "../../utils/getLocale";
 
 export const getYear = () => {
@@ -87,7 +88,7 @@ export const getBimonthlyMonthKeyValue = (startMonth) => {
     value: string[];
   }[] = [];
   const monthLang = getMonth();
-  if (!i18nInfo || (i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "zh_CN")) {
+  if (!isEn) {
     datas.push({
       title: `${start} - ${getNextMonth(start)}月`,
       value: [`4,${start}`],

package/src/components/create-okr-modal/createCycle.tsx

@@ -44,7 +44,7 @@ function CreateCycle({ cycle, container, onChange }: Props): ReactElement {
   },[])
 
   const onSelectClickHandler = () => {
-    setSelfCycle(cycle);
+    setSelfCycle(cycle || {});
     popRef.current && popRef.current.show(btnRef.current);
   }
 

package/src/components/dialog/index.scss

@@ -89,6 +89,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     color: #ffffff;
     transition: 0.2s all;
     &:hover {
+      border: 1px solid #5c8eff;
       background: #5c8eff;
       color: #ffffff;
     }

package/src/components/dynamic/constant.ts

@@ -60,7 +60,7 @@ export const ObjectType = {
   4: getLocale('Menu_Title_Projects'),
   5: getLocale('Mod_sPerformanceForm'),
   6: getLocale('Mod_sPerformanceGoals'),
-  7: getLocale('Mod_stask'),
+  7: getLocale('Mod_stasks'),
   8: getLocale('Mod_sDailySummary'),
   10: getLocale('Feed_sFeed'),
   11: getLocale('Pro_page_Plan'),

package/src/components/dynamic/dynamic-item/dynamic-assessment/index.tsx

@@ -28,7 +28,7 @@ const DynamicShare: FC<IDynamicItemContentProps> = ({ data, ...restProps }) => {
   const renderDesc = useMemo(() => {
     return (
       <Fragment>
-        <span className={prefix + "__operate-desc"}>{getLocale('Mod_skeyprogress')}</span>
+        <span className={prefix + "__operate-desc"}>{getLocale('Mod_sassessment')}</span>
         <span
           className={prefix + "-desc-operate-type"}
           style={{ background: feedTypeColor }}

package/src/components/dynamic/dynamic-item/dynamic-progress/index.tsx

@@ -108,12 +108,12 @@ const DynamicProgress: FC<IDynamicItemContentProps> = ({
           >
             <SearchKeyHandle str={relationParentName} keyWord={searchKeyWord} />
           </span>
-          {getLocale('Mod_skeyresspross')}
+          {getLocale('Mod_skeyrprogress')}
         </span>
       );
     }
     if (obj && obj.objType === EObjType.O) {
-      dom = `${getLocale('Mod_Updated')}${getLocale('Mod_skeyprogress')}`;
+      dom = `${getLocale('Mod_Updated')}${getLocale('Mod_objectiveprog')}`;
     }
     if (obj && obj.objType === EObjType.Task) {
       dom = `${getLocale('Mod_Updated')}${getLocale('Data_Taskprogress')}`;

package/src/components/dynamic/dynamic-item/dynamic-reward/index.scss

@@ -14,7 +14,6 @@
     color: #3f4755;
     line-height: 22px;
     display: flex;
-    margin-top: 12px;
     &-quoto {
       width: 12px;
       height: 12px;
@@ -26,6 +25,7 @@
     &-quoto--right {
       margin-left: 8px;
       margin-top: 4px;
+      margin-right: 12px;
     }
   }
   &__status-left {
@@ -39,6 +39,8 @@
     padding: 1px 12px;
     font-size: 12px;
     line-height: 18px;
+    border-radius: 12px;
+    margin-right: 8px;
   }
   &__operate-desc {
     font-size: 14px;

package/src/components/dynamic/dynamic-item/dynamic-reward/index.tsx

@@ -64,7 +64,7 @@ const DynamicReward: FC<IDynamicItemContentProps> = ({
 
   const renderTitle = useMemo(() => {
     if (!obj) {
-      return;
+      return "";
     }
     const { objType, objName } = obj;
     if (objType === EObjType.Kr) {
@@ -74,13 +74,13 @@ const DynamicReward: FC<IDynamicItemContentProps> = ({
       return "O：" + objName;
     }
     if (objType === EObjType.Task) {
-      return `${getLocale('Mod_Tasks')}：` + objName;
+      return `${getLocale("Mod_Tasks")}：` + objName;
     }
     if (objType === EObjType.Project) {
-      return `${getLocale('Mod_Project')}：` + objName;
+      return `${getLocale("Mod_Project")}：` + objName;
     }
     if (objType === EObjType.Assess) {
-      return `${getLocale('Mod_Performance')}：` + objName;
+      return `${getLocale("Mod_Performance")}：` + objName;
     }
     return "";
   }, []);
@@ -122,7 +122,7 @@ const DynamicReward: FC<IDynamicItemContentProps> = ({
             >
               <OpenUserName name={rewardUser.name} id={rewardUser.userId} />
             </span>
-            {getLocale('OKR_MyO_E_Reward')}
+            {getLocale("OKR_MyO_E_Reward")}
           </span>
         </span>
         <span
@@ -145,14 +145,16 @@ const DynamicReward: FC<IDynamicItemContentProps> = ({
       />
       <div className={prefix + "__content"}>
         <div className={prefix + "__title"}>
-          <DynamicTitle
-            content={renderTitle}
-            onClickTitle={handleClickTitle}
-            suffixContent={Classify}
-          />
+          {renderTitle && (
+            <DynamicTitle
+              content={renderTitle}
+              onClickTitle={handleClickTitle}
+              suffixContent={Classify}
+            />
+          )}
         </div>
         {rewardContent && (
-          <div className={prefix + "__description"}>
+          <div className={prefix + "__description"} style={{marginTop: renderTitle ? '12px' : '0'}}>
             <div>
               <img
                 className={classNames(

package/src/components/form/form-fields/input/index.tsx

@@ -21,7 +21,7 @@ interface Props {
   name: string;
   getContainer?: Function;
   disabled?: boolean;
-  layout?: 'column'|'row';
+  layout?: 'clomn'|'row';
   className?:string;
 }
 interface Error {

package/src/components/form/form-fields/password/index.scss

@@ -51,7 +51,7 @@
   &__input {
     display: inline-block;
     padding: 0;
-    width: calc(100% - 12px);
+    width: calc(100% - 20px);
     font-size: 14px;
     font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
       sans-serif, PingFang SC, Microsoft YaHei;
@@ -80,7 +80,7 @@
   }
   &__hide-icon {
     position: absolute;
-    right: 3px;
+    right: 12px;
     top: 10px;
     width: 16px;
     height: 16px;

package/src/components/form/form-fields/textarea/index.tsx

@@ -19,9 +19,8 @@ interface Props {
   require?: boolean;
   name: string;
   getContainer?: Function;
-  resizeType?: 'none' | 'vertical';//不能修改宽度
+  resizeType: 'none' | 'vertical';//不能修改宽度
   areaHeight: number;
-  layout?:'column'|'row'
 }
 
 interface Error {

package/src/components/grid-layout/personal-info/index.tsx

@@ -57,35 +57,35 @@ export default function PersonalInfoComponent() {
       for (let item of res) {
         switch (item.componentDataProp) {
           case 'myInfo':
-            setAvatarUrl(item.componentData[0].simpleUserModelV2.avatar.large);
+            setAvatarUrl(item?.componentData[0].simpleUserModelV2.avatar.large);
             setUserName({
-              name: item.componentData[0].simpleUserModelV2.name,
-              userId: item.componentData[0].simpleUserModelV2.userId,
+              name: item?.componentData[0]?.simpleUserModelV2?.name,
+              userId: item?.componentData[0]?.simpleUserModelV2?.userId,
             });
             setDepartment({
-              name: item.componentData[0].simpleUserModelV2.departmentName,
+              name: item?.componentData[0]?.simpleUserModelV2?.departmentName,
               departmentId:
-                item.componentData[0].simpleUserModelV2.departmentId,
+                item?.componentData[0]?.simpleUserModelV2?.departmentId,
             });
             setAvatarColor(
-              item.componentData[0].simpleUserModelV2.avatar.color
+              item?.componentData[0]?.simpleUserModelV2?.avatar?.color
             );
             break;
           case 'myFollowInfo':
-            setFansNum(item.componentData[0].total);
+            setFansNum(item?.componentData[0]?.total);
             break;
           case 'myPraiseInfo':
-            setLikeNum(item.componentDataCount);
+            setLikeNum(item?.componentDataCount);
             break;
           case 'latelyFPInfo':
             item.componentData[0] &&
               setScrollMessage({
-                name: item.componentData[0].simpleUserModelV2.name,
-                date: item.componentData[0].folowPariseDate,
-                userId: item.componentData[0].simpleUserModelV2.userId,
-                avatarSrc: item.componentData[0].simpleUserModelV2.avatar.large,
+                name: item?.componentData[0]?.simpleUserModelV2?.name,
+                date: item?.componentData[0]?.folowPariseDate,
+                userId: item?.componentData[0]?.simpleUserModelV2?.userId,
+                avatarSrc: item?.componentData[0]?.simpleUserModelV2?.avatar?.large,
                 avatarColor:
-                  item.componentData[0].simpleUserModelV2.avatar.color,
+                  item?.componentData[0]?.simpleUserModelV2?.avatar?.color,
               });
             break;
         }

package/src/components/grid-layout/words-cloud/index.tsx

@@ -7,6 +7,7 @@ import lvMask from '../image/lv'
 import couldMask from '../image/could'
 import titaMask from '../image/tita-mask'
 import { getLocale } from "../../../utils/getLocale";
+import { getBSGlobal } from "../../../utils/bs-global";
 
 const ComponentId = 'Enterprise-Focus-Hotspots'
 
@@ -14,6 +15,7 @@ const ComponentId = 'Enterprise-Focus-Hotspots'
 
 export default function WordCloudComponent() {
 
+  const versionInfo = getBSGlobal("tenantAuthentication");
   const [wordsData, setWordsData] = useState<WordsData>([])
 
   useEffect(() => {
@@ -40,7 +42,7 @@ export default function WordCloudComponent() {
         iconUrl={require('../image/Collaboration.png')}
         tips={getLocale('HP_Theenterprise')}
       >
-        {wordsData.length === 0 && (
+        {versionInfo.Version === 1 && wordsData.length === 0 && (
           <Advice
             styles={{ float: 'right' }}
             link="https://wpa1.qq.com/o6X4XD1n?_type=wpa&qidian=true"

package/src/components/grid-page/personal-info/index.tsx

@@ -57,35 +57,35 @@ export default function PersonalInfoComponent() {
       for (let item of res) {
         switch (item.componentDataProp) {
           case 'myInfo':
-            setAvatarUrl(item.componentData[0].simpleUserModelV2.avatar.large);
+            setAvatarUrl(item?.componentData[0].simpleUserModelV2.avatar.large);
             setUserName({
-              name: item.componentData[0].simpleUserModelV2.name,
-              userId: item.componentData[0].simpleUserModelV2.userId,
+              name: item?.componentData[0]?.simpleUserModelV2?.name,
+              userId: item?.componentData[0]?.simpleUserModelV2?.userId,
             });
             setDepartment({
-              name: item.componentData[0].simpleUserModelV2.departmentName,
+              name: item?.componentData[0]?.simpleUserModelV2?.departmentName,
               departmentId:
-                item.componentData[0].simpleUserModelV2.departmentId,
+                item?.componentData[0]?.simpleUserModelV2?.departmentId,
             });
             setAvatarColor(
-              item.componentData[0].simpleUserModelV2.avatar.color
+              item?.componentData[0]?.simpleUserModelV2?.avatar?.color
             );
             break;
           case 'myFollowInfo':
-            setFansNum(item.componentData[0].total);
+            setFansNum(item?.componentData[0]?.total);
             break;
           case 'myPraiseInfo':
-            setLikeNum(item.componentDataCount);
+            setLikeNum(item?.componentDataCount);
             break;
           case 'latelyFPInfo':
-            item.componentData[0] &&
+            item?.componentData[0] &&
               setScrollMessage({
-                name: item.componentData[0].simpleUserModelV2.name,
-                date: item.componentData[0].folowPariseDate,
-                userId: item.componentData[0].simpleUserModelV2.userId,
-                avatarSrc: item.componentData[0].simpleUserModelV2.avatar.large,
+                name: item?.componentData[0]?.simpleUserModelV2?.name,
+                date: item?.componentData[0]?.folowPariseDate,
+                userId: item?.componentData[0]?.simpleUserModelV2?.userId,
+                avatarSrc: item?.componentData[0]?.simpleUserModelV2?.avatar?.large,
                 avatarColor:
-                  item.componentData[0].simpleUserModelV2.avatar.color,
+                  item?.componentData[0]?.simpleUserModelV2?.avatar?.color,
               });
             break;
         }