@zgfe/business-lib 1.1.33-visual.7 → 1.1.33-visual.8

package/es/attrConditions/demo/index.js

@@ -11,17 +11,7 @@ export default (function () {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useState = useState({
-      condition: {
-        attrId: 30183426,
-        propCategory: 'eventProp',
-        type: 1,
-        operator: 'equal',
-        values: [],
-        dimensionSub: 'event_attr',
-        attrName: '公众号名称'
-      }
-    }),
+  var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     formData = _useState2[0],
     setFormData = _useState2[1];

package/es/attrConditions/index.d.ts

@@ -1,8 +1,6 @@
 import React from 'react';
-import { AttributeSelect } from '../attributeSelector/types';
 import './styles/index.less';
-import { AttrConditionTypes, OperateTypes } from './types';
+import { AttrConditionTypes } from './types';
 export declare const classPrefix = "biz-condition-item";
-export declare function getCondition(attr: AttributeSelect.Value, operate: OperateTypes, values: string[]): AttrConditionTypes.ItemValue | undefined;
 declare const BizConditionItem: React.FC<AttrConditionTypes.ItemProp>;
 export default BizConditionItem;

package/es/attrConditions/index.js

@@ -12,28 +12,6 @@ import BizOperateList from './components/operateList';
 import ValuesList from './components/valuesList';
 import { Skeleton } from 'antd';
 export var classPrefix = 'biz-condition-item';
-export function getCondition(attr, operate, values) {
-  if (!attr) return;
-  var responseData = {
-    attrId: attr.id,
-    propCategory: attr.propCategory,
-    type: attr.type,
-    operator: operate,
-    values: values || [],
-    dimensionSub: attr.dimensionSub,
-    label: attr.label
-  };
-  if (attr.propCategory === PropCategory.EventProp) {
-    responseData.attrName = attr.label;
-  } else {
-    responseData.attrName = attr.name;
-    responseData.category = attr.category;
-    if (attr.propCategory === PropCategory.UserProp && attr.subtype) {
-      responseData.subtype = attr.subtype;
-    }
-  }
-  return responseData;
-}
 var BizConditionItem = function BizConditionItem(props) {
   var _props$defaultValue, _props$value, _props$defaultValue2, _props$value2;
   var defaultValue = props.defaultValue,
@@ -72,6 +50,7 @@ var BizConditionItem = function BizConditionItem(props) {
             propCategory: data.propCategory,
             type: data.type,
             key: data.attrId,
+            label: data.label,
             dimensionSub: data.dimensionSub || 'event_attr'
           };
         }
@@ -100,7 +79,25 @@ var BizConditionItem = function BizConditionItem(props) {
   useEffect(function () {
     if (props.onChange) {
       if (!attr) return;
-      props.onChange(getCondition(attr, operate, values));
+      var responseData = {
+        attrId: attr.id,
+        propCategory: attr.propCategory,
+        type: attr.type,
+        operator: operate,
+        values: values || [],
+        dimensionSub: attr.dimensionSub,
+        label: attr.alias || attr.label
+      };
+      if (attr.propCategory === PropCategory.EventProp) {
+        responseData.attrName = attr.label;
+      } else {
+        responseData.attrName = attr.name;
+        responseData.category = attr.category;
+        if (attr.propCategory === PropCategory.UserProp && attr.subtype) {
+          responseData.subtype = attr.subtype;
+        }
+      }
+      props.onChange(responseData);
     }
   }, [attr, operate, values]);
   var onChangeAttr = function onChangeAttr(attrData) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.33-visual.7",
+  "version": "1.1.33-visual.8",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "9f5fb07ede61f809d3aa2efcd69ccfffeeea206a"
+  "gitHead": "b8fa7a22e144c79fe39ef77900a0b870b431182e"
 }