@zgfe/business-lib 1.2.58-ljy.0 → 1.2.66-hxd.2

package/es/formulaTarget/components/symbol/index.less

@@ -1,49 +1,49 @@
-.formula-symbol {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 16px;
-  height: 16px;
-  margin: 0 4px;
-  color: #354354;
-
-  &-group {
-    display: flex;
-    align-items: center;
-  }
-  &-item {
-    color: #b9ceff;
-    cursor: pointer;
-    &.active {
-      color: #354354;
-    }
-  }
-
-  &-line {
-    width: 1px;
-    height: 16px;
-    margin: 0 12px;
-    background-color: #e6e7ea;
-  }
-
-  &-pop {
-    &.ant-popover-placement-top,
-    &.ant-popover-placement-topLeft,
-    &.ant-popover-placement-topRight {
-      padding-bottom: 0px;
-    }
-    .ant-popover-inner {
-      border-radius: 10px;
-    }
-    .ant-popover-inner-content {
-      padding: 8px 16px;
-    }
-    .ant-popover-content {
-      margin-bottom: 8px;
-    }
-    // .ant-popover-arrow {
-    //   display: none;
-    //   transform: none;
-    // }
-  }
-}
+.formula-symbol {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  height: 16px;
+  margin: 0 4px;
+  color: #354354;
+
+  &-group {
+    display: flex;
+    align-items: center;
+  }
+  &-item {
+    color: #b9ceff;
+    cursor: pointer;
+    &.active {
+      color: #354354;
+    }
+  }
+
+  &-line {
+    width: 1px;
+    height: 16px;
+    margin: 0 12px;
+    background-color: #e6e7ea;
+  }
+
+  &-pop {
+    &.ant-popover-placement-top,
+    &.ant-popover-placement-topLeft,
+    &.ant-popover-placement-topRight {
+      padding-bottom: 0px;
+    }
+    .ant-popover-inner {
+      border-radius: 10px;
+    }
+    .ant-popover-inner-content {
+      padding: 8px 16px;
+    }
+    .ant-popover-content {
+      margin-bottom: 8px;
+    }
+    // .ant-popover-arrow {
+    //   display: none;
+    //   transform: none;
+    // }
+  }
+}

package/es/formulaTarget/styles/index.less

@@ -1,74 +1,74 @@
-@import '../../assets/styles/inner.less';
-
-.biz-formula-target {
-  &:hover {
-    .biz-formula-target-title-option {
-      display: flex;
-    }
-    .formula-container-option:not(.active) {
-      display: flex;
-      color: #b9ceff;
-      &.disabled {
-        color: #ccd0d4;
-      }
-    }
-  }
-
-  &-title {
-    margin-bottom: 12px;
-    &-panel {
-      display: flex;
-      align-items: center;
-      height: 24px;
-      color: @text-color-secondary;
-    }
-    &-content {
-      .ant-input {
-        padding: 0 4px;
-
-        &:focus,
-        &.focused,
-        &.ant-input-focused {
-          background: #fff !important;
-          border: 1px solid @primary-color;
-          box-shadow: none !important;
-        }
-      }
-    }
-
-    &-option {
-      display: none;
-      align-items: center;
-      color: #67727f;
-      &.show {
-        display: flex;
-      }
-      & > div {
-        height: 24px;
-        padding: 0px 8px;
-        line-height: 24px;
-        cursor: pointer;
-      }
-
-      &-icon {
-        margin: 0 8px;
-        font-size: 16px !important;
-        cursor: pointer;
-      }
-
-      .primary {
-        color: @primary-color;
-      }
-      .disable {
-        cursor: not-allowed;
-      }
-      .delete:not(.disable):hover {
-        color: @error-color;
-      }
-    }
-  }
-
-  &-error {
-    color: @error-color;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-formula-target {
+  &:hover {
+    .biz-formula-target-title-option {
+      display: flex;
+    }
+    .formula-container-option:not(.active) {
+      display: flex;
+      color: #b9ceff;
+      &.disabled {
+        color: #ccd0d4;
+      }
+    }
+  }
+
+  &-title {
+    margin-bottom: 12px;
+    &-panel {
+      display: flex;
+      align-items: center;
+      height: 24px;
+      color: @text-color-secondary;
+    }
+    &-content {
+      .ant-input {
+        padding: 0 4px;
+
+        &:focus,
+        &.focused,
+        &.ant-input-focused {
+          background: #fff !important;
+          border: 1px solid @primary-color;
+          box-shadow: none !important;
+        }
+      }
+    }
+
+    &-option {
+      display: none;
+      align-items: center;
+      color: #67727f;
+      &.show {
+        display: flex;
+      }
+      & > div {
+        height: 24px;
+        padding: 0px 8px;
+        line-height: 24px;
+        cursor: pointer;
+      }
+
+      &-icon {
+        margin: 0 8px;
+        font-size: 16px !important;
+        cursor: pointer;
+      }
+
+      .primary {
+        color: @primary-color;
+      }
+      .disable {
+        cursor: not-allowed;
+      }
+      .delete:not(.disable):hover {
+        color: @error-color;
+      }
+    }
+  }
+
+  &-error {
+    color: @error-color;
+  }
+}

package/es/hooks/types/subject.d.ts

@@ -1,14 +1,14 @@
-namespace SubjectTypes {
-  export interface Subject {
-    id: number;
-    createTime: Date;
-    createUser: string;
-    createUserId?: number;
-    unit: string;
-    subjectName: string;
-    subjectAlias?: string;
-    appId: number;
-  }
-}
-
-export default SubjectTypes;
+namespace SubjectTypes {
+  export interface Subject {
+    id: number;
+    createTime: Date;
+    createUser: string;
+    createUserId?: number;
+    unit: string;
+    subjectName: string;
+    subjectAlias?: string;
+    appId: number;
+  }
+}
+
+export default SubjectTypes;

package/es/hooks/useBizStore.d.ts

@@ -1,13 +1,15 @@
 import { UserTagsSelectorTypes } from '../userTagsSelector/types';
 import { UserGroupTypes } from '../userGroup/types';
-declare function useBizStore(appId: any): {
+import { AppInfoProps } from '../context';
+declare function useBizStore({ currentApp }: {
+    currentApp: AppInfoProps;
+}): {
     eventGroupList?: import("../attributeSelector/types").EventGroup[] | undefined;
     userPropList?: import("../attributeSelector/types").UserProp[] | undefined;
     envPropList?: import("../attributeSelector/types").EnvProp[] | undefined;
     eventNameMap?: Record<string, import("../attributeSelector/types").AnalysisEvent> | undefined;
     eventIdMap?: Record<number, import("../attributeSelector/types").AnalysisEvent> | undefined;
     useBizStoreLoading: boolean;
-    setUseBizStoreLoading: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     groupLoading: boolean;
     userGroupList: UserGroupTypes.Group[];
     tagList: UserTagsSelectorTypes.Tag[];

package/es/hooks/useBizStore.js

@@ -14,7 +14,8 @@ import { useEffect, useState, useCallback } from 'react';
 import { ajax } from '../utils';
 import Apis from '../constants/apis';
 import convertAttributeData from '../attributeSelector/util';
-function useBizStore(appId) {
+function useBizStore(_ref) {
+  var currentApp = _ref.currentApp;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     userGroupList = _useState2[0],
@@ -62,7 +63,7 @@ function useBizStore(appId) {
     _useState24 = _slicedToArray(_useState23, 2),
     store = _useState24[0],
     setStore = _useState24[1];
-  var _useState25 = useState(true),
+  var _useState25 = useState(false),
     _useState26 = _slicedToArray(_useState25, 2),
     useBizStoreLoading = _useState26[0],
     setUseBizStoreLoading = _useState26[1];
@@ -71,7 +72,7 @@ function useBizStore(appId) {
     ajax(Apis.queryUserGroup, {
       method: 'post',
       data: {
-        appId: appId,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 0,
         includeDefault: true,
         includeToday: true
@@ -82,13 +83,13 @@ function useBizStore(appId) {
     }).finally(function () {
       setGroupLoading(false);
     });
-  }, [appId]);
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
   var queryTags = useCallback(function () {
     setTagLoading(true);
     ajax(Apis.queryAllTags, {
       method: 'post',
       data: {
-        appId: appId,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 0
       }
     }).then(function (res) {
@@ -97,13 +98,13 @@ function useBizStore(appId) {
     }).finally(function () {
       setTagLoading(false);
     });
-  }, [appId]);
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
   var loadEvents = useCallback(function () {
     setLoadEvent(true);
     ajax('/zg/web/v2/data/queryEventMetasOfGroup', {
       method: 'post',
       data: {
-        appId: appId,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 0,
         isAll: true
       }
@@ -111,33 +112,33 @@ function useBizStore(appId) {
       setEventGroups(res.data);
       setLoadEvent(false);
     });
-  }, [appId]);
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
   var loadUserProps = useCallback(function () {
     setLoadUsers(true);
     ajax('/zg/web/v2/appusergroup/getUserPropMeta', {
       method: 'post',
       data: {
-        appId: appId,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 0
       }
     }).then(function (res) {
       setUserProps(res.data);
       setLoadUsers(false);
     });
-  }, [appId]);
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
   var loadEnvList = useCallback(function () {
     setLoadEnv(true);
     ajax('/zg/web/v2/appusergroup/getEventEnvData', {
       method: 'post',
       data: {
-        appId: appId,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 0
       }
     }).then(function (res) {
       setEnvList(res.data.eventEnv);
       setLoadEnv(false);
     });
-  }, [appId]);
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
   useEffect(function () {
     if (loadEnv || loadEvent || loadUsers) return;
     setStore(convertAttributeData({
@@ -151,12 +152,13 @@ function useBizStore(appId) {
     setUseBizStoreLoading(false);
   }, [loadEvent, loadEnv, loadUsers, groupLoading, tagLoading]);
   useEffect(function () {
-    if (!appId) return;
+    if (!currentApp || !currentApp.appId) return;
     setTimer(function (pre) {
       if (pre) {
         clearTimeout(pre);
       }
       return setTimeout(function () {
+        setUseBizStoreLoading(true);
         queryGroups();
         queryTags();
         loadUserProps();
@@ -164,10 +166,9 @@ function useBizStore(appId) {
         loadEnvList();
       }, 300);
     });
-  }, [appId]);
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
   return _objectSpread({
     useBizStoreLoading: useBizStoreLoading,
-    setUseBizStoreLoading: setUseBizStoreLoading,
     groupLoading: groupLoading,
     userGroupList: userGroupList,
     tagList: tagList,

package/es/icon/demo/list.less

@@ -1,32 +1,32 @@
-@size: 64px;
-.item {
-  display: inline-block;
-  width: @size * 3;
-  height: 100px;
-  margin: 0 6px 6px 0;
-  padding-bottom: 12px;
-  text-align: center;
-  vertical-align: bottom;
-  cursor: pointer;
-  &:hover {
-    background: hsv(0, 0, 96%);
-    .icon {
-      font-size: 42px !important;
-    }
-    .label {
-      font-size: 14px;
-    }
-  }
-}
-.icon {
-  display: inline-block;
-  width: @size * 2;
-  height: @size;
-  line-height: @size;
-  transition: all 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.28);
-}
-.label {
-  font-size: 12px;
-  vertical-align: bottom;
-  transition: all 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.28);
-}
+@size: 64px;
+.item {
+  display: inline-block;
+  width: @size * 3;
+  height: 100px;
+  margin: 0 6px 6px 0;
+  padding-bottom: 12px;
+  text-align: center;
+  vertical-align: bottom;
+  cursor: pointer;
+  &:hover {
+    background: hsv(0, 0, 96%);
+    .icon {
+      font-size: 42px !important;
+    }
+    .label {
+      font-size: 14px;
+    }
+  }
+}
+.icon {
+  display: inline-block;
+  width: @size * 2;
+  height: @size;
+  line-height: @size;
+  transition: all 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.28);
+}
+.label {
+  font-size: 12px;
+  vertical-align: bottom;
+  transition: all 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.28);
+}

package/es/index.d.ts

@@ -10,6 +10,7 @@ import BizConditionGroup from './attrConditions/group';
 import BizDatePicker from './datePicker';
 import BizQuickDatePicker from './quickDatePicker';
 import BizLoading from './loading';
+import BizEmpty from './empty';
 import BizSelect from './select';
 import BizDialog from './dialog';
 import BizChart from './chart';
@@ -49,7 +50,8 @@ import useSubject from './hooks/useSubject';
 import BizPlatformSelector from './platformSelector';
 import DataSetGroup from './dataSetGroup';
 import BizDatePickerV2 from './datePickerV2';
-export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerV2, BizPlatformSelector, };
+import ValuesList from './attrConditions/components/valuesList';
+export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizEmpty, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerV2, BizPlatformSelector, ValuesList, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizProductConditionT } from './productCondition/types';
 export type { BizSelectTypes } from './select/types';

package/es/index.js

@@ -9,6 +9,7 @@ import BizConditionGroup from './attrConditions/group';
 import BizDatePicker from './datePicker';
 import BizQuickDatePicker from './quickDatePicker';
 import BizLoading from './loading';
+import BizEmpty from './empty';
 import BizSelect from './select';
 import BizDialog from './dialog';
 import BizChart from './chart';
@@ -48,4 +49,5 @@ import useSubject from './hooks/useSubject';
 import BizPlatformSelector from './platformSelector';
 import DataSetGroup from './dataSetGroup';
 import BizDatePickerV2 from './datePickerV2';
-export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerV2, BizPlatformSelector };
+import ValuesList from './attrConditions/components/valuesList';
+export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizEmpty, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerV2, BizPlatformSelector, ValuesList };

package/es/layout/analysisLayout/demo/index.less

@@ -1,12 +1,12 @@
-/*demo数据*/
-.root {
-  width: 100%;
-  height: 300px;
-  overflow: auto;
-  border: 1px solid #ecedf0;
-}
-
-.left-content {
-  width: 100%;
-  // height: 400px;
-}
+/*demo数据*/
+.root {
+  width: 100%;
+  height: 300px;
+  overflow: auto;
+  border: 1px solid #ecedf0;
+}
+
+.left-content {
+  width: 100%;
+  // height: 400px;
+}