@zgfe/business-lib 1.2.50 → 1.2.51-plat.0

package/es/userCondition/conditions/cdpCondition.js

@@ -16,11 +16,12 @@ import { PropType } from '../types';
 import './styles/cdpCondition.less';
 import _ from 'lodash';
 import { dateOperate, numberOperate, stringOperate } from '../../attrConditions/utils/operates';
-import { DatePicker, Input } from 'antd';
+import { DatePicker, Input, Tooltip } from 'antd';
 import moment from 'moment';
 import { BizUserConditionContext } from '..';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
+import IconFont from '../../icon/iconFont';
 var classPrefix = 'biz-user-condition-cdp';
 var CdpConditionItem = function CdpConditionItem(props) {
   var _useContext = useContext(BizUserConditionContext),
@@ -263,7 +264,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
     keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
-  }), dataset ? /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u9009\u62E9\u660E\u7EC6\u6570\u636E\uFF0C\u589E\u52A0\u5E2E\u52A9\u5F15\u5BFC\u5165\u53E3"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "bangzhu",
+    className: "".concat(classPrefix, "-select-tips")
+  })), dataset ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-field"),

package/es/userCondition/conditions/cdpCshCondition.js

@@ -16,11 +16,12 @@ import { PropType } from '../types';
 import './styles/cdpCshCondition.less';
 import _ from 'lodash';
 import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOperateCsh2 } from '../../attrConditions/utils/operates';
-import { DatePicker, Input } from 'antd';
+import { DatePicker, Input, Tooltip } from 'antd';
 import moment from 'moment';
 import { BizUserConditionContext } from '..';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
+import IconFont from '../../icon/iconFont';
 var classPrefix = 'biz-user-condition-cdp-csh';
 var CdpConditionItem = function CdpConditionItem(props) {
   var _useContext = useContext(BizUserConditionContext),
@@ -407,7 +408,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
       keyField: "metaDatasetId",
       value: subDataset,
       onChange: onSubTableChange
-    }), /*#__PURE__*/React.createElement("div", {
+    }), /*#__PURE__*/React.createElement(Tooltip, {
+      title: "\u9009\u62E9\u660E\u7EC6\u6570\u636E\uFF0C\u589E\u52A0\u5E2E\u52A9\u5F15\u5BFC\u5165\u53E3"
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "bangzhu",
+      className: "".concat(classPrefix, "-select-tips")
+    })), /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-item")
     }, /*#__PURE__*/React.createElement(BizSelect, {
       className: "".concat(classPrefix, "-select-field"),
@@ -464,7 +470,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
     keyField: "metaDatasetId",
     value: dataset,
     onChange: onTableChange
-  }), dataset ? /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u9009\u62E9\u660E\u7EC6\u6570\u636E\uFF0C\u589E\u52A0\u5E2E\u52A9\u5F15\u5BFC\u5165\u53E3"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "bangzhu",
+    className: "".concat(classPrefix, "-select-tips")
+  })), dataset ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-select-field"),

package/es/userCondition/conditions/styles/cdpCondition.less

@@ -21,6 +21,12 @@
   &-select-dataset {
     width: 255px;
   }
+  &-select-tips {
+    height: 32px;
+    margin-left: 8px;
+    color: #9aa1a9;
+    line-height: 32px;
+  }
   &-select-field {
     width: 129px;
   }

package/es/userCondition/conditions/styles/cdpCshCondition.less

@@ -27,6 +27,12 @@
   &-select-dataset {
     width: 150px;
   }
+  &-select-tips {
+    height: 32px;
+    margin-left: 8px;
+    color: #9aa1a9;
+    line-height: 32px;
+  }
   &-select-field {
     width: 129px;
   }

package/es/userGroup/overlay.js

@@ -45,7 +45,8 @@ var Overlay = function Overlay(_ref2) {
   var _useContext = useContext(BizGlobalDataContext),
     userGroupList = _useContext.userGroupList,
     showUserGroupModal = _useContext.showUserGroupModal,
-    setUserGroupList = _useContext.setUserGroupList;
+    setUserGroupList = _useContext.setUserGroupList,
+    currentApp = _useContext.currentApp;
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     currentGroup = _useState6[0],
@@ -96,10 +97,10 @@ var Overlay = function Overlay(_ref2) {
     className: "".concat(classPrefix, "-typelist")
   }, [{
     type: 'userGroup',
-    label: '用户分群'
+    label: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5206\u7FA4")
   }, {
     type: 'tag',
-    label: '用户标签'
+    label: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u6807\u7B7E")
   }].map(function (item) {
     return /*#__PURE__*/React.createElement("div", {
       key: item.type,
@@ -123,13 +124,13 @@ var Overlay = function Overlay(_ref2) {
   }, /*#__PURE__*/React.createElement(Search, {
     show: true,
     onChange: onSearch,
-    placeholder: "\u641C\u7D22\u7528\u6237\u7FA4\u540D\u79F0"
+    placeholder: "\u641C\u7D22\u5206\u7FA4\u540D\u79F0"
   }), /*#__PURE__*/React.createElement("a", {
     className: "".concat(classPrefix, "-add"),
     onClick: onClickAdd
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "zengjia"
-  }), "\u65B0\u5EFA\u7528\u6237\u7FA4")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
+  }), "\u65B0\u5EFA\u5206\u7FA4")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
     data: showList || [],
     itemHeight: 32,
     itemKey: "id",

package/es/userGroupHeader/index.js

@@ -77,7 +77,7 @@ var BizUserGroupHeader = function BizUserGroupHeader(_ref) {
       placeholder: placeholder
     });
   })], /*#__PURE__*/React.createElement(Tooltip, {
-    title: "\u6DFB\u52A0\u7528\u6237\u7FA4\u505A\u5BF9\u6BD4"
+    title: "\u6DFB\u52A0\u5206\u7FA4\u505A\u5BF9\u6BD4"
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tianjia",
     className: "".concat(classPrefix, "-add ").concat(max && tempValue.length >= max ? 'disabled' : ''),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.50",
+    "version": "1.2.51-plat.0",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
     "files": [
@@ -55,7 +55,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "43bb6c649f157574dd89b35c9d491644708aecad",
+    "gitHead": "9754b25ed99633fd6b49b84307065bd28e482e7a",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }