@zgfe/business-lib 1.1.8 → 1.1.9-tag.0

package/es/assets/styles/resetAntd.less

@@ -134,9 +134,18 @@
 
   .ant-picker-input > input {
     color: @text-color!important;
+    &[disabled] {
+      color: @disabled-color!important;
+    }
+  }
+
+  &.ant-picker-disabled {
+    span {
+      color: @disabled-color!important;
+    }
   }
 
-  &:hover,
+  &:hover:not(.ant-picker-disabled),
   &.ant-picker-focused {
     .__default-hover() !important;
     border-color: @border-color-base!important;

package/es/userCondition/conditions/eventCondition.js

@@ -5,13 +5,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import React, { useContext } from 'react';
-import { RightOutlined } from '@ant-design/icons';
 import BizEventSelector from '../../eventSelector';
 import RunTimesCondition from './runTimesCondition';
 import PeriodCondition from './periodCondition';
 import PropCondition from './propCondition';
 import './styles/eventCondition.less';
 import { BizUserConditionContext, classPrefix } from '..';
+import { Tooltip } from 'antd';
+import IconFont from '../../icon/iconFont';
 
 var EventCondition = function EventCondition(props) {
   var _useContext = useContext(BizUserConditionContext),
@@ -79,10 +80,14 @@ var EventCondition = function EventCondition(props) {
     placeholder: "\u9009\u62E9\u4E00\u4E2A\u4E8B\u4EF6",
     destroyPopupOnHide: true,
     defaultSelectAble: false
-  })), /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u6DFB\u52A0\u7B5B\u9009"
+  }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-event-condition-expand-attr"),
     onClick: onAddAttr
-  }, /*#__PURE__*/React.createElement(RightOutlined, null))), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "shaixuan"
+  })))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-event-condition-right")
   }, condition.attrs.length && condition.eventId ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-event-condition-attrs")

package/es/userCondition/types.d.ts

@@ -44,6 +44,7 @@ export declare namespace BizUserConditionT {
         updateTime: string;
         del: number;
         labelGroup: string;
+        sequence: number;
         id: number;
         labelName: string;
         labelStatus: number;

package/es/userCondition/util.js

@@ -133,22 +133,25 @@ export function buildSelectLayer(data) {
   };
 }
 export function buildTagsGroup(list) {
-  var groupOrder = ['基本标签', '活跃标签', '行为标签', '预测标签', '其它标签'];
-  var groupsMap = {};
   var options = [];
   list.forEach(function (label) {
-    if (Object.hasOwn(groupsMap, label.labelGroup)) {
-      groupsMap[label.labelGroup].children.push(_objectSpread({}, label));
+    if (!label.sequence) return;
+    var index = label.sequence - 1;
+
+    if (options[index]) {
+      options[index].children.push(label);
     } else {
-      var group = {
+      options[index] = {
         labelGroup: label.labelGroup,
         children: [_objectSpread({}, label)]
       };
-      groupsMap[label.labelGroup] = group;
     }
   });
-  groupOrder.map(function (group) {
-    groupsMap[group] && options.push(groupsMap[group]);
+  var result = [];
+  options.forEach(function (item) {
+    if (item) {
+      result.push(item);
+    }
   });
-  return options;
+  return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.8",
+  "version": "1.1.9-tag.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "9ae546a9e4964debc0c5b4e1f7d5cd7e6f262c6a"
+  "gitHead": "08bb7f7e9275ab13fe71dad9a9d3d30506ded9a2"
 }