@zgfe/business-lib 1.2.70-hxd.9 → 1.2.71-hxd.1

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

@@ -1,139 +1,139 @@
-@import '../../../assets/styles/inner.less';
-
-.formula-panel {
-  .__select-panel();
-  display: flex;
-  flex-direction: column;
-  width: fit-content;
-  min-width: 328px;
-  max-width: 700px;
-  height: 368px;
-  padding: 0;
-  background: #fff;
-
-  &-content {
-    display: flex;
-    height: 320px;
-  }
-
-  &-left {
-    width: 76px;
-    height: 100%;
-    padding: 8px;
-    border-right: 1px solid #ecedf0;
-    &-item {
-      .__select-option();
-    }
-  }
-
-  &-right {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-    padding: 12px 8px;
-
-    &-search {
-      width: 100%;
-      margin-bottom: 12px;
-    }
-
-    &-list {
-      max-height: calc(100% - 44px);
-      // flex: 1;
-
-      overflow: auto;
-    }
-    &-item {
-      .__select-option();
-    }
-
-    &-number.ant-input-number {
-      min-width: 184px;
-      background-color: @background-color-base;
-      border: 1px solid @background-color-base;
-      border-radius: @border-radius-small;
-      &:hover,
-      &.ant-input-number-focused {
-        background-color: #fff;
-        border-color: @primary-color;
-      }
-    }
-  }
-
-  &-detail {
-    width: 100%;
-    height: 100%;
-
-    &-title {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      height: 48px;
-      padding: 0 12px;
-      border-bottom: 1px solid #f2f3f4;
-      &-left {
-        display: flex;
-        align-items: center;
-        &-icon {
-          margin-right: 10px;
-          color: @text-color-secondary;
-          font-size: 16px !important;
-          line-height: 16px;
-          cursor: pointer;
-        }
-      }
-
-      &-right {
-        display: flex;
-        align-items: center;
-        margin-right: 4px;
-        margin-left: 16px;
-        color: #9aa1a9;
-        cursor: pointer;
-        .bsicon {
-          margin-right: 8px;
-          font-size: 16px !important;
-        }
-
-        &:hover {
-          color: @primary-color;
-        }
-      }
-    }
-
-    &-content {
-      display: flex;
-      flex-direction: column;
-      max-height: calc(100% - 48px);
-      padding: 12px;
-      overflow: auto;
-
-      .biz-attr-condition:not(:last-child) {
-        margin-bottom: 12px;
-      }
-    }
-  }
-
-  &-footer {
-    display: flex;
-    align-items: center;
-    justify-content: end;
-    padding: 8px 16px;
-    border-top: 1px solid #ecedf0;
-
-    .ant-btn:not(:last-child) {
-      margin-right: 16px;
-    }
-    .ant-btn-text {
-      &:hover {
-        color: @error-color !important;
-        background: #f2f3f4 !important;
-      }
-    }
-  }
-
-  &-error {
-    color: @error-color;
-  }
-}
+@import '../../../assets/styles/inner.less';
+
+.formula-panel {
+  .__select-panel();
+  display: flex;
+  flex-direction: column;
+  width: fit-content;
+  min-width: 328px;
+  max-width: 700px;
+  height: 368px;
+  padding: 0;
+  background: #fff;
+
+  &-content {
+    display: flex;
+    height: 320px;
+  }
+
+  &-left {
+    width: 76px;
+    height: 100%;
+    padding: 8px;
+    border-right: 1px solid #ecedf0;
+    &-item {
+      .__select-option();
+    }
+  }
+
+  &-right {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+    padding: 12px 8px;
+
+    &-search {
+      width: 100%;
+      margin-bottom: 12px;
+    }
+
+    &-list {
+      max-height: calc(100% - 44px);
+      // flex: 1;
+
+      overflow: auto;
+    }
+    &-item {
+      .__select-option();
+    }
+
+    &-number.ant-input-number {
+      min-width: 184px;
+      background-color: @background-color-base;
+      border: 1px solid @background-color-base;
+      border-radius: @border-radius-small;
+      &:hover,
+      &.ant-input-number-focused {
+        background-color: #fff;
+        border-color: @primary-color;
+      }
+    }
+  }
+
+  &-detail {
+    width: 100%;
+    height: 100%;
+
+    &-title {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 48px;
+      padding: 0 12px;
+      border-bottom: 1px solid #f2f3f4;
+      &-left {
+        display: flex;
+        align-items: center;
+        &-icon {
+          margin-right: 10px;
+          color: @text-color-secondary;
+          font-size: 16px !important;
+          line-height: 16px;
+          cursor: pointer;
+        }
+      }
+
+      &-right {
+        display: flex;
+        align-items: center;
+        margin-right: 4px;
+        margin-left: 16px;
+        color: #9aa1a9;
+        cursor: pointer;
+        .bsicon {
+          margin-right: 8px;
+          font-size: 16px !important;
+        }
+
+        &:hover {
+          color: @primary-color;
+        }
+      }
+    }
+
+    &-content {
+      display: flex;
+      flex-direction: column;
+      max-height: calc(100% - 48px);
+      padding: 12px;
+      overflow: auto;
+
+      .biz-attr-condition:not(:last-child) {
+        margin-bottom: 12px;
+      }
+    }
+  }
+
+  &-footer {
+    display: flex;
+    align-items: center;
+    justify-content: end;
+    padding: 8px 16px;
+    border-top: 1px solid #ecedf0;
+
+    .ant-btn:not(:last-child) {
+      margin-right: 16px;
+    }
+    .ant-btn-text {
+      &:hover {
+        color: @error-color !important;
+        background: #f2f3f4 !important;
+      }
+    }
+  }
+
+  &-error {
+    color: @error-color;
+  }
+}

package/es/formulaTarget/components/panel/item.js

@@ -63,14 +63,18 @@ var PanelItem = function PanelItem(props) {
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
     value: filterList,
-    showHandle: false,
+    showHandle: !props.onlyAnd,
     enableDelete: true,
     enableEventProp: true,
     enableEnvProp: true,
     enableUserProp: true,
     eventIdList: [props.value.eventId],
     onChange: setFilterList,
+    onlyAnd: props.onlyAnd,
     onConditionsCount: setCount
   })));
 };
+PanelItem.defaultProps = {
+  onlyAnd: true
+};
 export default PanelItem;

package/es/formulaTarget/components/panel/types.d.ts

@@ -5,11 +5,13 @@ export interface FormulaPanelProps {
     onChange?: (data?: FormulaContainerTypes.Value) => void;
     onDelete?: () => void;
     onSubmit?: () => void;
+    onlyAnd?: boolean;
 }
 export interface PanelItemProps {
     value: TargetConditionTypes.Value;
     onBack?: () => void;
     onChange?: (dimension: TargetConditionTypes.DimensionValue, filters?: AttrConditionTypes.GroupValue) => void;
+    onlyAnd?: boolean;
 }
 export declare enum FormulaTypes {
     EVENT = "event",

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/index.d.ts

@@ -1,5 +1,8 @@
 import React from 'react';
 import './styles/index.less';
 import { BizFormulaTargetTypes } from './types';
-declare const BizFormulaTarget: React.FC<BizFormulaTargetTypes.Props>;
+type FCWithDefaultProps<P> = React.FC<P> & {
+    defaultProps?: Partial<P>;
+};
+declare const BizFormulaTarget: FCWithDefaultProps<BizFormulaTargetTypes.Props>;
 export default BizFormulaTarget;

package/es/formulaTarget/index.js

@@ -211,7 +211,8 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     value: condition.customCondition,
     formula: condition.formula,
     resultFormat: condition.resultFormat,
-    onChange: onChange
+    onChange: onChange,
+    onlyAnd: props.onlyAnd
   }));
 };
 BizFormulaTarget.defaultProps = {

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/formulaTarget/types.d.ts

@@ -6,6 +6,7 @@ export declare namespace BizFormulaTargetTypes {
         enableDelete?: boolean;
         onChange?: (data: Value) => void;
         onDelete?: () => void;
+        onlyAnd?: boolean;
     }
     interface Value {
         eventName?: string;

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.js

@@ -14,6 +14,7 @@ import { useEffect, useState, useCallback } from 'react';
 import { ajax } from '../utils';
 import Apis from '../constants/apis';
 import convertAttributeData from '../attributeSelector/util';
+import { eventApi } from '../utils';
 function useBizStore(_ref) {
   var currentApp = _ref.currentApp;
   var _useState = useState([]),
@@ -101,15 +102,8 @@ function useBizStore(_ref) {
   }, [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: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: 0,
-        isAll: true
-      }
-    }).then(function (res) {
-      setEventGroups(res.data);
+    eventApi.fetchAllEvents(currentApp === null || currentApp === void 0 ? void 0 : currentApp.id, 0, false).then(function (eventGroups) {
+      setEventGroups(Array.isArray(eventGroups) ? eventGroups : []);
       setLoadEvent(false);
     });
   }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);