@zgfe/business-lib 1.1.72-alpha.1 → 1.1.72-alpha.2

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 (5) hide show
  1. package/es/userCondition/conditionTypeList.js +4 -3
  2. package/es/userCondition/demo/business.js +0 -3
  3. package/es/userCondition/demo/index.js +0 -3
  4. package/es/userCondition/index.js +3 -4
  5. package/package.json +2 -2
package/es/userCondition/conditionTypeList.js CHANGED
@@ -19,7 +19,8 @@ var ConditionTypeList = function ConditionTypeList(props) {
19
19
  cdpTip = _useContext.cdpTip;
20
20
  var _useContext2 = useContext(BizGlobalDataContext),
21
21
  menuNameMap = _useContext2.menuNameMap,
22
- currentUser = _useContext2.currentUser;
22
+ currentUser = _useContext2.currentUser,
23
+ currentApp = _useContext2.currentApp;
23
24
  if (!show || textMode) return null;
24
25
  return /*#__PURE__*/React.createElement("div", {
25
26
  className: "biz-user-condition-type-list"
@@ -64,7 +65,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
64
65
  onClick: function onClick() {
65
66
  return onAdd('tag');
66
67
  }
67
- }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u6807\u7B7E"))) : null, (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion) === 2 ? /*#__PURE__*/React.createElement("li", {
68
+ }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u6807\u7B7E"))) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2 ? /*#__PURE__*/React.createElement("li", {
68
69
  className: "condition-type",
69
70
  onClick: function onClick() {
70
71
  return onAdd('cdp_csh');
@@ -73,7 +74,7 @@ var ConditionTypeList = function ConditionTypeList(props) {
73
74
  title: cdpTip
74
75
  }, /*#__PURE__*/React.createElement(IconFont, {
75
76
  type: "tishiicon"
76
- })) : null)) : null, (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion) !== 2 && openCdpCondition && (!menuNameMap || menuNameMap['dataset']) ? /*#__PURE__*/React.createElement("li", {
77
+ })) : null)) : null, (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) !== 2 && openCdpCondition && (!menuNameMap || menuNameMap['dataset']) ? /*#__PURE__*/React.createElement("li", {
77
78
  className: "condition-type",
78
79
  onClick: function onClick() {
79
80
  return onAdd('cdp');
package/es/userCondition/demo/business.js CHANGED
@@ -66,9 +66,6 @@ export default (function () {
66
66
  },
67
67
  menuNameMap: {
68
68
  userTags: true
69
- },
70
- currentUser: {
71
- companyBuyVersion: 2
72
69
  }
73
70
  }
74
71
  }, /*#__PURE__*/React.createElement("div", {
package/es/userCondition/demo/index.js CHANGED
@@ -53,9 +53,6 @@ export default (function () {
53
53
  currentApp: {
54
54
  appId: 204,
55
55
  platform: 0
56
- },
57
- currentUser: {
58
- companyBuyVersion: 2
59
56
  }
60
57
  }
61
58
  }, /*#__PURE__*/React.createElement("div", {
package/es/userCondition/index.js CHANGED
@@ -40,8 +40,7 @@ var BizUserCondition = function BizUserCondition(props) {
40
40
  eventEnvList = _useContext.eventEnvList,
41
41
  userPropList = _useContext.userPropList,
42
42
  menuNameMap = _useContext.menuNameMap,
43
- currentApp = _useContext.currentApp,
44
- currentUser = _useContext.currentUser;
43
+ currentApp = _useContext.currentApp;
45
44
  var andConditionNum = props.andConditionNum,
46
45
  defaultValue = props.defaultValue,
47
46
  openTagCondition = props.openTagCondition,
@@ -67,9 +66,9 @@ var BizUserCondition = function BizUserCondition(props) {
67
66
  var flag = false;
68
67
  defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.forEach(function (item) {
69
68
  var showItem = _toConsumableArray(item);
70
- if (!(showTag && showCdp && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion) === 2)) {
69
+ if (!(showTag && showCdp && (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) === 2)) {
71
70
  item === null || item === void 0 ? void 0 : item.forEach(function (data, index) {
72
- if (data.dataset && !showCdp || data.labels && !showTag || data.dataset_csh && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.companyBuyVersion) != 2) {
71
+ if (data.dataset && !showCdp || data.labels && !showTag || data.dataset_csh && (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appVersion) != 2) {
73
72
  showItem.splice(index, 1);
74
73
  flag = true;
75
74
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/business-lib",
3
- "version": "1.1.72-alpha.1",
3
+ "version": "1.1.72-alpha.2",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -58,5 +58,5 @@
58
58
  "react": "^16.12.0 || ^17.0.0",
59
59
  "yorkie": "^2.0.0"
60
60
  },
61
- "gitHead": "4eabb1d8e4353e4bca0b8dbcdfc950c783cb75e0"
61
+ "gitHead": "a9b46e3101e90a7ebc4cd527f5e8ae7b46747aa2"
62
62
  }