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

package/es/attrConditions/styles/index.less

@@ -1,151 +1,151 @@
-@import '../../assets/styles/inner.less';
-
-/* 筛选条件 */
-.biz-condition-item {
-  &-panel {
-    display: flex;
-    width: 100%;
-    > :nth-child(1) {
-      margin-right: 8px;
-    }
-
-    .biz-condition-item-multi-select {
-      width: calc(100% - 108px);
-      min-width: 100px;
-    }
-
-    .biz-condition-item-multi-select-empty {
-      // width: calc(100% - 108px);
-      flex: 1;
-
-      .biz-condition-item-multi-select {
-        width: 100%;
-      }
-    }
-  }
-
-  &:not(:last-child) {
-    margin-bottom: 8px;
-  }
-
-  /* 覆盖属性组件样式 */
-  /* --- start --- */
-  .biz-attr-select-handle {
-    width: 100%;
-    max-width: 100%;
-    margin-bottom: 2px;
-    padding: 0;
-  }
-
-  .biz-attr-select-del-icon {
-    background-color: #fff;
-
-    &:hover {
-      .__error-hover();
-    }
-  }
-
-  // 自定义下拉框样式
-  .biz-select-handle-input {
-    background-color: @background-color-base;
-    // border: none;
-  }
-
-  /* --- end --- */
-
-  &-multi-select {
-    flex: 1;
-  }
-  &-nplace {
-    .ant-space-item:nth-of-type(3) {
-      min-width: 60px !important;
-      .ant-input-number {
-        width: 60px;
-        background-color: #fafafb;
-        border-radius: 4px;
-      }
-    }
-    &-text {
-      white-space: nowrap;
-    }
-  }
-
-  &-single-select {
-    width: 100px;
-    &.gray {
-      color: @text-color-secondary;
-
-      &:hover {
-        color: @primary-color;
-      }
-    }
-  }
-
-  &-value-content {
-    display: flex;
-    flex: 1;
-
-    .biz-select-handle {
-      margin-left: @margin-xs;
-    }
-  }
-
-  &-input {
-    &.ant-input {
-      background-color: @background-color-base;
-      border-color: @background-color-base;
-    }
-
-    &.ant-input-affix-wrapper {
-      background-color: @background-color-base !important;
-
-      input {
-        background-color: @background-color-base !important;
-      }
-
-      &.ant-input-affix-wrapper-focused {
-        background-color: #fff !important;
-        border: 1px solid @primary-color;
-
-        input {
-          background-color: #fff !important;
-        }
-      }
-    }
-
-    &:focus {
-      border: 1px solid @primary-color;
-    }
-
-    .ant-input-group-addon {
-      // background-color: @background-color-gray !important;
-      border: none;
-    }
-
-    &-select {
-      width: 60px;
-      border: none;
-      // border-left: 1px solid @border-color-split;
-    }
-  }
-
-  &-date.ant-picker {
-    flex: 1;
-    border-color: transparent;
-
-    &.ant-picker {
-      background-color: @background-color-base;
-
-      &:hover {
-        background-color: @background-color-base;
-        border-color: @primary-color;
-      }
-
-      &.ant-picker-focused {
-        background-color: @background-color-base;
-        border-color: @primary-color;
-        box-shadow: @box-shadow-base;
-      }
-    }
-  }
-}
+@import '../../assets/styles/inner.less';
+
+/* 筛选条件 */
+.biz-condition-item {
+  &-panel {
+    display: flex;
+    width: 100%;
+    > :nth-child(1) {
+      margin-right: 8px;
+    }
+
+    .biz-condition-item-multi-select {
+      width: calc(100% - 108px);
+      min-width: 100px;
+    }
+
+    .biz-condition-item-multi-select-empty {
+      // width: calc(100% - 108px);
+      flex: 1;
+
+      .biz-condition-item-multi-select {
+        width: 100%;
+      }
+    }
+  }
+
+  &:not(:last-child) {
+    margin-bottom: 8px;
+  }
+
+  /* 覆盖属性组件样式 */
+  /* --- start --- */
+  .biz-attr-select-handle {
+    width: 100%;
+    max-width: 100%;
+    margin-bottom: 2px;
+    padding: 0;
+  }
+
+  .biz-attr-select-del-icon {
+    background-color: #fff;
+
+    &:hover {
+      .__error-hover();
+    }
+  }
+
+  // 自定义下拉框样式
+  .biz-select-handle-input {
+    background-color: @background-color-base;
+    // border: none;
+  }
+
+  /* --- end --- */
+
+  &-multi-select {
+    flex: 1;
+  }
+  &-nplace {
+    .ant-space-item:nth-of-type(3) {
+      min-width: 60px !important;
+      .ant-input-number {
+        width: 60px;
+        background-color: #fafafb;
+        border-radius: 4px;
+      }
+    }
+    &-text {
+      white-space: nowrap;
+    }
+  }
+
+  &-single-select {
+    width: 100px;
+    &.gray {
+      color: @text-color-secondary;
+
+      &:hover {
+        color: @primary-color;
+      }
+    }
+  }
+
+  &-value-content {
+    display: flex;
+    flex: 1;
+
+    .biz-select-handle {
+      margin-left: @margin-xs;
+    }
+  }
+
+  &-input {
+    &.ant-input {
+      background-color: @background-color-base;
+      border-color: @background-color-base;
+    }
+
+    &.ant-input-affix-wrapper {
+      background-color: @background-color-base !important;
+
+      input {
+        background-color: @background-color-base !important;
+      }
+
+      &.ant-input-affix-wrapper-focused {
+        background-color: #fff !important;
+        border: 1px solid @primary-color;
+
+        input {
+          background-color: #fff !important;
+        }
+      }
+    }
+
+    &:focus {
+      border: 1px solid @primary-color;
+    }
+
+    .ant-input-group-addon {
+      // background-color: @background-color-gray !important;
+      border: none;
+    }
+
+    &-select {
+      width: 60px;
+      border: none;
+      // border-left: 1px solid @border-color-split;
+    }
+  }
+
+  &-date.ant-picker {
+    flex: 1;
+    border-color: transparent;
+
+    &.ant-picker {
+      background-color: @background-color-base;
+
+      &:hover {
+        background-color: @background-color-base;
+        border-color: @primary-color;
+      }
+
+      &.ant-picker-focused {
+        background-color: @background-color-base;
+        border-color: @primary-color;
+        box-shadow: @box-shadow-base;
+      }
+    }
+  }
+}

package/es/attrConditions/types.d.ts

@@ -38,6 +38,15 @@ export declare namespace AttrConditionTypes {
         destroyPopupOnHide?: boolean;
         overlayClassName?: string;
         supportNPlace?: boolean;
+        relationSup?: GroupAddKey;
+        relationConfig?: {
+            eventId: number;
+            eventName: string;
+            eventAttrIdSup: number;
+            eventAttrNameSup: string;
+            eventAttrIdSub: number;
+            eventAttrNameSub: string;
+        }[];
     }
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;
@@ -47,6 +56,14 @@ export declare namespace AttrConditionTypes {
         onChange?: (value: GroupValue) => void;
         onConditionsCount?: (value: number) => void;
         overlayClassName?: string;
+        relationConfig?: {
+            eventId: number;
+            eventName: string;
+            eventAttrIdSup: number;
+            eventAttrNameSup: string;
+            eventAttrIdSub: number;
+            eventAttrNameSub: string;
+        }[];
     }
     interface Option {
         name: string;

package/es/attributeSelector/index.js

@@ -25,7 +25,9 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     extra = props.extra,
     isNumber = props.isNumber,
     overlayClassName = props.overlayClassName,
-    isStrNum = props.isStrNum;
+    isStrNum = props.isStrNum,
+    isString = props.isString,
+    isHideYeWu = props.isHideYeWu;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     currentAttr = _useState2[0],
@@ -107,7 +109,9 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
         value: currentAttr,
         onChange: onChange,
         isNumber: isNumber,
-        isStrNum: isStrNum
+        isStrNum: isStrNum,
+        isString: isString,
+        isHideYeWu: isHideYeWu
       }));
     },
     trigger: ['click'],

package/es/attributeSelector/listPanel.js

@@ -25,7 +25,9 @@ var AttrListPanel = function AttrListPanel(props) {
     funnelEventIdList = props.funnelEventIdList,
     extra = props.extra,
     isNumber = props.isNumber,
-    isStrNum = props.isStrNum;
+    isStrNum = props.isStrNum,
+    isString = props.isString,
+    isHideYeWu = props.isHideYeWu;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     searchValue = _useState2[0],
@@ -160,7 +162,9 @@ var AttrListPanel = function AttrListPanel(props) {
             anchor: hasAnchor ? String(Math.random()) : anchor.event,
             key: "event-".concat(event.id),
             children: event.attrList.slice().filter(function (item) {
-              return isStrNum ? item.type === 2 || item.type === 1 : isNumber ? item.type === 2 : true;
+              return isHideYeWu ? item.id != 31415926 : true;
+            }).filter(function (item) {
+              return isStrNum ? item.type === 2 || item.type === 1 : isNumber ? item.type === 2 : isString ? item.type === 1 : true;
             })
           };
           list.push(group);

package/es/attributeSelector/styles/index.less

@@ -1,141 +1,141 @@
-@import '../../assets/styles/inner.less';
-
-.biz-attr-select {
-  &-handle {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    width: fit-content;
-    min-width: 208px;
-    .__select-handle();
-    &.error {
-      border-color: @error-color;
-      &.focus {
-        box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2);
-      }
-    }
-
-    &:hover {
-      .biz-target-select-option-icon {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-    }
-
-    .biz-select-handle-input {
-      border: none;
-      &.middle {
-        height: 32px;
-        line-height: 32px;
-      }
-    }
-    .biz-select-handle-content-label {
-      max-width: 450px;
-    }
-  }
-
-  &-drowdown {
-    .__select-panel();
-
-    &.nodata {
-      .__select-nodata();
-    }
-  }
-
-  &-anchor-panel {
-    max-width: 496px;
-    padding: 12px 0;
-
-    .ant-anchor {
-      display: flex;
-      flex-direction: row;
-
-      .ant-anchor-ink::before {
-        width: 0;
-      }
-
-      .ant-anchor-link {
-        padding: 0;
-
-        &:last-of-type .ant-btn {
-          margin-right: 0;
-        }
-      }
-
-      .ant-btn {
-        margin-right: 8px;
-      }
-
-      .ant-anchor-link-active .ant-btn {
-        &,
-        &:focus {
-          .__default-hover();
-        }
-      }
-
-      .ant-btn:focus {
-        color: @text-color;
-        border-color: @border-color-base;
-      }
-    }
-  }
-
-  &-container {
-    max-height: 224px;
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-
-  &-nodata {
-    .__select-nodata();
-  }
-
-  &-group {
-    position: relative;
-    height: 32px;
-    padding: 0 @padding-sm;
-    color: @text-color-secondary;
-    line-height: 32px;
-
-    &::before {
-      position: absolute;
-      top: 9px;
-      left: 5px;
-      width: 3px;
-      height: 14px;
-      background-color: @primary-color;
-      border-radius: 10px;
-      content: '';
-    }
-
-    & > span {
-      position: relative;
-      display: inline-block;
-      max-width: 225px;
-      padding-right: @padding-xss;
-      background: #fff;
-      .__default-overflow();
-    }
-  }
-
-  &-split {
-    position: absolute;
-    top: 18px;
-    width: 100%;
-    height: 0;
-    border-bottom: 1px solid @border-color-base;
-  }
-
-  &-option {
-    .__select-option();
-
-    &:not(.active, :hover, .disabled) .biz-attr-select-highlight {
-      color: @primary-color;
-    }
-  }
-
-  &-option-icon {
-    margin-right: @margin-xs;
-  }
-}
+@import '../../assets/styles/inner.less';
+
+.biz-attr-select {
+  &-handle {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    width: fit-content;
+    min-width: 208px;
+    .__select-handle();
+    &.error {
+      border-color: @error-color;
+      &.focus {
+        box-shadow: 0 0 0 2px rgba(251, 85, 71, 0.2);
+      }
+    }
+
+    &:hover {
+      .biz-target-select-option-icon {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+
+    .biz-select-handle-input {
+      border: none;
+      &.middle {
+        height: 32px;
+        line-height: 32px;
+      }
+    }
+    .biz-select-handle-content-label {
+      max-width: 450px;
+    }
+  }
+
+  &-drowdown {
+    .__select-panel();
+
+    &.nodata {
+      .__select-nodata();
+    }
+  }
+
+  &-anchor-panel {
+    max-width: 496px;
+    padding: 12px 0;
+
+    .ant-anchor {
+      display: flex;
+      flex-direction: row;
+
+      .ant-anchor-ink::before {
+        width: 0;
+      }
+
+      .ant-anchor-link {
+        padding: 0;
+
+        &:last-of-type .ant-btn {
+          margin-right: 0;
+        }
+      }
+
+      .ant-btn {
+        margin-right: 8px;
+      }
+
+      .ant-anchor-link-active .ant-btn {
+        &,
+        &:focus {
+          .__default-hover();
+        }
+      }
+
+      .ant-btn:focus {
+        color: @text-color;
+        border-color: @border-color-base;
+      }
+    }
+  }
+
+  &-container {
+    max-height: 224px;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  &-nodata {
+    .__select-nodata();
+  }
+
+  &-group {
+    position: relative;
+    height: 32px;
+    padding: 0 @padding-sm;
+    color: @text-color-secondary;
+    line-height: 32px;
+
+    &::before {
+      position: absolute;
+      top: 9px;
+      left: 5px;
+      width: 3px;
+      height: 14px;
+      background-color: @primary-color;
+      border-radius: 10px;
+      content: '';
+    }
+
+    & > span {
+      position: relative;
+      display: inline-block;
+      max-width: 225px;
+      padding-right: @padding-xss;
+      background: #fff;
+      .__default-overflow();
+    }
+  }
+
+  &-split {
+    position: absolute;
+    top: 18px;
+    width: 100%;
+    height: 0;
+    border-bottom: 1px solid @border-color-base;
+  }
+
+  &-option {
+    .__select-option();
+
+    &:not(.active, :hover, .disabled) .biz-attr-select-highlight {
+      color: @primary-color;
+    }
+  }
+
+  &-option-icon {
+    margin-right: @margin-xs;
+  }
+}

package/es/attributeSelector/types.d.ts

@@ -98,6 +98,8 @@ export declare namespace AttributeSelect {
         extra?: AttributeExtra[];
         isNumber?: Boolean;
         isStrNum?: Boolean;
+        isString?: Boolean;
+        isHideYeWu?: Boolean;
     }
     interface AttributeExtra {
         type: string;

package/es/chart/demo/index.js

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState } from 'react';
 import { BizChart } from '@zgfe/business-lib';
-import chartData, { showCharts } from './data/data';
+import chartData from './data/data';
 import { Button, Image } from 'antd';
 export default (function () {
   var chartRef = useRef();
@@ -30,8 +30,7 @@ export default (function () {
     data: chartData,
     type: "line",
     legendPosition: "bottom",
-    ref: chartRef,
-    showList: show ? showCharts : []
+    ref: chartRef
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: onClick
   }, "\u83B7\u53D6\u56FE\u8868\u56FE\u7247"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Image, {