@zgfe/business-lib 1.0.27-adanalysis.0 → 1.0.27-adanalysis.2

package/es/assets/iconfont/iconfont.json

@@ -5,6 +5,202 @@
   "css_prefix_text": "",
   "description": "诸葛业务平台",
   "glyphs": [
+    {
+      "icon_id": "31661450",
+      "name": "下载",
+      "font_class": "xiazai1",
+      "unicode": "e7b9",
+      "unicode_decimal": 59321
+    },
+    {
+      "icon_id": "31659188",
+      "name": "复制",
+      "font_class": "fuzhi",
+      "unicode": "e6d7",
+      "unicode_decimal": 59095
+    },
+    {
+      "icon_id": "31659190",
+      "name": "字符串",
+      "font_class": "zifuchuan",
+      "unicode": "e6d9",
+      "unicode_decimal": 59097
+    },
+    {
+      "icon_id": "31659191",
+      "name": "日期",
+      "font_class": "riqi",
+      "unicode": "e6da",
+      "unicode_decimal": 59098
+    },
+    {
+      "icon_id": "31659192",
+      "name": "数值",
+      "font_class": "shuzhi",
+      "unicode": "e6db",
+      "unicode_decimal": 59099
+    },
+    {
+      "icon_id": "31623999",
+      "name": "left",
+      "font_class": "left",
+      "unicode": "e6d2",
+      "unicode_decimal": 59090
+    },
+    {
+      "icon_id": "31624000",
+      "name": "inner",
+      "font_class": "inner",
+      "unicode": "e6d3",
+      "unicode_decimal": 59091
+    },
+    {
+      "icon_id": "31624006",
+      "name": "right",
+      "font_class": "right",
+      "unicode": "e6d4",
+      "unicode_decimal": 59092
+    },
+    {
+      "icon_id": "31624012",
+      "name": "all",
+      "font_class": "all",
+      "unicode": "e6d5",
+      "unicode_decimal": 59093
+    },
+    {
+      "icon_id": "31393133",
+      "name": "删除桶",
+      "font_class": "shanchutong",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "31393376",
+      "name": "删除",
+      "font_class": "shanchu2",
+      "unicode": "e6b2",
+      "unicode_decimal": 59058
+    },
+    {
+      "icon_id": "31393404",
+      "name": "重新加载",
+      "font_class": "zhongxinjiazai",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "31393455",
+      "name": "调整大小-左右",
+      "font_class": "tiaozhengdaxiao-zuoyou",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
+    },
+    {
+      "icon_id": "31393456",
+      "name": "调整大小-上下",
+      "font_class": "tiaozhengdaxiao-shangxia",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+    {
+      "icon_id": "31393505",
+      "name": "拖拽",
+      "font_class": "tuozhuai",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+    {
+      "icon_id": "31393091",
+      "name": "更多操作",
+      "font_class": "gengduocaozuo2",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "31393024",
+      "name": "数据集业务",
+      "font_class": "shujujiyewu",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "31393063",
+      "name": "重命名",
+      "font_class": "zhongmingming",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "31393075",
+      "name": "编辑",
+      "font_class": "bianji1",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "31393004",
+      "name": "输出",
+      "font_class": "shuchu",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "31392973",
+      "name": "数据拆分",
+      "font_class": "shujuchaifen",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "31392994",
+      "name": "聚合",
+      "font_class": "juhe",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "31392962",
+      "name": "列转列",
+      "font_class": "liezhuanlie",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "31392944",
+      "name": "行转列",
+      "font_class": "hangzhuanlie",
+      "unicode": "e6a7",
+      "unicode_decimal": 59047
+    },
+    {
+      "icon_id": "31392910",
+      "name": "字段设置",
+      "font_class": "ziduanshezhi",
+      "unicode": "e6a6",
+      "unicode_decimal": 59046
+    },
+    {
+      "icon_id": "31392809",
+      "name": "连接",
+      "font_class": "lianjie",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "31392856",
+      "name": "合并",
+      "font_class": "hebing",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "31389407",
+      "name": "全屏展示",
+      "font_class": "quanpingzhanshi",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
     {
       "icon_id": "31360676",
       "name": "收藏",

package/es/assets/styles/resetAntd.less

@@ -5,7 +5,7 @@
 // 输入框（带icon)
 .ant-input-affix-wrapper {
   background-color: @background-color-base!important;
-  border-color: #fff !important;
+  border-color: @background-color-base !important;
   border-radius: @border-radius-small!important;
 
   .ant-input {
@@ -31,6 +31,10 @@
   }
 }
 
+.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper,
+.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:hover {
+  border-color: @error-color!important;
+}
 // 输入框
 .ant-input {
   background-color: @background-color-base!important;
@@ -142,9 +146,10 @@
     display: none !important;
   }
 
+  &,
   &.ant-picker-range {
     background-color: @background-color-base;
-    border: none;
+    border-color: @background-color-base;
   }
 }
 

package/es/attrConditions/components/stringList.js

@@ -176,7 +176,7 @@ var StringList = function StringList(props) {
     className: "".concat(classPrefix, "-multi-select"),
     value: current,
     multiple: true,
-    enableCreate: true,
+    enableCreate: false,
     theme: props.theme,
     size: "middle",
     disable: props.operate === OperateTypes.IsNull || props.operate === OperateTypes.IsNotNull,

package/es/attrConditions/components/valuesList.js

@@ -42,8 +42,8 @@ var ValuesList = function ValuesList(props) {
 
   var _useState5 = useState(true),
       _useState6 = _slicedToArray(_useState5, 2),
-      ready = _useState6[0],
-      setReady = _useState6[1];
+      isFirst = _useState6[0],
+      setIsFirst = _useState6[1];
 
   useEffect(function () {
     if (defaultValue) {
@@ -55,16 +55,18 @@ var ValuesList = function ValuesList(props) {
       }
     }
 
-    setReady(false);
+    setIsFirst(false);
   }, []);
   useEffect(function () {
+    if (isFirst) return;
+
     if (operate === OperateTypes.Absolute || operate === OperateTypes.Relative) {
       var data = operate === OperateTypes.Absolute ? initValue : ['30', '1'];
       onChange(data);
     }
   }, [operate]);
   useEffect(function () {
-    if (!ready && (attr === null || attr === void 0 ? void 0 : attr.type) !== PropType.DATE) {
+    if (!isFirst && (attr === null || attr === void 0 ? void 0 : attr.type) !== PropType.DATE) {
       onChange([]);
       setCurrent([]);
     }
@@ -115,7 +117,7 @@ var ValuesList = function ValuesList(props) {
     return current && current > moment().endOf('day');
   };
 
-  if (!attr || !operate || ready) {
+  if (!attr || !operate || isFirst) {
     return /*#__PURE__*/React.createElement(BizSelect, {
       disable: true,
       className: "".concat(classPrefix, "-multi-select"),

package/es/attrConditions/group.js

@@ -53,7 +53,7 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
     var data = props.defaultValue || props.value;
 
     if (data) {
-      if (data.relation) setRelation(data.relation);
+      if (data.relation) setRelation(props.onlyAnd ? 'and' : data.relation);
 
       if (data.conditions) {
         setConditions(function () {
@@ -77,7 +77,7 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
       },
       setValue: function setValue(data) {
         if (data) {
-          if (data.relation) setRelation(data.relation);
+          if (data.relation) setRelation(props.onlyAnd ? 'and' : data.relation);
 
           if (data.conditions) {
             setConditions(function () {
@@ -169,8 +169,8 @@ var BizConditionGroup = function BizConditionGroup(props, ref) {
     className: "".concat(classPrefix, "-group-operate"),
     onClick: onClickRelation
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-group-operate-text ").concat(relation === 'and' ? 'active' : '')
-  }, "\u4E14"), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-group-operate-text ").concat(relation === 'and' || props.onlyAnd ? 'active' : '')
+  }, "\u4E14"), !props.onlyAnd && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-group-operate-text ").concat(relation === 'or' ? 'active' : '')
   }, "\u6216"))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item-container")

package/es/attrConditions/types.d.ts

@@ -36,6 +36,7 @@ export declare namespace AttrConditionTypes {
     interface GroupProp extends BasicAttrTypes {
         defaultValue?: GroupValue;
         value?: GroupValue;
+        onlyAnd?: boolean;
         onChange?: (value: GroupValue) => void;
         onConditionsCount?: (value: number) => void;
     }

package/es/attributeSelector/styles/index.less

@@ -1,15 +1,18 @@
 @import '../../assets/styles/inner.less';
+
 .biz-attr-select {
   &-handle {
     display: flex;
     flex-direction: row;
     .__select-handle();
+
     &:hover .biz-attr-select-del-icon {
       display: flex;
       align-items: center;
       justify-content: center;
     }
   }
+
   &-del-icon {
     display: none;
     flex: none;
@@ -21,48 +24,69 @@
       .__error-hover();
     }
   }
+
   &-drowdown {
     .__select-panel();
+
     &.nodata {
       .__select-nodata();
     }
   }
+
   &-anchor-panel {
     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 {
-        .__default-hover();
+        &,
+        &:focus {
+          .__default-hover();
+        }
+      }
+
+      .ant-btn:focus {
+        color: @text-color;
+        border-color: @border-color-base;
       }
     }
   }
+
   &-container {
-    max-height: 400px;
+    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;
@@ -73,6 +97,7 @@
       border-radius: 10px;
       content: '';
     }
+
     & > span {
       position: relative;
       display: inline-block;
@@ -82,6 +107,7 @@
       .__default-overflow();
     }
   }
+
   &-split {
     position: absolute;
     top: 18px;
@@ -89,12 +115,15 @@
     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/util.js

@@ -14,6 +14,8 @@ export default function convertAttributeData(store) {
       name: group_.groupName,
       eventList: []
     };
+    var list = [];
+    var markList = [];
     group_.eventList.forEach(function (e) {
       if (e.is_delete) return;
       var event = {
@@ -39,8 +41,14 @@ export default function convertAttributeData(store) {
         eventHidden: e.event_hidden,
         marked: Boolean(e.mark_type)
       };
-      group.eventList.push(event);
+
+      if (event.marked) {
+        markList.push(event);
+      } else {
+        list.push(event);
+      }
     });
+    group.eventList = [].concat(markList, list);
     (_res$eventGroupList = res.eventGroupList) === null || _res$eventGroupList === void 0 ? void 0 : _res$eventGroupList.push(group);
   });
   res.envPropList = (_store$envPropList = store.envPropList) === null || _store$envPropList === void 0 ? void 0 : _store$envPropList.map(function (prop) {

package/es/chart/demo/bar.js

@@ -1,12 +1,11 @@
 import React from 'react';
 import { BizChart } from '@zgfe/business-lib';
-import chartData from './data/data';
+import chartData, { barData } from './data/data';
 export default (function () {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizChart, {
-    data: chartData,
+    data: barData,
     type: "bar",
-    reverseXAxis: true,
-    showList: ['付款成功', '搜索商品', '查看商品详情']
+    reverseXAxis: true
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(BizChart, {
     data: chartData,
     type: "bar",

package/es/chart/demo/data/data.d.ts

@@ -6,3 +6,10 @@ declare const _default: {
     }[];
 };
 export default _default;
+export declare const barData: {
+    x_axis: string[];
+    series: {
+        names: string[];
+        values: number[];
+    }[];
+};

package/es/chart/demo/data/data.js

@@ -25,4 +25,14 @@ export default {
     names: ['申请退货'],
     values: [5, 11, 14, 9, 8, 14, 9, 10, 12, 12, 14, 16, 12, 10]
   }]
+};
+export var barData = {
+  x_axis: ['2022-08-23|2022-08-30'],
+  series: [{
+    names: ['北京市', '所有用户', '查看商品'],
+    values: [1560]
+  }, {
+    names: ['北京市', '最近7天活跃用户', '查看商品'],
+    values: [1560]
+  }]
 };

package/es/chart/demo/data/data3.d.ts

@@ -2,9 +2,7 @@ declare const _default: {
     x_axis: string[];
     series: {
         names: string[];
-        original_names: string[];
         values: number[];
-        total: never[];
     }[];
 };
 export default _default;