@zgfe/business-lib 1.1.41-attribution.2 → 1.1.41-attribution.3

package/es/addToScene/index.js

@@ -104,7 +104,7 @@ var BizAddToScene = function BizAddToScene(props) {
         });
         return;
       }
-      setGroupList(res.groups);
+      setGroupList(res.data);
     });
   }
   useEffect(function () {

package/es/constants/apis.js

@@ -1,5 +1,5 @@
 var Apis = {
-  querySceneGroup: '/scene/queryScenesOfGroup.jsp',
+  querySceneGroup: '/zg/web/v2/scene/queryScenesOfGroup',
   addScene: '/scene/addScene.jsp',
   esQuery: '/data/queryEsData.jsp',
   addPanel: '/apppanel/addPanelElement.jsp',

package/es/demoWrapper/content.js

@@ -109,16 +109,16 @@ var DemoContent = function DemoContent(_ref3) {
   }, [loadEvent, loadEnv, loadUsers, loadUserGroups]);
   function loadUserGroup() {
     setLoadUserGroups(true);
-    ajax('/analysis/api/common/proxy/usergroup/getAll.jsp', {
+    ajax('/zg/web/v2/userGroup/getAll', {
       method: 'post',
-      params: {
+      data: {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
         platform: 0,
         includeDefault: true,
         includeToday: true
       }
     }).then(function (res) {
-      setUserGroups(res.values.userGroups);
+      setUserGroups(res.data);
       setLoadUserGroups(false);
     });
   }
@@ -151,14 +151,14 @@ var DemoContent = function DemoContent(_ref3) {
   }
   function loadEnvList() {
     setLoadEnv(true);
-    ajax('/analysis/api/common/proxy/appusergroup/getEventEnvData.jsp', {
+    ajax('/zg/web/v2/appusergroup/getEventEnvData', {
       method: 'post',
-      params: {
+      data: {
         app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
         platform: 0
       }
     }).then(function (res) {
-      setEnvList(res.event_env);
+      setEnvList(res.data.eventEnv);
       setLoadEnv(false);
     });
   }

package/es/demoWrapper/index.js

@@ -36,8 +36,9 @@ var DemoWrapper = function DemoWrapper(_ref) {
     getCurrentUser();
   }, []);
   function getCurrentUser() {
-    request('/analysis/api/common/proxy/user/getUserInfo.jsp').then(function (res) {
-      if (res.status === 503 || res.ret === '-1') setNotLogin(true);
+    request('/zg/web/v2/user/getUserInfo').then(function (res) {
+      var _res$data;
+      if (res === null || (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.ret) === '-1') setNotLogin(true);
     }).catch(function (err) {
       console.error('获取用户信息失败', err);
     }).finally(function () {

package/es/eventSelector/demo/index.js

@@ -42,7 +42,8 @@ var EventDemo = function EventDemo() {
     showBuiltInTarget: true,
     defaultValue: value,
     alias: "\u522B\u540D",
-    onChange: onChange
+    onChange: onChange,
+    selectList: [24143017, 24256188, 24256187]
   })), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, "\u5F53\u524D\u9009\u62E9\u7684\u4E8B\u4EF6\u662F\uFF1A", JSON.stringify(value))));
 };
 export default (function () {

package/es/eventSelector/index.js

@@ -108,7 +108,8 @@ var BizEventSelector = function BizEventSelector(props) {
         onChange: onChange,
         showOverview: showAllEvent,
         showBuiltInTarget: props.showBuiltInTarget,
-        defaultSelectAble: defaultSelectAble
+        defaultSelectAble: defaultSelectAble,
+        selectList: props.selectList
       });
     },
     trigger: ['click'],

package/es/eventSelector/listPanel.js

@@ -31,6 +31,9 @@ var EventListPanel = function EventListPanel(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     groupList = _useState4[0],
     setGroupList = _useState4[1];
+  useEffect(function () {
+    console.log('groupList', groupList, props.selectList);
+  }, [groupList]);
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     currentGroup = _useState6[0],
@@ -171,6 +174,7 @@ var EventListPanel = function EventListPanel(props) {
     searchValue: searchValue,
     currentGroup: currentGroup,
     currentValue: currentValue,
+    selectList: props.selectList,
     onClick: onClickEvent
   }))));
 };
@@ -180,7 +184,8 @@ var InfiniteScrollList = function InfiniteScrollList(_ref) {
     searchValue = _ref.searchValue,
     currentGroup = _ref.currentGroup,
     currentValue = _ref.currentValue,
-    onClick = _ref.onClick;
+    onClick = _ref.onClick,
+    selectList = _ref.selectList;
   var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
     showList = _useState12[0],
@@ -216,11 +221,17 @@ var InfiniteScrollList = function InfiniteScrollList(_ref) {
     className: "".concat(classPrefix, "-event-item-wrap"),
     key: Math.random()
   }, showList.map(function (e) {
-    var _currentValue$event2;
+    var _currentValue$event2, _currentValue$event3;
+    var _disable = false;
+    console.log(666, e, selectList, selectList === null || selectList === void 0 ? void 0 : selectList.indexOf(e.id));
+    if ((selectList === null || selectList === void 0 ? void 0 : selectList.indexOf(e.id)) !== -1 && (currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$event2 = currentValue.event) === null || _currentValue$event2 === void 0 ? void 0 : _currentValue$event2.id) !== e.id) {
+      _disable = true;
+    }
     return /*#__PURE__*/React.createElement(EventListOption, {
       label: e.alias || e.name,
       key: "".concat(currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id, "-").concat(e.id),
-      checked: (currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$event2 = currentValue.event) === null || _currentValue$event2 === void 0 ? void 0 : _currentValue$event2.id) === e.id,
+      checked: (currentValue === null || currentValue === void 0 ? void 0 : (_currentValue$event3 = currentValue.event) === null || _currentValue$event3 === void 0 ? void 0 : _currentValue$event3.id) === e.id,
+      disable: _disable,
       highlight: {
         enable: true,
         text: searchValue

package/es/eventSelector/option.d.ts

@@ -4,6 +4,7 @@ declare const EventListOption: React.FC<{
     showCount?: boolean;
     count?: number;
     label?: string;
+    disable?: boolean;
     checked?: boolean;
     highlight?: {
         enable: boolean;

package/es/eventSelector/option.js

@@ -10,8 +10,10 @@ var EventListOption = function EventListOption(props) {
     checked = props.checked,
     highlight = props.highlight,
     onClick = props.onClick,
-    data = props.data;
+    data = props.data,
+    disable = props.disable;
   var _onClick = function _onClick() {
+    if (disable) return;
     if (onClick) onClick(data);
   };
   function getLabel(label) {
@@ -28,7 +30,7 @@ var EventListOption = function EventListOption(props) {
     });
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-option ").concat(checked ? 'active' : ''),
+    className: "".concat(classPrefix, "-option ").concat(checked ? 'active' : '', " ").concat(disable ? 'disable' : ''),
     onClick: _onClick
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-option-label"),

package/es/eventSelector/styles/index.less

@@ -73,6 +73,12 @@
         background: @primary-color;
       }
     }
+    &.disable,
+    &.disable:hover {
+      color: #ccd0d4;
+      background: #fff;
+      cursor: not-allowed;
+    }
 
     &-label {
       flex: 1;

package/es/eventSelector/types.d.ts

@@ -30,6 +30,7 @@ export declare namespace EventSelectTypes {
         size?: SizeType;
         destroyPopupOnHide?: boolean;
         onChange?: (val: Value) => void;
+        selectList?: number[];
     }
     interface DropdownProps {
         value?: Value;
@@ -37,5 +38,6 @@ export declare namespace EventSelectTypes {
         showBuiltInTarget?: boolean;
         defaultSelectAble?: boolean;
         onChange?: (value: Value, isOverview?: boolean) => void;
+        selectList?: number[];
     }
 }

package/es/utils/ajax.js

@@ -63,10 +63,8 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
     flag = true;
   } else if (new RegExp("".concat(ResponseStatus.notLogin)).test(apiResult.code)) {
     message = '账户未登录或登录已失效';
-    window.location.href = '/webapp/app/login?destination=' + window.location.href;
   } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
-    window.location.href = '/webapp/app/noPermission';
-    throw new Error(apiResult.msg);
+    message = '账户没有权限';
   }
   if (!flag) {
     message = apiResult.msg || message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.41-attribution.2",
+  "version": "1.1.41-attribution.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "33fd28c8387c8185dd349bbd0e2eb7b473523a60"
+  "gitHead": "3887d8decfcf38b3702580350f5b54bb4a96ef68"
 }