@titaui/pc 1.12.9-beta.4 → 1.12.9-beta.5

package/lib/components/menus/export-modules/demo-menus/menu-highlight.js

@@ -25,7 +25,7 @@ var _default = /*#__PURE__*/function () {
   _createClass(_default, [{
     key: "highlight",
     value: function highlight(cb) {
-      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);else if (this.isRechargeList()) cb(_menus.PAGE_RECHARGE_LIST);else if (this.isRechargeStatistics()) cb(_menus.PAGE_RECHARGE_STATISTICS);else if (this.isRechargeStatus()) cb(_menus.PAGE_RECHARGE_STATUS);else if (this.isDueDateOrder()) cb(_menus.PAGE_DUEDATE_ORDER);
+      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);else if (this.isRechargeList()) cb(_menus.PAGE_RECHARGE_LIST);else if (this.isRechargeStatistics()) cb(_menus.PAGE_RECHARGE_STATISTICS);else if (this.isRechargeStatus()) cb(_menus.PAGE_RECHARGE_STATUS);else if (this.isDueDateOrder()) cb(_menus.PAGE_DUEDATE_ORDER);else if (this.isAllCustomer()) cb(_menus.PAGE_ALL_CUSTOMER);else if (this.isPublicCustomer()) cb(_menus.PAGE_PUBLIC_CUSTOMER);else if (this.isMyCustomer()) cb(_menus.PAGE_MY_CUSTOMER);
     }
   }, {
     key: "isChart",
@@ -102,6 +102,24 @@ var _default = /*#__PURE__*/function () {
           search = _this$history$locatio5.search;
       return pathname.match(/demofree/) && search.match(/selected[\s]*?=[\s]*?ignore/);
     }
+  }, {
+    key: "isPublicCustomer",
+    value: function isPublicCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/public/);
+    }
+  }, {
+    key: "isMyCustomer",
+    value: function isMyCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/my/);
+    }
+  }, {
+    key: "isAllCustomer",
+    value: function isAllCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/all/);
+    }
   }]);
 
   return _default;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_RECHARGE_STATUS = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DUEDATE_ORDER = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_ASSIGNED_DEMOFREE = void 0;
+exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_RECHARGE_STATUS = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_PUBLIC_CUSTOMER = exports.PAGE_MY_CUSTOMER = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DUEDATE_ORDER = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_CHARTS = exports.PAGE_ASSIGNED_DEMOFREE = exports.PAGE_ALL_CUSTOMER = void 0;
 
 var _index = require("../../components/menu-tree/tree-node/index");
 
@@ -40,6 +40,14 @@ var PAGE_IGNORED_DEMOFREE = "ignore";
 exports.PAGE_IGNORED_DEMOFREE = PAGE_IGNORED_DEMOFREE;
 var PAGE_CHARTS_DEMOFREE = "charts";
 exports.PAGE_CHARTS_DEMOFREE = PAGE_CHARTS_DEMOFREE;
+var PAGE_ALL_CUSTOMER = "allCustomer";
+exports.PAGE_ALL_CUSTOMER = PAGE_ALL_CUSTOMER;
+var PAGE_PUBLIC_CUSTOMER = "publicCustomer";
+exports.PAGE_PUBLIC_CUSTOMER = PAGE_PUBLIC_CUSTOMER;
+var PAGE_MY_CUSTOMER = "myCustomer";
+exports.PAGE_MY_CUSTOMER = PAGE_MY_CUSTOMER;
+var PAGE_CHARTS = "charts";
+exports.PAGE_CHARTS = PAGE_CHARTS;
 var PAGE_RECHARGE_LIST = "rechargeList";
 exports.PAGE_RECHARGE_LIST = PAGE_RECHARGE_LIST;
 var PAGE_DUEDATE_ORDER = "dueDateOrder";
@@ -91,6 +99,31 @@ var DemoMenuData = /*#__PURE__*/function () {
         href: "#/demofree/list?selected=ignore",
         isShow: this.isManager === EManagerType.Manager
       }]
+    }, {
+      icon: "KH-help",
+      label: "公海资源",
+      key: "customer",
+      href: "#/demofree/customer/public",
+      isShow: true,
+      children: [{
+        icon: "",
+        label: "全部客户",
+        key: PAGE_ALL_CUSTOMER,
+        href: "#/demofree/customer/all",
+        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+      }, {
+        icon: "",
+        label: "公海资源",
+        key: PAGE_PUBLIC_CUSTOMER,
+        href: "#/demofree/customer/public",
+        isShow: this.isManager !== EManagerType.ReCharge
+      }, {
+        icon: "",
+        label: "我的资源",
+        key: PAGE_MY_CUSTOMER,
+        href: "#/demofree/customer/my",
+        isShow: this.isManager !== EManagerType.ReCharge
+      }]
     }, {
       icon: "KH-help",
       label: "客户续费",

package/lib/components/okr-flow/export-modal/index.js

@@ -232,41 +232,29 @@ var ExportMapModal = function ExportMapModal(props) {
                   scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
                 });
                 (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(',')[1]).then(function (url) {
-                  var image = new Image(); // @ts-ignore
+                  // const image = new Image()
+                  // @ts-ignore
                   // window.titaTracker && window.titaTracker("action").record({
                   //   actionName: userId+'租户：'+telentId+'我获得了地址'+url.Data.obj,
                   //   actionGroup: 'okr地图接口',
                   //   productName: 'okr地图导出',
                   // });
-
                   Sentry.withScope(function (scope) {
                     scope.setTag('error-level', "P0");
                     scope.setTag('error-type', '地图导出-图片地址');
                     scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
                   });
-
-                  _toast["default"].Warning('图片上传成功，准备本地下载', {
-                    canClose: true
-                  });
-
-                  image.setAttribute('crossOrigin', 'anonymous');
-
-                  image.onload = function () {
-                    if (!url.Data.obj) {
-                      _toast["default"].Error('导出失败，请稍后重试', {
-                        canClose: false
-                      });
-                    }
-
-                    var a = document.createElement('a'); // 生成一个a元素
-
-                    var event = new MouseEvent('click'); // 创建一个单击事件
-
-                    a.download = 'okr地图'; // 设置图片名称
-
-                    a.href = url.Data.obj; // 将生成的URL设置为a
-
-                    a.dispatchEvent(event); // 触发a的单击事件
+                  var newUrl = url.Data.obj;
+                  var x = new XMLHttpRequest();
+                  x.open("GET", newUrl, true);
+                  x.responseType = 'blob';
+
+                  x.onload = function (e) {
+                    var url = window.URL.createObjectURL(x.response);
+                    var a = document.createElement('a');
+                    a.href = url;
+                    a.download = model.value === 20 ? '高清图片' : '标准图片';
+                    a.click();
 
                     _toast["default"].Success('导出成功');
 
@@ -277,7 +265,24 @@ var ExportMapModal = function ExportMapModal(props) {
                     }
                   };
 
-                  image.src = imgUrl;
+                  x.send(); // image.setAttribute('crossOrigin', 'anonymous')
+                  // image.onload = async() => {
+                  //   if (!url.Data.obj) {
+                  //     Toast.Error('导出失败，请稍后重试', { canClose: false })
+                  //   }
+                  //   await downloadFile(url.Data.obj,model.value===20?'高清分享图片':'标准分享图片')
+                  //   // const a = document.createElement('a') // 生成一个a元素
+                  //   // const event = new MouseEvent('click') // 创建一个单击事件
+                  //   // a.download = '123' // 设置图片名称
+                  //   // a.href = url.Data.obj // 将生成的URL设置为a
+                  //   // a.dispatchEvent(event) // 触发a的单击事件
+                  //   Toast.Success('导出成功')
+                  //   setIsExport(false)
+                  //   if (onCloseHandler) {
+                  //     onCloseHandler()
+                  //   }
+                  // }
+                  // image.src = imgUrl
                 });
               })["catch"](function (err) {
                 setIsExport(false);

package/lib/components/user-selector/category-selector-panel/index.js

@@ -80,6 +80,7 @@ function _default(props) {
           tabPane: true
         }
       }, Object.keys(panes).map(function (panelKey) {
+        if (!panes[panelKey]) return;
         var _getPanesConfig$panel = (0, _constant.getPanesConfig)()[panelKey],
             label = _getPanesConfig$panel.label,
             Component = _getPanesConfig$panel.Component;

package/lib/components/user-selector/request-apis.js

@@ -160,27 +160,39 @@ var search = function search(_ref4) {
   var searchKey = _ref4.searchKey,
       departOnly = _ref4.departOnly,
       searchUserOnly = _ref4.searchUserOnly,
-      sourceFrom = _ref4.sourceFrom,
+      panes = _ref4.panes,
+      _ref4$auth = _ref4.auth,
+      auth = _ref4$auth === void 0 ? false : _ref4$auth,
       _ref4$isVerify = _ref4.isVerify,
       isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify;
-  var args = [];
+  var isGetUser = true;
+  var isGetDep = false;
+  var isGetGroup = false;
+  var depart = panes.depart,
+      group = panes.group;
+
+  if (depart) {
+    isGetDep = true;
+  }
+
+  if (group) {
+    isGetGroup = true;
+  }
 
   if (departOnly) {
-    args.push("isGetUser=false&isGetDep=true&isGetGroup=false");
-  } else if (searchUserOnly) {
-    args.push("isGetUser=true&isGetDep=false&isGetGroup=false");
-  } else {
-    args.push("isGetUser=true&isGetDep=true&isGetGroup=true");
+    isGetUser = false;
   }
 
-  ;
+  if (searchUserOnly) {
+    isGetDep = false;
+    isGetGroup = false;
+  }
 
-  if (!!sourceFrom) {
-    // 这个是遗留的管控群组的，后面逐步替换掉
+  if (auth) {
     isVerify = true;
   }
 
-  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWord=").concat(searchKey, "&isVerify=").concat(isVerify, "&").concat(args[0])).then(function (searchRes) {
+  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWord=").concat(searchKey, "&isVerify=").concat(isVerify, "&isGetUser=").concat(isGetUser, "&isGetDep=").concat(isGetDep, "&isGetGroup=").concat(isGetGroup)).then(function (searchRes) {
     return searchRes.data;
   });
 };

package/lib/components/user-selector/searched-panel/index.js

@@ -61,6 +61,7 @@ function _default(props) {
       departOnly = _useContext.departOnly,
       searchUserOnly = _useContext.searchUserOnly,
       sourceFrom = _useContext.sourceFrom,
+      auth = _useContext.auth,
       isVerify = _useContext.isVerify,
       _useContext$panes = _useContext.panes,
       panes = _useContext$panes === void 0 ? {
@@ -100,7 +101,8 @@ function _default(props) {
       searchKey: searchKey,
       departOnly: departOnly,
       searchUserOnly: searchUserOnly,
-      sourceFrom: sourceFrom,
+      auth: auth,
+      panes: panes,
       isVerify: isVerify
     }).then(function (res) {
       var Code = res.Code,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.9-beta.4",
+  "version": "1.12.9-beta.5",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",