@titaui/pc 1.12.3 → 1.12.4-beta.1

package/lib/components/drop-selector/index.js

@@ -156,8 +156,7 @@ function DropSelector(props) {
   }
 
   var handlePopVisibleChange = (0, _react.useCallback)(function (visible) {
-    console.log('visible' in props);
-
+    // console.log('visible' in props)
     if (!('visible' in props)) {
       setVisible(visible);
     }

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -41,10 +41,11 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var hasProject = (0, _bsGlobal.hasWebHead)("project");
+var hasProject = (0, _bsGlobal.hasWebHead)('project');
+var baseAuth = new _auth.BaseAuth();
 
 var EKrNode = function EKrNode(props) {
-  var _okrInfo$authority;
+  var _window, _window$BSGlobal, _window$BSGlobal$Work, _window$BSGlobal$Work2, _okrInfo$authority;
 
   var index = props.index,
       title = props.title,
@@ -60,6 +61,9 @@ var EKrNode = function EKrNode(props) {
   var _useContext2 = (0, _react.useContext)(_context2.EListContext),
       refreshEList = _useContext2.refreshEList;
 
+  var onlySuperCreateWork = (_window = window) === null || _window === void 0 ? void 0 : (_window$BSGlobal = _window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$Work = _window$BSGlobal.WorkAdvancedSetting) === null || _window$BSGlobal$Work === void 0 ? void 0 : (_window$BSGlobal$Work2 = _window$BSGlobal$Work.WorkFunctionSetting) === null || _window$BSGlobal$Work2 === void 0 ? void 0 : _window$BSGlobal$Work2.WorkCreate; //开启后，仅超管、目标管理员、老板/助理可创建项目
+
+  var canCreateWork = baseAuth.isBoss() || baseAuth.isManager() || baseAuth.isWorkManager() || baseAuth.isAssistant() || !onlySuperCreateWork;
   var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth;
 
@@ -85,7 +89,7 @@ var EKrNode = function EKrNode(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (name === "addTask") {
+              if (name === 'addTask') {
                 params = {
                   objId: data.workId,
                   objType: 4,
@@ -105,7 +109,7 @@ var EKrNode = function EKrNode(props) {
                     allowObjectOptions: false
                   }
                 }).then(function () {
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
                     canClose: false
                   });
 
@@ -116,7 +120,7 @@ var EKrNode = function EKrNode(props) {
                   okrId: data.workId,
                   krId: data.mileStoneId
                 }).then(function () {
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
                     canClose: false
                   });
 
@@ -137,12 +141,12 @@ var EKrNode = function EKrNode(props) {
     };
   }(), []);
   var openRelatePop = (0, _react.useCallback)(function (name) {
-    if (name === "relateTask") {
+    if (name === 'relateTask') {
       window.openRelateTaskPop(btnRef.current, {
         okrId: data.workId,
         krId: data.mileStoneId
       }).then(function () {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
           canClose: false
         });
 
@@ -157,7 +161,7 @@ var EKrNode = function EKrNode(props) {
         okrId: data.workId,
         krId: data.mileStoneId
       }).then(function () {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
           canClose: false
         });
 
@@ -180,7 +184,7 @@ var EKrNode = function EKrNode(props) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),
     onClick: function onClick() {
       if (data.mileStoneId) {
-        _drawerManager["default"].open("krDetail", {
+        _drawerManager["default"].open('krDetail', {
           krId: data.mileStoneId
         });
       }
@@ -199,32 +203,32 @@ var EKrNode = function EKrNode(props) {
       ref: btnRef
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "tu-icon-add1"
-    }), (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Newlybuild"))
+    }), (0, _getLocale.getLocale)('OKR_MyO_E_Butt_Newlybuild'))
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-Add-renwu",
     exIconClass: "e-kr-node-layer-icon",
     name: "addTask"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Addtask"))), hasProject ? /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_E_Butt_Addtask'))), hasProject && canCreateWork ? /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-Add-xiangmu",
     exIconClass: "e-kr-node-layer-icon",
     name: "addProject"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Addproject"))) : /*#__PURE__*/_react["default"].createElement("span", null)), hasRelation && /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_E_Butt_Addproject'))) : /*#__PURE__*/_react["default"].createElement("span", null)), hasRelation && /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
     popupPlacement: "bottomRight",
     onChange: openRelatePop,
     trigger: /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-actions-connect"))
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "tu-icon-guanlian e-kr-node__guanlian-icon"
-    }), (0, _getLocale.getLocale)("Mod_Associate"))
+    }), (0, _getLocale.getLocale)('Mod_Associate'))
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-GL-renwu",
     exIconClass: "e-kr-node-layer-icon",
     name: "relateTask"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Assotask"))), hasProject ? /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_E_Butt_Assotask'))), hasProject ? /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
     icon: "tu-icon-GL-xiangmu",
     exIconClass: "e-kr-node-layer-icon",
     name: "relateProject"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_E_Butt_AssProjects"))) : /*#__PURE__*/_react["default"].createElement("span", null))) : null);
+  }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_E_Butt_AssProjects'))) : /*#__PURE__*/_react["default"].createElement("span", null))) : null);
 };
 
 var _default = EKrNode;

package/lib/components/upload/components/uploadedPreview.js

@@ -212,7 +212,7 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
       }, /*#__PURE__*/_react["default"].createElement(_style.PreviewFileTitle, {
         "data-tip": uploadResultItem.FileName,
         key: uploadResultItem.uid
-      }, uploadResultItem.FileName, (uploadResultItem.uploadStatus === 2 || uploadResultItem.uploadStatus === 3) && uploadResultItem.percentComplete !== 100 ? /*#__PURE__*/_react["default"].createElement(_style.UploadProgress, null, /*#__PURE__*/_react["default"].createElement("div", {
+      }, uploadResultItem.FileName, uploadResultItem.uploadStatus === 2 ? /*#__PURE__*/_react["default"].createElement(_style.UploadProgress, null, /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           width: "".concat(uploadResultItem.percentComplete, "%")
         },

package/lib/components/upload/index.js

@@ -221,12 +221,32 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
         return;
       }
 
-      var xhr = uploadStartFile.requestXHR;
+      var xhr = uploadStartFile.requestXHR; // xhr.onreadystatechange = () => {
+      //   if (xhr.readyState == 4 && xhr.status == 200) {
+      //     const result = { ...JSON.parse(xhr.responseText).Result[0] }; // 上传成功接口返回数据
+      //     result.percentComplete = 100;
+      //     result.IsSuccess = !!result.IsSuccess;
+      //     result.uploadStatus = result.IsSuccess ? 3 : 4; // 3上传成功；4上传失败
+      //     this._dealUploadSuccess({ ...uploadStartFile, ...result });
+      //   }
+      // };
+      // // 进度条部分
+      // xhr.upload.onprogress = (evt) => {
+      //   const uploadSuccessFiles = [...this.state.uploadSuccessFiles];
+      //   if (evt.lengthComputable) {
+      //     uploadSuccessFiles.forEach((item: UploadResultObj) => {
+      //       if (this.isSameFile(item, uploadStartFile)) {
+      //         item.uploadStatus = 2; // 上传中
+      //         item.percentComplete = Math.round((evt.loaded * 100) / evt.total);
+      //       }
+      //     });
+      //     this.setState({ uploadSuccessFiles });
+      //   }
+      // };
 
       xhr.onreadystatechange = function () {
         if (xhr.readyState == 4 && xhr.status == 200) {
-          var result = _objectSpread({}, JSON.parse(xhr.responseText).Result[0]); // 上传成功接口返回数据
-
+          var result = Object.assign({}, _objectSpread({}, JSON.parse(xhr.responseText).Result[0])); // 上传成功接口返回数据
 
           result.percentComplete = 100;
           result.IsSuccess = !!result.IsSuccess;
@@ -234,11 +254,11 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
 
           _this._dealUploadSuccess(_objectSpread(_objectSpread({}, uploadStartFile), result));
         }
-      }; // 进度条部分
+      }; //进度条部分
 
 
       xhr.upload.onprogress = function (evt) {
-        var uploadSuccessFiles = _toConsumableArray(_this.state.uploadSuccessFiles);
+        var uploadSuccessFiles = JSON.parse(JSON.stringify(_this.state.uploadSuccessFiles));
 
         if (evt.lengthComputable) {
           uploadSuccessFiles.forEach(function (item) {
@@ -331,12 +351,20 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
       });
     };
 
+    _this.isImg = function (fileType) {
+      if (/^(jpg|png|gif|jpeg|image|JPG|PNG|GIF|JPEG)$/.test(fileType)) {
+        return true;
+      }
+
+      return false;
+    };
+
     _this.getImgIndex = function (index) {
       var newIndex = 0;
       var uploadSuccessFiles = _this.state.uploadSuccessFiles;
 
       for (var i = 0; i < index; i++) {
-        if (isImg(uploadSuccessFiles[i].FileType)) {
+        if (_this.isImg(uploadSuccessFiles[i].FileType)) {
           newIndex++;
         }
       }

package/lib/utils/auth.js

@@ -49,6 +49,18 @@ var BaseAuth = /*#__PURE__*/function () {
     value: function isManager() {
       // console.log('ismanager', this.loginUserInfor.IsOkrManager)
       return this.loginUserInfor.IsOkrManager;
+    } // 助理或者说动态管理员
+
+  }, {
+    key: "isAssistant",
+    value: function isAssistant() {
+      return this.loginUserInfor.Role === 1;
+    } // 项目管理员
+
+  }, {
+    key: "isWorkManager",
+    value: function isWorkManager() {
+      return this.loginUserInfor.IsWorkManager;
     }
   }, {
     key: "isDepartmentLeader",

package/lib/utils/tita-okr-cycle.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.cycleType = void 0;
+// annualNum: "2022" 年份
+// cycleType: "-1" 全部周期
+// endDate: ""
+// startDate: ""
+// yqmNum: "0"
+// annualNum: "2022"
+// cycleType: "5"  上半年
+// endDate: "2022/09/30"
+// startDate: "2022/04/01"
+// yqmNum: "1"
+var cycleType = {
+  '-1': '全部周期',
+  '1': '年度',
+  "2": "季度",
+  "4": "双月",
+  "5": "半年度"
+};
+exports.cycleType = cycleType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.3",
+  "version": "1.12.4-beta.1",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -144,7 +144,7 @@
     "react-transition-group": "4.4.2",
     "resize-observer-polyfill": "1.5.1",
     "slick-carousel": "1.8.1",
-    "tita-ui": "1.2.52",
+    "tita-ui": "1.2.56",
     "url-parse": "1.5.1",
     "uuid": "3.1.0",
     "viewerjs": "1.10.1",