@titaui/pc 1.15.40-beta.10 → 1.15.40-beta.13

package/lib/components/okr-excel/hooks.js

@@ -85,7 +85,7 @@ function createDefaultOptions(cacheOptionDic, columns) {
   columns.forEach(function (item, idx) {
     optionDic[item.field] = {
       key: item.field,
-      hide: false,
+      hide: item.hide || false,
       width: item.width,
       idx: idx
     }; // 如果存在缓存，则复用现有的显示状态，避免在重置缓存后让用户以为是BUG

package/lib/components/okr-excel/index.js

@@ -71,21 +71,25 @@ var App = function App(_ref2) {
   }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
     field: dicData['类型'],
     valueGetter: 'data.okrType',
+    hide: true,
     width: 100,
     cellRenderer: _renders.okrTypeRenderer
   }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
     field: dicData['负责人'],
     valueGetter: 'data.principalUser.name',
+    hide: true,
     width: 100,
     cellRenderer: _renders.userRenderer
   }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
     field: dicData['对齐目标'],
     valueGetter: 'data.parentPrincipal.principalName',
-    width: 100
+    width: 100,
+    hide: true
   }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
     field: dicData['可见范围'],
     valueGetter: 'data.visibility',
     width: 100,
+    hide: true,
     cellRenderer: _renders.visibilityRenderer
   }), _objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
     field: dicData['目标完成度'],
@@ -96,7 +100,8 @@ var App = function App(_ref2) {
     field: dicData['目标最新进展'],
     valueGetter: 'data.progressDescription',
     cellRenderer: _renders.tooltipRenderer,
-    width: 200
+    width: 200,
+    hide: true
   }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
     field: dicData['关键成果（KR）'],
     valueGetter: 'data.Kr.mileStoneName',
@@ -106,11 +111,13 @@ var App = function App(_ref2) {
     field: dicData['KR 负责人'],
     valueGetter: 'data.Kr.user.name',
     width: 100,
+    hide: true,
     cellRenderer: _renders.krUserRenderer
   }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
     field: dicData['权重'],
     valueGetter: 'data.Kr.krWeight',
     width: 80,
+    hide: true,
     cellRenderer: _renders.krWeightRenderer
   }), _objectSpread(_objectSpread({}, defaultColumnOption), {}, {
     field: dicData['信心指数'],

package/lib/components/okr-filter-drawer/filter-form.js

@@ -85,6 +85,10 @@ var getOkrClassifyList = function getOkrClassifyList() {
 
 var getOrderTypeList = function getOrderTypeList() {
   return [{
+    label: '自定义排序',
+    value: 0,
+    toolTip: '自定义排序'
+  }, {
     label: (0, _getLocale.getLocale)("OKR_MyO_Text_Firstcreated"),
     value: 2,
     toolTip: (0, _getLocale.getLocale)("OKR_MyO_Text_First")
@@ -115,7 +119,7 @@ var Filter = function Filter(_ref) {
     var values = useLocalStorage.getItem("okr-filter-values") || {
       okrType: "",
       okrClassify: "",
-      orderType: 2
+      orderType: 0
     };
     return values;
   }),
@@ -163,7 +167,7 @@ var Filter = function Filter(_ref) {
       useLocalStorage.setItem("okr-filter-values", {
         okrType: "",
         okrClassify: "",
-        orderType: 2
+        orderType: 0
       });
     }
 

package/lib/components/okr-flow/child-node/fields/creator.js

@@ -116,7 +116,7 @@ function Creator(_ref) {
   var generalCanvas = function generalCanvas() {
     var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "text";
     var userName = arguments.length > 1 ? arguments[1] : undefined;
-    var font = "normal 24px/30px Arial,Verdana,Helvetica Neue,Helvetica,sans-serif,PingFang SC,Microsoft YaHei";
+    var font = "normal 36px/36px Arial,Verdana,Helvetica Neue,Helvetica,sans-serif,PingFang SC,Microsoft YaHei";
     var canvas = document.createElement("canvas");
     var ctx = canvas.getContext("2d");
     ctx.font = font;
@@ -125,7 +125,7 @@ function Creator(_ref) {
         width = _ctx$measureText.width;
 
     var actualWidth = Math.min(width, 184);
-    (0, _openDataPainter.setSize)(canvas, ctx, actualWidth, 48); // 设置画布尺寸
+    (0, _openDataPainter.setSize)(canvas, ctx, actualWidth, 72); // 设置画布尺寸
 
     setImgwidth(actualWidth);
     ctx.textBaseline = "middle";
@@ -167,10 +167,9 @@ function Creator(_ref) {
     src: darkTheme ? whiteImg : normalImg,
     style: {
       maxWidth: 92,
-      marginLeft: 4,
-      transform: 'translateY(-20%)'
+      marginLeft: 4
     },
-    width: Number(imgWidth) / 2
+    width: Number(imgWidth) / 3
   }));
 }
 

package/lib/pages/new-okr-list/header/index.js

@@ -86,7 +86,9 @@ var viewConfig = function viewConfig() {
 };
 
 var isSelfTenant = function isSelfTenant() {
-  return ['352728', '564003', '511477'].includes((0, _bsGlobal.getBSGlobal)('tenantInfo').Id);
+  return ['352728', '564003', '511477', // 正式环境
+  '500019', '500017', '500011' // 测试环境
+  ].includes(String((0, _bsGlobal.getBSGlobal)('tenantInfo').Id));
 };
 
 function Header(props, ref) {

package/lib/pages/new-okr-list/index.js

@@ -111,7 +111,10 @@ var NewOkrList = function NewOkrList(props) {
   var formFieldValues = useLocalStorage.getItem("okr-filter-values") || {
     targetType: "",
     targetCategory: "",
-    targetSort: ""
+    targetSort: "",
+    okrType: "",
+    okrClassify: "",
+    orderType: 0
   };
 
   var filterCycle = function () {

package/lib/pages/new-okr-list/list/index.js

@@ -41,10 +41,13 @@ function List(props) {
   var _useContext = (0, _react.useContext)(_context.Context),
       annualNum = _useContext.annualNum,
       cycleType = _useContext.cycleType,
-      yqmNum = _useContext.yqmNum;
+      yqmNum = _useContext.yqmNum,
+      orderType = _useContext.orderType;
 
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(OkrListCmp, {
+    orderType: orderType,
     okrData: okrs,
+    setData: setOkrs,
     cycle: {
       annualNum: annualNum,
       cycleType: cycleType,

package/lib/utils/open-data.js

@@ -9,12 +9,12 @@ exports.parseTag = exports.parseStringV2 = exports.parseString = exports.parseOp
 
 var _react = _interopRequireWildcard(require("react"));
 
+var Sentry = _interopRequireWildcard(require("@sentry/browser"));
+
 var _bsGlobal = require("./bs-global");
 
 var _openDataPainter = require("../components/open-data-painter");
 
-var _helpers = require("./helpers");
-
 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); }
 
 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; }
@@ -77,60 +77,13 @@ function openData() {
   var _getBSGlobal;
 
   // 企业微信租户 && 非自建应用
-  if ((getSource() === WX_SOURCE || getUA().includes(WX_UA_STR)) && ((_getBSGlobal = (0, _bsGlobal.getBSGlobal)('tenantInfo')) === null || _getBSGlobal === void 0 ? void 0 : _getBSGlobal.corpCreateType) !== 2 // 2:自建应用
-  ) {
-    // 企业微信初始化失败
-    // if (!window.WWOpenData && !window.top.WWOpenData) {
-    //   return (p) => {
-    //     if (p.name == undefined || p.id == undefined) {
-    //       try {
-    //         errorLog(1, JSON.stringify({
-    //           errorType: 'WWOpenData is undefined',
-    //           pName: p.name == undefined ? 'undefined' : p.name,
-    //           pId: p.id == undefined ? 'undefined' : p.id,
-    //           pType: p.type,
-    //         }))
-    //       } catch (e) {
-    //         console.log(e)
-    //       }
-    //     }
-    //     return p.name || p.id || null
-    //   }
-    // }
+  if ((getSource() === WX_SOURCE || getUA().includes(WX_UA_STR)) && (_getBSGlobal = (0, _bsGlobal.getBSGlobal)('tenantInfo')) !== null && _getBSGlobal !== void 0 && _getBSGlobal.isTranslate) {
     return function (p) {
       var pId = p.id,
           pName = p.name,
           pCorpId = p.corpId,
           pType = p.type;
       var ref = (0, _react.useRef)(null);
-      (0, _react.useEffect)(function () {
-        var openId = pCorpId || getOpenId(pId, pType);
-
-        if (!openId) {
-          if (pId !== undefined && !ignorePIds.includes(pId)) {
-            try {
-              // BSGlobal
-              var openIds;
-
-              if (pType === 'userName') {
-                openIds = (0, _bsGlobal.getBSGlobal)('openIds');
-              } else if (pType === 'departmentName') {
-                openIds = (0, _bsGlobal.getBSGlobal)('openDepartmentIds');
-              }
-
-              (0, _helpers.errorLog)(1, JSON.stringify({
-                errorType: 'openId 不存在',
-                pName: pName === undefined ? 'undefined' : pName,
-                pId: pId === undefined ? 'undefined' : pId,
-                pType: pType,
-                openIds: openIds
-              }));
-            } catch (e) {
-              console.log(e);
-            }
-          }
-        }
-      }, [pId, pName]);
       (0, _react.useLayoutEffect)(function () {
         var _ref;
 
@@ -146,21 +99,19 @@ function openData() {
       var openId = pCorpId || getOpenId(pId, pType);
 
       if (!openId) {
-        if (pId !== undefined && !ignorePIds.includes(pId)) {// Sentry.withScope((scope) => {
-          //   scope.setTag('error-level', 'P1')
-          //   scope.setTag('error-type', '企业微信openData调用失败')
-          //   scope.setExtra('fail_type', pType)
-          //   scope.setExtra('p_id', pId)
-          //   scope.setExtra('p_name', pName)
-          //   scope.setExtra('corp_id', pCorpId)
-          //   scope.setExtra('open_id', getOpenId(pId, pType))
-          //   p.callFunc && scope.setExtra('fail_callFunc', p.callFunc)
-          //   p.extra && scope.setExtra('fail_extra', p.extra)
-          //   Sentry.captureException(
-          //     new Error('企业微信openData调用失败'),
-          //     scope,
-          //   )
-          // })
+        if (pId !== undefined && !ignorePIds.includes(pId)) {
+          Sentry.withScope(function (scope) {
+            scope.setTag('error-level', 'P1');
+            scope.setTag('error-type', 'openId不存在');
+            scope.setExtra('fail_type', pType);
+            scope.setExtra('p_id', pId);
+            scope.setExtra('p_name', pName);
+            scope.setExtra('corp_id', pCorpId);
+            scope.setExtra('open_id', getOpenId(pId, pType));
+            p.callFunc && scope.setExtra('fail_callFunc', p.callFunc);
+            p.extra && scope.setExtra('fail_extra', p.extra);
+            Sentry.captureException(new Error('企业微信openData调用失败'), scope);
+          });
         }
 
         return pName || pId || null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.40-beta.10",
+  "version": "1.15.40-beta.13",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",