@zgfe/business-lib 1.0.24-alpha.1 → 1.0.24-alpha.4

package/es/chart/util/color.js

@@ -1 +1 @@
-export var chartColors = ['#165DFF', '#CDDBFD', '#80E1D9', '#CDF3F0', '#65789B', '#CED4DE', '#F8BC3B', '#FCE7B9', '#6F66ED', '#D1CEFD', '#66AFED', '#D3E7F9', '#9661BC', '#DFCFEA', '#FF7557', '#FFD1C7', '#4DB273', '#BBDEC8', '#F08BB4', '#FFE0ED'];
+export var chartColors = ['#165DFF', '#80E1D9', '#65789B', '#F8BC3B', '#6F66ED', '#66AFED', '#9661BC', '#FF7557', '#4DB273', '#F08BB4', '#CDDBFD', '#CDF3F0', '#CED4DE', '#FCE7B9', '#D1CEFD', '#D3E7F9', '#DFCFEA', '#FFD1C7', '#BBDEC8', '#FFE0ED'];

package/es/context/index.d.ts

@@ -12,11 +12,23 @@ export interface UserInfo {
     companyId: number;
     companyName: string;
 }
+export interface Menu {
+    helpUrl: string;
+    href: string;
+    icon: string;
+    name: string;
+    nametext: string;
+    supportVirtualApp: boolean;
+    childrens?: Menu[];
+}
 export interface GlobalContextProps {
     userGroupList?: Array<any>;
     eventGroupList?: EventGroup[];
     userPropList?: UserProp[];
     eventEnvList?: EnvProp[];
+    menuNameMap?: {
+        [name: string]: Menu;
+    };
     currentApp?: AppInfoProps;
     currentUser?: UserInfo;
     isDemo?: boolean;

package/es/dnd/demo/data.js

@@ -68,8 +68,9 @@ export default (function () {
         key: data.id
       }, data.label);
     },
-    onChange: function onChange(list) {
-      console.log('排序后数据', list);
+    onChange: function onChange(array) {
+      console.log('排序后数据', array);
+      setList(array);
     }
   }));
 });

package/es/dnd/demo/styles/index.less

@@ -6,7 +6,7 @@
 }
 .item {
   display: inline-block;
-  width: 300px;
+  width: 10%;
   height: 150px;
   margin: @margin-md;
   line-height: 150px;

package/es/dnd/index.js

@@ -91,7 +91,9 @@ var BizDnd = function BizDnd(props) {
           res.push(item);
         }
 
-        if (props.onChange) props.onChange(res);
+        setTimeout(function () {
+          if (props.onChange) props.onChange(res);
+        });
         return res;
       });
       return target;

package/es/dnd/item.js

@@ -47,10 +47,12 @@ var BizDndItem = function BizDndItem(props) {
     if (ref.current) {
       var computedStyle = window.getComputedStyle(ref.current);
       style = {
-        position: 'fixed',
+        position: '',
         pointerEvents: 'inherit',
         top: top - Number(computedStyle.marginTop.replace('px', '')),
-        left: left - Number(computedStyle.marginLeft.replace('px', ''))
+        left: left - Number(computedStyle.marginLeft.replace('px', '')),
+        width: computedStyle.width,
+        height: computedStyle.height
       };
       setStyle();
       preMouse = {
@@ -62,10 +64,13 @@ var BizDndItem = function BizDndItem(props) {
   }
 
   function onMouseMove(e) {
+    var computedStyle = window.getComputedStyle(ref.current);
     style.position = 'fixed';
     style.top += e.clientY - (preMouse.y || 0);
     style.left += e.clientX - (preMouse.x || 0);
     style.pointerEvents = 'none';
+    style.width = computedStyle.width;
+    style.height = computedStyle.height;
     setStyle();
     preMouse = {
       x: e.clientX,
@@ -82,7 +87,9 @@ var BizDndItem = function BizDndItem(props) {
       position: 'inherit',
       pointerEvents: 'inherit',
       top: 0,
-      left: 0
+      left: 0,
+      width: '',
+      height: ''
     };
     setStyle();
     if (props.onDropEnd) props.onDropEnd(data);
@@ -94,6 +101,7 @@ var BizDndItem = function BizDndItem(props) {
       ref.current.style.top = "".concat(style.top, "px");
       ref.current.style.left = "".concat(style.left, "px");
       ref.current.style.pointerEvents = style.pointerEvents;
+      ref.current.style.width = style.width;
     }
   }
 

package/es/mock/event.js

@@ -695,6 +695,43 @@ export default [{
   groupId: 4160,
   groupName: '小程序转化',
   eventList: [{
+    plats: [1, 2, 3],
+    click_analysis: false,
+    mark_type: null,
+    event_id: 7086289,
+    event_name: '付款成功',
+    event_hidden: 0,
+    event_type: 0,
+    is_stop: 0,
+    is_delete: 0,
+    alias_name: '',
+    event_attrs: [{
+      hidden: 0,
+      dimension_sub: 'event_attr',
+      encryption_type: 0,
+      alias_name: '',
+      value_dict: false,
+      attr_id: 5461056,
+      attr_name: '支付方式',
+      event_id: 7086289,
+      prop_type: 1,
+      is_stop: 0
+    }, {
+      hidden: 0,
+      dimension_sub: 'event_attr',
+      encryption_type: 0,
+      alias_name: '',
+      value_dict: false,
+      attr_id: 5461057,
+      attr_name: '金额',
+      event_id: 7086289,
+      prop_type: 2,
+      is_stop: 0
+    }],
+    stop_date_time: null,
+    insert_time: '2016-01-01 00:00:00',
+    owner: 'zg'
+  }, {
     plats: [3],
     click_analysis: false,
     mark_type: 1,

package/es/targetConditionGroup/components/targetDimension.js

@@ -76,11 +76,13 @@ var BizTargetDimension = function BizTargetDimension(props) {
 
   var getAttrOption = function getAttrOption(eventId) {
     var attrData = [];
+    var attrMap = {};
     eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
       group.eventList.forEach(function (event) {
         if (event.id === eventId) {
           event.attrList.forEach(function (attr) {
-            if (attr.type === 2 && !attr.isHidden && attr.label) {
+            if (attr.type === 2 && !attr.isHidden && attr.label && !attrMap[String(attr.id)]) {
+              attrMap[String(attr.id)] = true;
               attrData.push({
                 label: attr.label,
                 value: String(attr.id),

package/es/targetConditionGroup/demo/index.js

@@ -18,8 +18,8 @@ import userData from '../../mock/user';
 var defaultValue = {
   type: 'event',
   alias: 'alias',
-  eventId: 24143017,
-  eventGroupId: 4201,
+  eventId: 7086289,
+  eventGroupId: 4160,
   analysisIndex: 'times',
   filters: {
     relation: 'or',

package/es/userCondition/conditionTypeList.js

@@ -3,6 +3,7 @@ import { Space } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import './styles/conditionTypeList.less';
 import { BizUserConditionContext } from '.';
+import BizGlobalDataContext from '../context';
 
 var ConditionTypeList = function ConditionTypeList(props) {
   var onAdd = props.onAdd,
@@ -13,6 +14,9 @@ var ConditionTypeList = function ConditionTypeList(props) {
       textMode = _useContext.textMode,
       openTagCondition = _useContext.openTagCondition;
 
+  var _useContext2 = useContext(BizGlobalDataContext),
+      menuNameMap = _useContext2.menuNameMap;
+
   if (!show || textMode) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "biz-user-condition-type-list"
@@ -52,7 +56,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
     }
   }, /*#__PURE__*/React.createElement(Space, {
     key: "prop"
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3"))), openTagCondition ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u5C5E\u6027\u6EE1\u8DB3"))), openTagCondition && menuNameMap && menuNameMap['userTags'] ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     onClick: function onClick() {
       return onAdd('tag');

package/es/userCondition/styles/conditionWrap.less

@@ -10,7 +10,6 @@
   .biz-user-condition-item-delete {
     display: flex;
     align-items: center;
-    height: 40px;
     margin-left: @margin-lg;
     cursor: pointer;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.24-alpha.1",
+  "version": "1.0.24-alpha.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d11c81c871b7a2bb1bec63974a638665c506f4ce"
+  "gitHead": "2bbf073e332b60e06d87c7c947579d7ccc6d8fdd"
 }