@zgfe/business-lib 1.1.31-alpha.0 → 1.1.31-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/es/userCondition/conditions/businessCondition.js +15 -13
  2. package/es/userCondition/conditions/dataAttribute.js +6 -9
  3. package/es/userCondition/conditions/eventCondition.js +2 -2
  4. package/package.json +3 -3
package/es/userCondition/conditions/businessCondition.js CHANGED
@@ -37,16 +37,19 @@ var BusinessCondition = function BusinessCondition(props) {
37
37
  queryServiceAttributeList();
38
38
  }
39
39
  }, []);
40
- var items = [{
41
- label: '时间维度',
42
- key: 'time dimension'
43
- }];
44
- if (label === '订单数据') {
40
+ var items = [];
41
+ if (condition.timeDimensions.length < 3) {
42
+ items = items.concat([{
43
+ label: '时间维度',
44
+ key: 'time dimension'
45
+ }]);
46
+ }
47
+ if (label === '订单数据' && condition.attrs.length < 6) {
45
48
  items = items.concat([{
46
49
  label: '订单属性',
47
50
  key: 'order attribute'
48
51
  }]);
49
- } else {
52
+ } else if (label === '业务数据' && condition.attrs.length < 6) {
50
53
  items = items.concat([{
51
54
  label: '业务属性',
52
55
  key: 'service attribute'
@@ -91,10 +94,9 @@ var BusinessCondition = function BusinessCondition(props) {
91
94
  }]);
92
95
  }
93
96
  function queryServiceAttributeList() {
94
- request('https://cep-vip.zhugeio.com/cep-console/api/v1/bizdata/type/list', {
97
+ request('/cep-console/api/v1/bizdata/type/list', {
95
98
  headers: {
96
- 'Content-Type': 'application/json',
97
- token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIwIiwiY29tcGFueUlkIjoyLCJleHAiOjE2Nzg3MTYwMzAsImlhdCI6MTY3ODY3MjgzMCwidXNlcklkIjowfQ.betSVs513b-6v8x_ErbS8xhROemLiOmx3CtqUq_R4k0'
99
+ 'Content-Type': 'application/json'
98
100
  },
99
101
  method: 'get'
100
102
  }).then(function (res) {
@@ -216,7 +218,7 @@ var BusinessCondition = function BusinessCondition(props) {
216
218
  timeOperator: 'all',
217
219
  timeValues: []
218
220
  };
219
- if (condition.timeDimensions.length < 3) {
221
+ if (condition.timeDimensions.length !== 3) {
220
222
  condition.timeDimensions.push(obj);
221
223
  } else {
222
224
  notification.info({
@@ -372,13 +374,13 @@ var BusinessCondition = function BusinessCondition(props) {
372
374
  }, /*#__PURE__*/React.createElement(IconFont, {
373
375
  type: "qingchu"
374
376
  }))));
375
- }), /*#__PURE__*/React.createElement("div", {
377
+ }), condition.timeDimensions.length !== 3 || condition.attrs.length !== 6 ? /*#__PURE__*/React.createElement("div", {
376
378
  style: {
377
379
  margin: '2px 0 0 65px',
378
380
  color: '#4075fd',
379
381
  fontSize: '12px'
380
382
  }
381
- }, label === '订单数据' || serviceAttribute ? /*#__PURE__*/React.createElement(Dropdown, {
383
+ }, /*#__PURE__*/React.createElement(Dropdown, {
382
384
  menu: {
383
385
  items: items,
384
386
  onClick: onClick
@@ -387,7 +389,7 @@ var BusinessCondition = function BusinessCondition(props) {
387
389
  onClick: function onClick(e) {
388
390
  return e.preventDefault();
389
391
  }
390
- }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null)))) : null));
392
+ }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null);
391
393
  };
392
394
  BusinessCondition.defaultProps = {
393
395
  isEvent: false,
package/es/userCondition/conditions/dataAttribute.js CHANGED
@@ -55,10 +55,9 @@ var DataAttribute = function DataAttribute(props) {
55
55
  }
56
56
  }, [searchValue]);
57
57
  function queryAppList(type) {
58
- request(type === 'master' ? 'https://cep-vip.zhugeio.com/cep-console/api/v1/cdp/orderAttribute/master' : 'https://cep-vip.zhugeio.com/cep-console/api/v1/cdp/orderAttribute/son', {
58
+ request(type === 'master' ? '/cep-console/api/v1/cdp/orderAttribute/master' : '/cep-console/api/v1/cdp/orderAttribute/son', {
59
59
  headers: {
60
- 'Content-Type': 'application/json',
61
- token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIwIiwiY29tcGFueUlkIjoyLCJleHAiOjE2Nzg3MTYwMzAsImlhdCI6MTY3ODY3MjgzMCwidXNlcklkIjowfQ.betSVs513b-6v8x_ErbS8xhROemLiOmx3CtqUq_R4k0'
60
+ 'Content-Type': 'application/json'
62
61
  },
63
62
  method: 'post',
64
63
  data: {
@@ -84,10 +83,9 @@ var DataAttribute = function DataAttribute(props) {
84
83
  });
85
84
  }
86
85
  function queryValueList(keyword, operate) {
87
- request('https://cep-vip.zhugeio.com/cep-console/api/v1/es/data/attr/value', {
86
+ request('/cep-console/api/v1/es/data/attr/value', {
88
87
  headers: {
89
- 'Content-Type': 'application/json',
90
- token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIwIiwiY29tcGFueUlkIjoyLCJleHAiOjE2Nzg3MTYwMzAsImlhdCI6MTY3ODY3MjgzMCwidXNlcklkIjowfQ.betSVs513b-6v8x_ErbS8xhROemLiOmx3CtqUq_R4k0'
88
+ 'Content-Type': 'application/json'
91
89
  },
92
90
  method: 'post',
93
91
  data: {
@@ -117,10 +115,9 @@ var DataAttribute = function DataAttribute(props) {
117
115
  });
118
116
  }
119
117
  function queryBizDataAttrList(bizDataTypeId) {
120
- request('https://cep-vip.zhugeio.com/cep-console/api/v1/bizdata/attr/list', {
118
+ request('/cep-console/api/v1/bizdata/attr/list', {
121
119
  headers: {
122
- 'Content-Type': 'application/json',
123
- token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIwIiwiY29tcGFueUlkIjoyLCJleHAiOjE2Nzg3MTYwMzAsImlhdCI6MTY3ODY3MjgzMCwidXNlcklkIjowfQ.betSVs513b-6v8x_ErbS8xhROemLiOmx3CtqUq_R4k0'
120
+ 'Content-Type': 'application/json'
124
121
  },
125
122
  method: 'post',
126
123
  data: {
package/es/userCondition/conditions/eventCondition.js CHANGED
@@ -164,7 +164,7 @@ var EventCondition = function EventCondition(props) {
164
164
  }, /*#__PURE__*/React.createElement(IconFont, {
165
165
  type: "qingchu"
166
166
  }))));
167
- }), /*#__PURE__*/React.createElement("div", {
167
+ }), condition.timeDimensions.length < 3 ? /*#__PURE__*/React.createElement("div", {
168
168
  style: {
169
169
  margin: '2px 0 0 38px',
170
170
  color: '#4075fd',
@@ -179,6 +179,6 @@ var EventCondition = function EventCondition(props) {
179
179
  onClick: function onClick(e) {
180
180
  return e.preventDefault();
181
181
  }
182
- }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))));
182
+ }, /*#__PURE__*/React.createElement(Space, null, "\u9AD8\u7EA7\u7B5B\u9009", /*#__PURE__*/React.createElement(DownOutlined, null))))) : null);
183
183
  };
184
184
  export default EventCondition;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.1.31-alpha.0",
3
+ "version": "1.1.31-alpha.1",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -59,5 +59,5 @@
59
59
  "react": "^16.12.0 || ^17.0.0",
60
60
  "yorkie": "^2.0.0"
61
61
  },
62
- "gitHead": "b2e287ebcfeaa841e1f4e10bd9891e58f3223e95"
63
- }
62
+ "gitHead": "052bb4383bf8d91fc74db8c6285d8d220306e776"
63
+ }