@zgfe/business-lib 1.1.7-tag6.2 → 1.1.7-test-origin1.0

package/es/addToPanel/index.js

@@ -44,10 +44,15 @@ var BizAddToPanel = function BizAddToPanel(props) {
       groupList = _useState4[0],
       setGroupList = _useState4[1];
 
-  var _useState5 = useState(false),
+  var _useState5 = useState(),
       _useState6 = _slicedToArray(_useState5, 2),
-      loading = _useState6[0],
-      setLoading = _useState6[1];
+      formData = _useState6[0],
+      setFormData = _useState6[1];
+
+  var _useState7 = useState(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      loading = _useState8[0],
+      setLoading = _useState8[1];
 
   var _useContext = useContext(BizGlobalDataContext),
       currentApp = _useContext.currentApp,
@@ -56,6 +61,10 @@ var BizAddToPanel = function BizAddToPanel(props) {
       isDemo = _useContext.isDemo;
 
   useEffect(function () {
+    if (props.defaultValue) {
+      setFormData(props.defaultValue);
+    }
+
     queryGroups();
   }, []);
 
@@ -75,7 +84,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
         return;
       }
 
-      setGroupList(res.panels || []);
+      setGroupList(res.panels);
     }).catch(function () {
       notification.error({
         message: '获取看板列表失败'
@@ -214,7 +223,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
   }, /*#__PURE__*/React.createElement(Form, {
     ref: refForm,
     onFinish: onSubmit,
-    initialValues: props.defaultValue,
+    initialValues: formData,
     requiredMark: false
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u770B\u677F",

package/es/assets/styles/resetAntd.less

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

package/es/userCondition/conditions/eventCondition.js

@@ -5,14 +5,13 @@ 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),
@@ -80,14 +79,10 @@ var EventCondition = function EventCondition(props) {
     placeholder: "\u9009\u62E9\u4E00\u4E2A\u4E8B\u4EF6",
     destroyPopupOnHide: true,
     defaultSelectAble: false
-  })), /*#__PURE__*/React.createElement(Tooltip, {
-    title: "\u6DFB\u52A0\u7B5B\u9009"
-  }, /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-event-condition-expand-attr"),
     onClick: onAddAttr
-  }, /*#__PURE__*/React.createElement(IconFont, {
-    type: "shaixuan"
-  })))), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(RightOutlined, null))), /*#__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,7 +44,6 @@ export declare namespace BizUserConditionT {
         updateTime: string;
         del: number;
         labelGroup: string;
-        sequence: number;
         id: number;
         labelName: string;
         labelStatus: number;

package/es/userCondition/util.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.7-tag6.2",
+  "version": "1.1.7-test-origin1.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": "028a521077915a73e87a85013fd2907ee745a2b7"
+  "gitHead": "7253a8ad1612a216410ded6fd399127a8e986435"
 }