@titaui/pc 1.12.7-beta.15 → 1.12.7-beta.18

package/lib/components/attachments-preview/index.js

@@ -56,9 +56,9 @@ var AttachmentsPreview = function AttachmentsPreview(props) {
 
       case 'preview':
         {
-          if ((0, _util.isImg)(attachments[index].MediaType)) {
+          if ((0, _util.isImg)(attachments[index].MediaType || attachments[index].FileType)) {
             var i = attachments.filter(function (f) {
-              return (0, _util.isImg)(f.MediaType);
+              return (0, _util.isImg)(f.MediaType || attachments[index].FileType);
             }).findIndex(function (f) {
               return f.Id == attachments[index].Id;
             });
@@ -81,10 +81,10 @@ var AttachmentsPreview = function AttachmentsPreview(props) {
   if (!attachments.length && !enableUploadFile) return null;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_imgViewer["default"], {
     data: attachments.filter(function (f) {
-      return (0, _util.isImg)(f.MediaType);
+      return (0, _util.isImg)(f.MediaType || f.FileType);
     }).map(function (f) {
       return _objectSpread(_objectSpread({}, f), {}, {
-        previewUrl: f.ClientUrl
+        previewUrl: f.ClientUrl || f.PreviewUrl
       });
     }),
     ref: previewRef,

package/lib/components/dialog-upload/uploaded-preview.js

@@ -34,7 +34,7 @@ var UploadedPreview = function UploadedPreview(_ref) {
 
   var renderPreviewThumbnail = function renderPreviewThumbnail() {
     // 上传中或不是图片文件时用默认icon
-    if (uploadResultItem.uploadStatus === 2 || !(0, _util.isImg)(uploadResultItem.MediaType)) {
+    if (uploadResultItem.uploadStatus === 2 || !(0, _util.isImg)(uploadResultItem.MediaType || uploadResultItem.FileType)) {
       return /*#__PURE__*/_react["default"].createElement("img", {
         src: (0, _util.getFileTypeMapIcon)(uploadResultItem.MediaType || uploadResultItem.FileType),
         className: "upload-preview-img"
@@ -42,7 +42,7 @@ var UploadedPreview = function UploadedPreview(_ref) {
     }
 
     return /*#__PURE__*/_react["default"].createElement("img", {
-      src: uploadResultItem.ClientUrl,
+      src: uploadResultItem.ClientUrl || uploadResultItem.PreviewUrl,
       className: "upload-preview-img"
     }); // 上传成功且为图片时
   }; // 删除、预览icon
@@ -125,7 +125,7 @@ var UploadedPreview = function UploadedPreview(_ref) {
     className: uploadResultItem.uploadStatus === 3 || uploadResultItem.uploadStatus === 2 ? 'upload-file-size' : 'upload-file-size upload-file-size--error'
   }, uploadResultItem.uploadStatus === 3 || uploadResultItem.uploadStatus === 2 ? (0, _util.getFileSize)(uploadResultItem.Size) : uploadResultItem.Msg)))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__options-wrapper")
-  }, dealPreviewOptions(uploadResultItem.uploadStatus, index, uploadResultItem.Deleteable, uploadResultItem.ClientUrl, uploadResultItem.DownloadUrl)));
+  }, dealPreviewOptions(uploadResultItem.uploadStatus, index, uploadResultItem.Deleteable, uploadResultItem.ClientUrl || uploadResultItem.PreviewUrl, uploadResultItem.DownloadUrl)));
 };
 
 var _default = UploadedPreview;

package/lib/components/dynamic/dynamic-item/components/summary-header/index.js

@@ -269,7 +269,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
         return item.title === "心情";
       }); // 暂时用title
 
-      if (typeof mindData[0].content === 'string') {
+      if (typeof mindData[0].content === 'string' && mindData[0].content !== '') {
         setMindImg(_constant2.Motion.filter(function (item) {
           return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
         })[0].img);

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.js

@@ -35,6 +35,8 @@ var _constant = require("./constant");
 
 require("./index.css");
 
+var _util = require("./util");
+
 var _excluded = ["data"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -83,37 +85,34 @@ var DynamicReply = function DynamicReply(_ref) {
       publishUser = data.publishUser,
       reportType = data.reportType,
       dailyContent = data.dailyContent,
-      atUsers = data.atUsers;
+      atUsers = data.atUsers,
+      attachments = data.attachments;
+  var files = (0, _util.formatAttachments)(attachments);
 
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)(""),
       _useState2 = _slicedToArray(_useState, 2),
-      attachments = _useState2[0],
-      setAttachments = _useState2[1];
+      mindImg = _useState2[0],
+      setMindImg = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(""),
+  var _useState3 = (0, _react.useState)({}),
       _useState4 = _slicedToArray(_useState3, 2),
-      mindImg = _useState4[0],
-      setMindImg = _useState4[1];
+      okrTableData = _useState4[0],
+      setOkrtableData = _useState4[1];
 
   var _useState5 = (0, _react.useState)({}),
       _useState6 = _slicedToArray(_useState5, 2),
-      okrTableData = _useState6[0],
-      setOkrtableData = _useState6[1];
+      taskTableData = _useState6[0],
+      setTasktableData = _useState6[1];
 
-  var _useState7 = (0, _react.useState)({}),
+  var _useState7 = (0, _react.useState)(''),
       _useState8 = _slicedToArray(_useState7, 2),
-      taskTableData = _useState8[0],
-      setTasktableData = _useState8[1];
+      workSummaryData = _useState8[0],
+      setWorkSummaryData = _useState8[1];
 
   var _useState9 = (0, _react.useState)(''),
       _useState10 = _slicedToArray(_useState9, 2),
-      workSummaryData = _useState10[0],
-      setWorkSummaryData = _useState10[1];
-
-  var _useState11 = (0, _react.useState)(''),
-      _useState12 = _slicedToArray(_useState11, 2),
-      nextWorkPlanData = _useState12[0],
-      setNextWorkPlanData = _useState12[1];
+      nextWorkPlanData = _useState10[0],
+      setNextWorkPlanData = _useState10[1];
 
   var contentRichTextRef = (0, _react.useRef)();
   var workPlanRichTextRef = (0, _react.useRef)();
@@ -169,7 +168,7 @@ var DynamicReply = function DynamicReply(_ref) {
         return item.title === "下一步工作计划";
       })[0].content);
 
-      if (typeof mindData[0].content === 'string') {
+      if (typeof mindData[0].content === 'string' && mindData[0].content !== '') {
         setMindImg(_constant.Motion.filter(function (item) {
           return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
         })[0].img);
@@ -203,7 +202,7 @@ var DynamicReply = function DynamicReply(_ref) {
     data: taskTableData
   }), /*#__PURE__*/_react["default"].createElement(_richEditorUpload["default"], {
     text: "\u9644\u4EF6",
-    files: attachments,
+    files: files,
     editable: false
   }), /*#__PURE__*/_react["default"].createElement(_remindUserView["default"], {
     data: atUsers

package/lib/components/dynamic/dynamic-item/dynamic-new-report/util.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatAttachments = void 0;
+
+var firstLaterUpperCase = function firstLaterUpperCase(str) {
+  var temp = str.split("");
+
+  if (temp.length > 0) {
+    temp[0] = temp[0].toUpperCase();
+    return temp.join('');
+  }
+
+  return '';
+};
+
+var formatAttachments = function formatAttachments(data) {
+  if (!data) return [];
+  return data.map(function (item) {
+    var tempObj = {};
+    Object.keys(item).forEach(function (key) {
+      tempObj[firstLaterUpperCase(key)] = item[key];
+    });
+    return tempObj;
+  });
+};
+
+exports.formatAttachments = formatAttachments;

package/lib/components/dynamic/dynamic-item/index.js

@@ -276,7 +276,7 @@ var DynamicItem = function DynamicItem(_ref) {
       case _constant.EFeedType.Report:
         var newSummary = data.newSummary;
 
-        if (!newSummary) {
+        if (newSummary) {
           return /*#__PURE__*/_react["default"].createElement(_dynamicNewReport["default"], {
             data: data,
             onDeleteFeed: onDeleteFeed

package/lib/components/menus/export-modules/summary-menus/menus.js

@@ -11,17 +11,12 @@ var _index = require("../../components/menu-tree/tree-node/index");
 
 var _getLocale = require("../../../../utils/getLocale");
 
-var _request = require("@titaui/request");
-
-var _bsGlobal = require("../../../../utils/bs-global");
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 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; }
 
-var userId = (0, _bsGlobal.getUserInfo)().Id;
 var defaultRefObject = {
   menus: [],
   insertSubordinates: function insertSubordinates() {},
@@ -46,32 +41,27 @@ var PAGE_SUMMARY_CHART = 'chart';
 exports.PAGE_SUMMARY_CHART = PAGE_SUMMARY_CHART;
 
 var summaryMenus = /*#__PURE__*/function () {
-  function summaryMenus() {
+  function summaryMenus(props) {
     _classCallCheck(this, summaryMenus);
 
     this.COMPANYALL = _index.COMPANY_ALL_NODE;
     this.SHARE = _index.SHARE_NODE;
     this.SUBORDINATES = 'subordinates';
-    var isShowShare;
-    (0, _request.rget)('v1')("summary/getShareUsers?toUserId=".concat(userId)).then(function (res) {
-      if (res.total === 0) {
-        isShowShare = true;
-      } else {
-        isShowShare = false;
-      }
-    });
+    console.log('props', props);
     this.menus = [{
       icon: 'all-zongjie',
       label: _i18n.locale.menu_all_summary,
       key: PAGE_SUMMARY_ALl,
       type: _index.MENU_ITEM_NOE,
-      href: '#/summary/all'
+      href: '#/summary/all',
+      isShow: true
     }, {
       icon: 'caidan-my',
       label: _i18n.locale.menu_my_summary,
       key: PAGE_SUMMARY_MY,
       type: _index.MENU_ITEM_NOE,
-      href: '#/summary/my'
+      href: '#/summary/my',
+      isShow: true
     }, {
       icon: 'caidan-xiashu',
       label: _i18n.locale.menu_my_subordinates,
@@ -87,34 +77,29 @@ var summaryMenus = /*#__PURE__*/function () {
       key: PAGE_SUMMARY_SHARE,
       type: _index.MENU_ITEM_NOE,
       href: '#/summary/share',
-      isShow: isShowShare
+      isShow: props.isShowShare
     }, {
       icon: 'bumen',
       label: _i18n.locale.menu_department,
       key: this.COMPANYALL,
       type: this.COMPANYALL,
-      href: ''
+      href: '',
+      isShow: props.isShowDept
     }, {
       icon: '',
       label: _i18n.locale.menu_summary,
       key: 'other',
       type: _index.GROUP_NAME_NODE,
-      href: ''
+      href: '',
+      isShow: true
     }, {
       icon: 'my-setup',
       label: _i18n.locale.menu_summary_role,
       key: PAGE_SUMMARY_ROLE,
       type: _index.MENU_ITEM_NOE,
-      href: '#/enterprise/manage?reactRouterName=daily'
-    } // {
-    //   icon: "yibiao",
-    //   label: locale.menu_summary_count,
-    //   key: PAGE_SUMMARY_CHART,
-    //   type: MENU_ITEM_NOE,
-    //   href: "#/summary/chart",
-    //   isShow: hasDashboardAuth,
-    // }
-    ];
+      href: '#/enterprise/manage?reactRouterName=daily',
+      isShow: true
+    }];
   }
 
   _createClass(summaryMenus, [{
@@ -168,7 +153,7 @@ var summaryMenus = /*#__PURE__*/function () {
     key: "getMenus",
     value: function getMenus() {
       var menus = this.formateToTreeNodeData(this.menus.filter(function (it) {
-        return it.isShow === undefined || it.isShow == true;
+        return it.isShow == true;
       }));
       return menus;
     }

package/lib/components/menus/export-modules/summary-menus/request-api.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getShareStatus = void 0;
+
+var _request = require("@titaui/request");
+
+var _helpers = require("../../../../utils/helpers");
+
+var getShareStatus = function getShareStatus() {
+  var loginUser = (0, _helpers.getLoginUserInfo)();
+  return (0, _request.rget)('v1')("summary/getShareUsers?toUserId=".concat(loginUser.Id));
+};
+
+exports.getShareStatus = getShareStatus;

package/lib/components/menus/export-modules/summary-menus/summary-front-menus.js

@@ -23,6 +23,10 @@ var _menuHighlight = _interopRequireDefault(require("./menu-highlight"));
 
 var _requestApis = require("../../request-apis");
 
+var _requestApi = require("./request-api");
+
+var _auth = require("../../../../utils/auth");
+
 require("../../index.css");
 
 require("./index.css");
@@ -59,7 +63,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       maxHeight = _useState2[0],
       setMaxHeight = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(["myokr"]),
+  var _useState3 = (0, _react.useState)(['myokr']),
       _useState4 = _slicedToArray(_useState3, 2),
       expandedKeys = _useState4[0],
       setExpandedKeys = _useState4[1];
@@ -69,19 +73,32 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       selectedMenuKeys = _useState6[0],
       setSelectedMenuKeys = _useState6[1];
 
+  var _useState7 = (0, _react.useState)(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      isShowShare = _useState8[0],
+      setIsShowShare = _useState8[1];
+
+  var _useState9 = (0, _react.useState)(new _auth.BaseAuth().isBoss()),
+      _useState10 = _slicedToArray(_useState9, 2),
+      isShowDepartment = _useState10[0],
+      setIsShowDepartment = _useState10[1];
+
   var flipRef = (0, _react.useRef)({
     next: function next() {},
     goback: function goback() {}
   });
   var summaryMenusData = (0, _react.useRef)(_menus.defaultRefObject);
 
-  var _useState7 = (0, _react.useState)(function () {
-    summaryMenusData.current = new _menus["default"]();
+  var _useState11 = (0, _react.useState)(function () {
+    summaryMenusData.current = new _menus["default"]({
+      isShowShare: false,
+      isShowDept: true
+    });
     return summaryMenusData.current.getMenus();
   }),
-      _useState8 = _slicedToArray(_useState7, 2),
-      menus = _useState8[0],
-      setMenus = _useState8[1]; // 判断路由高亮菜单
+      _useState12 = _slicedToArray(_useState11, 2),
+      menus = _useState12[0],
+      setMenus = _useState12[1]; // 判断路由高亮菜单
 
 
   (0, _react.useEffect)(function () {
@@ -121,7 +138,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       resolve(true); // 获取数据
 
       (0, _requestApis.getSubordinates)({
-        relationIds: "1,2"
+        relationIds: '1,2'
       }, {
         disabledDottedSubordinatesDig: true
       }).then(function (users) {
@@ -161,6 +178,32 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   });
   (0, _react.useEffect)(function () {
+    var newMenu = new _menus["default"]({
+      isShowShare: isShowShare,
+      isShowDept: isShowDepartment
+    });
+    summaryMenusData.current = newMenu;
+    setMenus(newMenu.getMenus());
+  }, [isShowShare, isShowDepartment]);
+  (0, _react.useEffect)(function () {
+    (0, _requestApi.getShareStatus)().then(function (resp) {
+      if (resp.Code === 1) {
+        if (resp.Data.length > 0) {
+          setIsShowShare(true);
+        }
+      }
+    });
+
+    if (!isShowDepartment) {
+      (0, _requestApis.getMyDepartMent)().then(function (resp) {
+        if (resp.Code === 1) {
+          if (resp.Data.length > 0) {
+            setIsShowDepartment(true);
+          }
+        }
+      });
+    }
+
     var obs = new _resizeObserverPolyfill["default"](function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;

package/lib/components/picker/components/panels/week-panel/utils.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getWeekNumber = exports.getDaysOfMonth = void 0;
+exports.endTime = endTime;
+exports.getWeeksNum = exports.getWeekNumber = exports.getPointYearMonthWeeksRange = exports.getPointYearMonthWeekStartTimeAndEndTime = exports.getDaysOfMonth = void 0;
+exports.startTime = startTime;
 
 //获取当前日期在这个月是第几周
 var getWeekNumber = function getWeekNumber(date) {
@@ -42,4 +44,81 @@ var getDaysOfMonth = function getDaysOfMonth(year, month) {
   }
 };
 
-exports.getDaysOfMonth = getDaysOfMonth;
+exports.getDaysOfMonth = getDaysOfMonth;
+
+function startTime(time) {
+  var nowTimeDate = new Date(time);
+  return nowTimeDate.setHours(0, 0, 0, 0);
+}
+
+function endTime(time) {
+  var nowTimeDate = new Date(time);
+  return nowTimeDate.setHours(23, 59, 59, 999);
+}
+
+var getWeeksNum = function getWeeksNum(year, month) {
+  var d = new Date(); // 该月第一天
+
+  d.setFullYear(year, month - 1, 1);
+  var w1 = d.getDay();
+  if (w1 == 0) w1 = 7; // 该月天数
+
+  d.setFullYear(year, month, 0);
+  var dd = d.getDate(); // 第一个周一
+
+  var d1;
+  if (w1 != 1) d1 = 7 - w1 + 2;else d1 = 1;
+  var week_count = Math.ceil((dd - d1 + 1) / 7);
+  return week_count;
+};
+
+exports.getWeeksNum = getWeeksNum;
+
+var getPointYearMonthWeekStartTimeAndEndTime = function getPointYearMonthWeekStartTimeAndEndTime(year, month, week) {
+  // 获取当月的周期
+  var date = new Date("".concat(year, "/").concat(month, "/1"));
+  var nowDayOfWeek = date.getDay();
+  if (nowDayOfWeek === 0) nowDayOfWeek = 7;
+  var dayNum = 1 * 24 * 60 * 60 * 1000;
+  var firstDate = new Date(date.valueOf() - (nowDayOfWeek - 1) * dayNum);
+  var lastDate = new Date(new Date(firstDate).valueOf() + 6 * dayNum * week);
+  var startDate = new Date(startTime(new Date(firstDate).valueOf() + 7 * dayNum * (week - 1)));
+  var endDate = new Date(endTime(lastDate));
+  var startMonth = startDate.getMonth() + 1 > 9 ? startDate.getMonth() + 1 : '0' + (startDate.getMonth() + 1);
+  var startDateValue = startDate.getDate() > 9 ? startDate.getDate() : '0' + startDate.getDate();
+  var endMonth = endDate.getMonth() + 1 > 9 ? endDate.getMonth() + 1 : '0' + (endDate.getMonth() + 1);
+  var endDateValue = endDate.getDate() > 9 ? endDate.getDate() : '0' + endDate.getDate();
+  return {
+    startTime: "".concat(startMonth, "/").concat(startDateValue),
+    endTime: "".concat(endMonth, "/").concat(endDateValue)
+  };
+};
+
+exports.getPointYearMonthWeekStartTimeAndEndTime = getPointYearMonthWeekStartTimeAndEndTime;
+
+var getPointYearMonthWeeksRange = function getPointYearMonthWeeksRange(year, month) {
+  var startDate = new Date("".concat(year, "/").concat(month, "/1"));
+  var calDays = new Date(startDate.valueOf());
+  calDays.setMonth(calDays.getMonth() + 1);
+  calDays.setDate(0);
+  var days = calDays.getDate();
+  var dayNum = 1 * 24 * 60 * 60 * 1000;
+  var result = [];
+
+  for (var i = 0; i < days; i++) {
+    var date = new Date(startDate.valueOf() + i * dayNum);
+
+    if (date.getDay() === 1) {
+      var endDate = new Date(date.valueOf() + 6 * dayNum);
+      result.push({
+        startTime: "".concat(date.getMonth() + 1 >= 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1), "/").concat(date.getDate() >= 10 ? date.getDate() : '0' + date.getDate()),
+        endTime: "".concat(endDate.getMonth() + 1 >= 10 ? endDate.getMonth() + 1 : '0' + (endDate.getMonth() + 1), "/").concat(endDate.getDate() >= 10 ? endDate.getDate() : '0' + endDate.getDate())
+      });
+      i += 6;
+    }
+  }
+
+  return result;
+};
+
+exports.getPointYearMonthWeeksRange = getPointYearMonthWeeksRange;

package/lib/components/picker/components/panels/week-panel/week-body.js

@@ -15,6 +15,8 @@ var _utils = require("./utils");
 
 var _utils2 = require("../../../utils");
 
+var _constant = require("../../../../../utils/constant");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -25,48 +27,43 @@ var preCls = 'titaui__picker';
 
 var WeekPanelBody = function WeekPanelBody(props) {
   var viewDateStart = props.viewDateStart,
-      onSelect = props.onSelect;
+      onSelect = props.onSelect,
+      _props$valueTypeIsRan = props.valueTypeIsRange,
+      valueTypeIsRange = _props$valueTypeIsRan === void 0 ? true : _props$valueTypeIsRan;
   var currentYear = new Date().getFullYear();
   var currentMonth = new Date().getMonth() + 1;
   var currentWeek = (0, _utils.getWeekNumber)(new Date());
 
   var getCells = function getCells(date) {
-    var dates = [];
     var year = (0, _moment["default"])(date).format('YYYY'); //获取年
 
     var month = (0, _moment["default"])(date).format('MM'); //获取月
 
-    var daysInOneMonth = (0, _utils.getDaysOfMonth)(parseInt(year), parseInt(month));
-    console.log('daysInOneMonth', daysInOneMonth);
-    var WEEK_NUM = Math.ceil(daysInOneMonth / 7);
-    var dateNum = 0;
-
-    var _loop = function _loop(i) {
-      var dateRange = dateNum + 7 < 10 ? "".concat(month, "/0").concat(dateNum + 1, " ~ ").concat(month, "/0").concat(dateNum + 7) : dateNum < 10 ? "".concat(month, "/0").concat(dateNum + 1, " ~ ").concat(month, "/").concat(dateNum + 7) : "".concat(month, "/").concat(dateNum + 1, " ~ ").concat(month, "/").concat(dateNum + 7 > daysInOneMonth ? dateNum + (daysInOneMonth - dateNum) : dateNum + 7);
-      dates.push( /*#__PURE__*/_react["default"].createElement("tr", {
-        key: i,
-        className: (0, _classnames["default"])("".concat(preCls, "__week"), _defineProperty({}, "".concat(preCls, "__week--select"), currentWeek === i + 1 && parseInt(year) == currentYear && parseInt(month) == currentMonth))
-      }, /*#__PURE__*/_react["default"].createElement("div", {
-        onClick: function onClick() {
-          return onSelect && onSelect(dateRange, 'week', year);
-        },
-        className: "".concat(preCls, "__week-box")
-      }, /*#__PURE__*/_react["default"].createElement("span", {
-        className: "".concat(preCls, "__week-index")
-      }, "\u7B2C ".concat(i + 1, " \u5468")), dateRange)));
-
-      if (dateNum + 7 > daysInOneMonth) {
-        dateNum = dateNum;
-      } else {
-        dateNum += 7;
-      }
-    };
-
-    for (var i = 0; i <= WEEK_NUM; i++) {
-      _loop(i);
+    var range = (0, _utils.getPointYearMonthWeeksRange)(year, month);
+
+    if (range) {
+      return range.map(function (item, i) {
+        return /*#__PURE__*/_react["default"].createElement("tr", {
+          key: i,
+          className: (0, _classnames["default"])("".concat(preCls, "__week"), _defineProperty({}, "".concat(preCls, "__week--select"), currentWeek === i + 1 && parseInt(year) == currentYear && parseInt(month) == currentMonth))
+        }, /*#__PURE__*/_react["default"].createElement("div", {
+          onClick: function onClick() {
+            if (onSelect) {
+              if (valueTypeIsRange) {
+                onSelect("".concat(item.startTime, "~").concat(item.endTime), 'week', year);
+              } else {
+                onSelect("".concat(year, "-").concat(month, "-").concat(i + 1), 'week', year);
+              }
+            }
+          },
+          className: "".concat(preCls, "__week-box")
+        }, /*#__PURE__*/_react["default"].createElement("span", {
+          className: "".concat(preCls, "__week-index")
+        }, (0, _constant.getWeekly)()[i]), "".concat(item.startTime, "~").concat(item.endTime)));
+      });
+    } else {
+      return null;
     }
-
-    return dates;
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/rich-editor/schemas/list.js

@@ -250,7 +250,6 @@ function splitListItem(itemType) {
 
 function liftListItem(itemType) {
   return function (state, dispatch) {
-    debugger;
     var _state$selection3 = state.selection,
         $from = _state$selection3.$from,
         $to = _state$selection3.$to;

package/lib/components/select-tags/index.js

@@ -19,7 +19,7 @@ var _getLocale = require("../../utils/getLocale");
 
 require("./index.css");
 
-var _excluded = ["selected", "data", "onChange", "style", "mode", "className", "placeholder", "name", "noBorder"];
+var _excluded = ["selected", "controlValue", "data", "onChange", "style", "mode", "className", "placeholder", "name", "noBorder"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -52,6 +52,7 @@ var preCls = "titaui-select-tags";
 var SelectTags = function SelectTags(_ref) {
   var _ref$selected = _ref.selected,
       selected = _ref$selected === void 0 ? [] : _ref$selected,
+      controlValue = _ref.controlValue,
       _ref$data = _ref.data,
       data = _ref$data === void 0 ? [] : _ref$data,
       onChange = _ref.onChange,
@@ -78,6 +79,11 @@ var SelectTags = function SelectTags(_ref) {
     setValue(value);
   };
 
+  (0, _react.useEffect)(function () {
+    if (controlValue) {
+      setValue(selected);
+    }
+  }, [selected]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls
   }, /*#__PURE__*/_react["default"].createElement(_rcSelect["default"], _extends({

package/lib/utils/constant.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getWeek = exports.getMonth = void 0;
+exports.getWeekly = exports.getWeek = exports.getMonth = void 0;
 
 var _getLocale = require("./getLocale");
 
@@ -17,4 +17,10 @@ var getWeek = function getWeek() {
   return [(0, _getLocale.getLocale)("Mod_Sun"), (0, _getLocale.getLocale)("Mod_Mon"), (0, _getLocale.getLocale)("Mod_Tues"), (0, _getLocale.getLocale)("Mod_Wed"), (0, _getLocale.getLocale)("Mod_Thur"), (0, _getLocale.getLocale)("Mod_Fri"), (0, _getLocale.getLocale)("Mod_Sat")];
 };
 
-exports.getWeek = getWeek;
+exports.getWeek = getWeek;
+
+var getWeekly = function getWeekly() {
+  return [(0, _getLocale.getLocale)('Tasks_Tab_MyS_Week1s'), (0, _getLocale.getLocale)('Tasks_Tab_MyS_Week2s'), (0, _getLocale.getLocale)('Tasks_Tab_MyS_Week3s'), (0, _getLocale.getLocale)('Tasks_Tab_MyS_Week4s'), (0, _getLocale.getLocale)('Tasks_Tab_MyS_Week5s')];
+};
+
+exports.getWeekly = getWeekly;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.7-beta.15",
+  "version": "1.12.7-beta.18",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",