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

package/es/assets/styles/variable.less

@@ -1,21 +1,21 @@
-@import '~antd/es/style/themes/default.less';
-
-@border-radius-sx: 2px;
-@border-radius-small: 4px;
-@border-radius-normal: 8px;
-@border-radius-large: 20px;
-@option-height: @height-base;
-@background-color-gray: #f6f6f6;
-@background-color-table: #f2f3f4;
-
-@icon-width: 24px;
-
-@shadow-color-light: rgba(0, 0, 0, 0.1);
-@box-shadow-small: 0px 1px 2px @shadow-color-light;
-@primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
-@box-shadow-form: 0 0 0 4px @primary-color-hover;
-@text-color-middle: #9aa1a9;
-@custom-background: #fafafb;
-@custom-focus: #f0f7ff;
-@primary-color: '#165dff';
-@input-placeholder-color: #9797af;
+@import '~antd/es/style/themes/default.less';
+
+@border-radius-sx: 2px;
+@border-radius-small: 4px;
+@border-radius-normal: 8px;
+@border-radius-large: 20px;
+@option-height: @height-base;
+@background-color-gray: #f6f6f6;
+@background-color-table: #f2f3f4;
+
+@icon-width: 24px;
+
+@shadow-color-light: rgba(0, 0, 0, 0.1);
+@box-shadow-small: 0px 1px 2px @shadow-color-light;
+@primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
+@box-shadow-form: 0 0 0 4px @primary-color-hover;
+@text-color-middle: #9aa1a9;
+@custom-background: #fafafb;
+@custom-focus: #f0f7ff;
+@primary-color: '#165dff';
+@input-placeholder-color: #9797af;

package/es/attrCondition/group.js

@@ -11,7 +11,8 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
     enableEnvProp = props.enableEnvProp,
     disableItemList = props.disableItemList,
     overlayClassName = props.overlayClassName,
-    extra = props.extra;
+    extra = props.extra,
+    relationConfig = props.relationConfig;
   var _useConditionGroup = useConditionGroup(props, ref),
     loading = _useConditionGroup.loading,
     conditions = _useConditionGroup.conditions,
@@ -61,7 +62,9 @@ var BizAttrConditionGroup = /*#__PURE__*/React.forwardRef(function (props, ref)
       },
       onDelete: function onDelete() {
         return _onDelete(index);
-      }
+      },
+      relationSup: index ? conditions[index - 1] : undefined,
+      relationConfig: relationConfig
     }));
   }))));
 });

package/es/attrCondition/index.js

@@ -23,7 +23,9 @@ var BizAttrCondition = function BizAttrCondition(props) {
     enableEnvProp = props.enableEnvProp,
     disableItemList = props.disableItemList,
     theme = props.theme,
-    overlayClassName = props.overlayClassName;
+    overlayClassName = props.overlayClassName,
+    relationSup = props.relationSup,
+    relationConfig = props.relationConfig;
   var _useAttrCondition = useAttrCondition(props),
     loading = _useAttrCondition.loading,
     attr = _useAttrCondition.attr,
@@ -85,7 +87,9 @@ var BizAttrCondition = function BizAttrCondition(props) {
     defaultValue: values,
     onChange: onChangeValues,
     theme: theme,
-    status: isValueError ? 'error' : ''
+    status: isValueError ? 'error' : '',
+    relationSup: relationSup,
+    relationConfig: relationConfig
   }), isValueError ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-error")
   }, "\u5C5E\u6027\u503C\u4E0D\u53EF\u4E3A\u7A7A") : null), enableDelete && /*#__PURE__*/React.createElement(IconFont, {

package/es/attrCondition/styles/index.less

@@ -1,101 +1,101 @@
-@import '../../assets/styles/inner.less';
-.biz-attr-condition {
-  gap: 16px !important;
-  align-items: flex-start !important;
-  width: 100%;
-  &-btn-del {
-    color: #9aa1a9;
-    font-size: 16px !important;
-    line-height: 32px;
-    &:hover {
-      color: @error-color;
-      cursor: pointer;
-    }
-  }
-  .biz-attr-select-handle {
-    width: 184px;
-    padding: 0;
-  }
-  .ant-space-item:nth-of-type(3) {
-    min-width: 184px;
-    max-width: calc(100% - 320px);
-  }
-  &-group {
-    display: flex;
-    flex-direction: row;
-    .ant-space-item:nth-of-type(3) {
-      min-width: 184px;
-      max-width: calc(100% - 380px);
-    }
-    &-container {
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      gap: 4px;
-      width: 100%;
-      max-width: calc(100% + 33px);
-      margin-left: -33px;
-      &-item {
-        padding: 4px 0 4px 48px;
-        &:hover {
-          background: #e8efff;
-        }
-      }
-    }
-    &-handle {
-      position: relative;
-      width: 1px;
-      margin-right: 0;
-      margin-left: 32px;
-      background: @border-color-base;
-    }
-    &-operate {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      width: 16px;
-      transform: translate(-50%, -50%);
-    }
-    &-operate-text {
-      width: 16px;
-      height: 16px;
-      span {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 100%;
-        height: 100%;
-        font-size: 12px;
-        *font-size: 10px;
-        transform: scale(0.83, 0.83);
-      }
-
-      .__default-hover();
-
-      &:first-child {
-        border-top-left-radius: 3px;
-        border-top-right-radius: 3px;
-      }
-
-      &:last-child {
-        border-bottom-right-radius: 3px;
-        border-bottom-left-radius: 3px;
-      }
-
-      &.active {
-        color: #fff;
-        background: @primary-color;
-      }
-    }
-  }
-
-  &-column {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-  }
-  &-error {
-    padding-left: 4px;
-    color: @error-color;
-  }
-}
+@import '../../assets/styles/inner.less';
+.biz-attr-condition {
+  gap: 16px !important;
+  align-items: flex-start !important;
+  width: 100%;
+  &-btn-del {
+    color: #9aa1a9;
+    font-size: 16px !important;
+    line-height: 32px;
+    &:hover {
+      color: @error-color;
+      cursor: pointer;
+    }
+  }
+  .biz-attr-select-handle {
+    width: 184px;
+    padding: 0;
+  }
+  .ant-space-item:nth-of-type(3) {
+    min-width: 184px;
+    max-width: calc(100% - 320px);
+  }
+  &-group {
+    display: flex;
+    flex-direction: row;
+    .ant-space-item:nth-of-type(3) {
+      min-width: 184px;
+      max-width: calc(100% - 380px);
+    }
+    &-container {
+      display: flex;
+      flex: 1;
+      flex-direction: column;
+      gap: 4px;
+      width: 100%;
+      max-width: calc(100% + 33px);
+      margin-left: -33px;
+      &-item {
+        padding: 4px 0 4px 48px;
+        &:hover {
+          background: #e8efff;
+        }
+      }
+    }
+    &-handle {
+      position: relative;
+      width: 1px;
+      margin-right: 0;
+      margin-left: 32px;
+      background: @border-color-base;
+    }
+    &-operate {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 16px;
+      transform: translate(-50%, -50%);
+    }
+    &-operate-text {
+      width: 16px;
+      height: 16px;
+      span {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        font-size: 12px;
+        *font-size: 10px;
+        transform: scale(0.83, 0.83);
+      }
+
+      .__default-hover();
+
+      &:first-child {
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
+      }
+
+      &:last-child {
+        border-bottom-right-radius: 3px;
+        border-bottom-left-radius: 3px;
+      }
+
+      &.active {
+        color: #fff;
+        background: @primary-color;
+      }
+    }
+  }
+
+  &-column {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+  }
+  &-error {
+    padding-left: 4px;
+    color: @error-color;
+  }
+}

package/es/attrConditions/components/stringList.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { AttributeSelect } from '../../attributeSelector/types';
+import { AttrConditionTypes } from '../types';
 import { BizSelectTypes } from '../../select/types';
 declare const StringList: React.FC<{
     attr: AttributeSelect.Value;
@@ -8,5 +9,14 @@ declare const StringList: React.FC<{
     onChange?: (value: string[]) => void;
     theme: BizSelectTypes.Props['theme'];
     status?: string;
+    relationSup?: AttrConditionTypes.GroupAddKey;
+    relationConfig?: {
+        eventId: number;
+        eventName: string;
+        eventAttrIdSup: number;
+        eventAttrNameSup: string;
+        eventAttrIdSub: number;
+        eventAttrNameSub: string;
+    }[];
 }>;
 export default StringList;

package/es/attrConditions/components/stringList.js

@@ -86,34 +86,64 @@ var StringList = function StringList(props) {
           case 0:
             fetch = function fetch() {
               var attrData = props.attr;
-              var requestData = {
-                app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-                platform: 0,
-                limit: 20,
-                attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
-                dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
-                v: searchValue || ''
-              };
-              var formData = util.transformRequest(requestData);
-              request(Apis.esQuery, {
-                method: 'post',
-                data: formData,
-                headers: {
-                  'Content-Type': 'application/x-www-form-urlencoded'
-                }
-              }).then(function (result) {
-                setOptions(function () {
-                  return result && result.sources ? result.sources.map(function (item) {
-                    return {
-                      name: item,
-                      value: item
-                    };
-                  }) : [];
-                });
-              }).catch(function (e) {
-                console.error(e);
-                setOptions([]);
+              var relationSup = props.relationSup;
+              var relationConfig = props.relationConfig || [];
+              var dealConfig = relationConfig.filter(function (item) {
+                return attrData && item.eventId === attrData.eventId && relationSup && relationSup.data && item.eventAttrIdSup === relationSup.data.attrId && item.eventAttrIdSub === (attrData === null || attrData === void 0 ? void 0 : attrData.id);
               });
+              if (dealConfig && dealConfig.length && relationSup.data.values && relationSup.data.values.length) {
+                request(Apis.queryRelationResult, {
+                  method: 'post',
+                  data: {
+                    app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+                    eventId: attrData.eventId,
+                    attrId: relationSup.data.attrId,
+                    attrValues: relationSup.data.values,
+                    subAttrId: attrData === null || attrData === void 0 ? void 0 : attrData.id
+                  }
+                }).then(function (result) {
+                  setOptions(function () {
+                    return result && result.data ? result.data.map(function (item) {
+                      return {
+                        name: item,
+                        value: item
+                      };
+                    }) : [];
+                  });
+                }).catch(function (e) {
+                  console.error(e);
+                  setOptions([]);
+                });
+              } else {
+                var requestData = {
+                  app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+                  platform: 0,
+                  limit: 20,
+                  attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
+                  dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
+                  v: searchValue || ''
+                };
+                var formData = util.transformRequest(requestData);
+                request(Apis.esQuery, {
+                  method: 'post',
+                  data: formData,
+                  headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                  }
+                }).then(function (result) {
+                  setOptions(function () {
+                    return result && result.sources ? result.sources.map(function (item) {
+                      return {
+                        name: item,
+                        value: item
+                      };
+                    }) : [];
+                  });
+                }).catch(function (e) {
+                  console.error(e);
+                  setOptions([]);
+                });
+              }
             };
             if (timer) clearTimeout(timer);
             setTimer(setTimeout(function () {

package/es/attrConditions/components/valuesList.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { AttributeSelect } from '../../attributeSelector/types';
+import { AttrConditionTypes } from '../types';
 import { BizSelectTypes } from '../../select/types';
 declare const ValuesList: React.FC<{
     attr?: AttributeSelect.Value;
@@ -8,5 +9,14 @@ declare const ValuesList: React.FC<{
     onChange?: (value: string[]) => void;
     theme: BizSelectTypes.Props['theme'];
     status?: string;
+    relationSup?: AttrConditionTypes.GroupAddKey;
+    relationConfig?: {
+        eventId: number;
+        eventName: string;
+        eventAttrIdSup: number;
+        eventAttrNameSup: string;
+        eventAttrIdSub: number;
+        eventAttrNameSub: string;
+    }[];
 }>;
 export default ValuesList;

package/es/attrConditions/components/valuesList.js

@@ -21,7 +21,9 @@ var ValuesList = function ValuesList(props) {
     defaultValue = props.defaultValue,
     operate = props.operate,
     theme = props.theme,
-    status = props.status;
+    status = props.status,
+    relationSup = props.relationSup,
+    relationConfig = props.relationConfig;
   var initValue = [moment().subtract(1, 'weeks').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')];
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -116,7 +118,9 @@ var ValuesList = function ValuesList(props) {
       operate: operate,
       value: current,
       status: status,
-      onChange: onChange
+      onChange: onChange,
+      relationSup: relationSup,
+      relationConfig: relationConfig
     });
   } else if (attr.type === PropType.NUMBER) {
     var numberAfter = /*#__PURE__*/React.createElement(BizSelect, {

package/es/attrConditions/styles/group.less

@@ -1,49 +1,49 @@
-@import '../../assets/styles/inner.less';
-
-.biz-condition {
-  display: flex;
-
-  /* 是筛选条件组 */
-  &-group-handle {
-    position: relative;
-    width: 1px;
-    margin-right: 16px;
-    margin-left: 8px;
-    background: @border-color-base;
-  }
-
-  &-group-operate {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 16px;
-    transform: translate(-50%, -50%);
-
-    &-text {
-      width: 16px;
-      height: 16px;
-      font-size: 12px;
-      line-height: 16px;
-      text-align: center;
-
-      .__default-hover();
-
-      &:first-child {
-        border-radius: @border-radius-sx @border-radius-sx 0px 0px;
-      }
-
-      &:last-child {
-        border-radius: 0px 0px @border-radius-sx @border-radius-sx;
-      }
-
-      &.active {
-        color: #fff;
-        background: @primary-color;
-      }
-    }
-  }
-
-  &-item-container {
-    flex: 1;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-condition {
+  display: flex;
+
+  /* 是筛选条件组 */
+  &-group-handle {
+    position: relative;
+    width: 1px;
+    margin-right: 16px;
+    margin-left: 8px;
+    background: @border-color-base;
+  }
+
+  &-group-operate {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 16px;
+    transform: translate(-50%, -50%);
+
+    &-text {
+      width: 16px;
+      height: 16px;
+      font-size: 12px;
+      line-height: 16px;
+      text-align: center;
+
+      .__default-hover();
+
+      &:first-child {
+        border-radius: @border-radius-sx @border-radius-sx 0px 0px;
+      }
+
+      &:last-child {
+        border-radius: 0px 0px @border-radius-sx @border-radius-sx;
+      }
+
+      &.active {
+        color: #fff;
+        background: @primary-color;
+      }
+    }
+  }
+
+  &-item-container {
+    flex: 1;
+  }
+}