@zgfe/business-lib 1.0.30-alpha.0 → 1.0.30-user.0

package/es/constants/apis.d.ts

@@ -5,5 +5,7 @@ declare const Apis: {
     addPanel: string;
     updatePanelTarget: string;
     queryPanelGroup: string;
+    queryDatasetList: string;
+    queryDatasetDetail: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -4,6 +4,8 @@ var Apis = {
   esQuery: '/data/queryEsData.jsp',
   addPanel: '/apppanel/addPanelElement.jsp',
   updatePanelTarget: '/apppanel/updateElemet.jsp',
-  queryPanelGroup: '/apppanel/panels.jsp'
+  queryPanelGroup: '/apppanel/panels.jsp',
+  queryDatasetList: '/zg/web/cdp/inner/dataset/list',
+  queryDatasetDetail: '/zg/web/cdp/inner/dataset/detail'
 };
 export default Apis;

package/es/layout/detail/index.less

@@ -7,8 +7,7 @@
   margin: 0 auto;
   &-menu {
     flex: none;
-    padding-top: @padding-md;
-    padding-bottom: @padding-md - 2;
+    padding: @padding-sm 0;
     color: @text-color-secondary;
     a {
       margin-right: @margin-md;
@@ -20,7 +19,7 @@
   }
   &-content {
     flex: 1;
-    padding: @padding-sm @padding-lg @padding-lg @padding-lg;
+    padding: @padding-md @padding-lg @padding-lg @padding-lg;
     overflow-y: auto;
     background-color: @white;
     border-radius: @border-radius-normal;

package/es/userCondition/conditionTypeList.js

@@ -12,7 +12,8 @@ var ConditionTypeList = function ConditionTypeList(props) {
 
   var _useContext = useContext(BizUserConditionContext),
       textMode = _useContext.textMode,
-      openTagCondition = _useContext.openTagCondition;
+      openTagCondition = _useContext.openTagCondition,
+      openCdpCondition = _useContext.openCdpCondition;
 
   var _useContext2 = useContext(BizGlobalDataContext),
       menuNameMap = _useContext2.menuNameMap;
@@ -61,7 +62,12 @@ var ConditionTypeList = function ConditionTypeList(props) {
     onClick: function onClick() {
       return onAdd('tag');
     }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u6807\u7B7E"))) : null));
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u6807\u7B7E"))) : null, openCdpCondition && (!menuNameMap || menuNameMap['cdp']) ? /*#__PURE__*/React.createElement("li", {
+    className: "condition-type",
+    onClick: function onClick() {
+      return onAdd('cdp');
+    }
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u660E\u7EC6\u6570\u636E"))) : null));
 };
 
 ConditionTypeList.defaultProps = {

package/es/userCondition/conditions/cdpCondition.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import { AllConditionBasePropsI, BizUserConditionT } from '../types';
+import './styles/cdpCondition.less';
+interface CdpConditionProps extends AllConditionBasePropsI<BizUserConditionT.CdpConditionDetail[]> {
+    defaultValue?: BizUserConditionT.CdpCondition;
+}
+declare const CdpCondition: React.FC<CdpConditionProps>;
+export default CdpCondition;

package/es/userCondition/conditions/cdpCondition.js

@@ -0,0 +1,326 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useContext, useEffect, useState } from 'react';
+import BizSelect from '../../select';
+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 moment from 'moment';
+import { BizUserConditionContext } from '..';
+import request from '../../utils/ajax';
+import Apis from '../../constants/apis';
+import BizGlobalDataContext from '../../context';
+var classPrefix = 'biz-user-condition-cdp';
+
+var CdpConditionItem = function CdpConditionItem(props) {
+  var _useContext = useContext(BizGlobalDataContext),
+      currentApp = _useContext.currentApp;
+
+  var _useContext2 = useContext(BizUserConditionContext),
+      _useContext2$datasetL = _useContext2.datasetList,
+      datasetList = _useContext2$datasetL === void 0 ? [] : _useContext2$datasetL;
+
+  var _useState = useState(function () {
+    if (props.value) {
+      return {
+        id: props.value.datasetId,
+        tableName: props.value.datasetTable
+      };
+    }
+
+    return;
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      dataset = _useState2[0],
+      setDataset = _useState2[1];
+
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      field = _useState4[0],
+      setField = _useState4[1];
+
+  var _useState5 = useState(),
+      _useState6 = _slicedToArray(_useState5, 2),
+      operator = _useState6[0],
+      setOperator = _useState6[1];
+
+  var _useState7 = useState(),
+      _useState8 = _slicedToArray(_useState7, 2),
+      fieldValue = _useState8[0],
+      setFieldValue = _useState8[1];
+
+  var _useState9 = useState([]),
+      _useState10 = _slicedToArray(_useState9, 2),
+      fieldList = _useState10[0],
+      setFieldList = _useState10[1];
+
+  var _useState11 = useState(true),
+      _useState12 = _slicedToArray(_useState11, 2),
+      isFirst = _useState12[0],
+      setIsFirst = _useState12[1];
+
+  useEffect(function () {
+    if (!props.value) {
+      setIsFirst(false);
+      return;
+    }
+
+    var _props$value = props.value,
+        datasetId = _props$value.datasetId,
+        datasetTable = _props$value.datasetTable,
+        fieldName = _props$value.fieldName,
+        fieldType = _props$value.fieldType,
+        webType = _props$value.webType,
+        operator = _props$value.operator,
+        params = _props$value.params;
+    setDataset({
+      id: datasetId,
+      tableName: datasetTable
+    });
+    setField({
+      name: fieldName,
+      type: fieldType,
+      webType: webType
+    });
+    setOperator({
+      value: operator
+    });
+
+    if (params) {
+      setFieldValue(params);
+    }
+
+    onDatasetChange(datasetId);
+    setTimeout(function () {
+      setIsFirst(false);
+    }, 0);
+  }, []);
+  useEffect(function () {
+    if (isFirst) return;
+    if (!dataset) return;
+    props.onChange({
+      datasetId: dataset.id,
+      datasetTable: dataset.tableName,
+      fieldName: field === null || field === void 0 ? void 0 : field.name,
+      fieldType: field === null || field === void 0 ? void 0 : field.type,
+      webType: field === null || field === void 0 ? void 0 : field.webType,
+      paramType: field === null || field === void 0 ? void 0 : field.webType,
+      operator: operator === null || operator === void 0 ? void 0 : operator.value,
+      params: fieldValue
+    });
+  }, [dataset, field, operator, fieldValue]);
+  useEffect(function () {
+    if (isFirst) return;
+    if (['absolute', 'relative', 'is null', 'is not null'].includes(operator === null || operator === void 0 ? void 0 : operator.value)) setFieldValue([]);
+  }, [operator]);
+
+  var onDatasetChange = function onDatasetChange(datasetId) {
+    if (!datasetId) {
+      setFieldList([]);
+      return;
+    }
+
+    request(Apis.queryDatasetDetail, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
+        datasetId: datasetId
+      }
+    }).then(function (result) {
+      setFieldList(result.data || []);
+    }).catch(function (e) {
+      console.error(e);
+      setFieldList([]);
+    });
+  };
+
+  var onTableChange = function onTableChange(data) {
+    setDataset(data);
+    setField({
+      name: undefined
+    });
+    setOperator(undefined);
+    setFieldValue([]);
+    onDatasetChange(data.id);
+  };
+
+  var onFieldChange = function onFieldChange(data) {
+    setField(data);
+    setOperator(getOptions(data.webType)[0]);
+    setFieldValue([]);
+  };
+
+  var onOperateChange = function onOperateChange(operate) {
+    setOperator(operate);
+  };
+
+  function getOptions(type) {
+    var list = [];
+
+    switch (type) {
+      case PropType.DATE:
+        list = dateOperate;
+        break;
+
+      case PropType.NUMBER:
+        list = numberOperate;
+        break;
+
+      case PropType.STRING:
+        list = stringOperate;
+        break;
+
+      default:
+        list = [];
+    }
+
+    return list;
+  }
+
+  function renderByType() {
+    if (!field || !field.name) return null;
+    var optionList = getOptions(field.webType);
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-condition-group")
+    }, /*#__PURE__*/React.createElement(BizSelect, {
+      className: "".concat(classPrefix, "-select-condition"),
+      options: optionList,
+      labelField: "name",
+      keyField: "value",
+      overlayWidth: 96,
+      value: operator,
+      onChange: onOperateChange
+    }), function () {
+      switch (field.webType) {
+        case PropType.DATE:
+          if ((operator === null || operator === void 0 ? void 0 : operator.value) === 'absolute') return /*#__PURE__*/React.createElement(DatePicker.RangePicker, {
+            className: "".concat(classPrefix, "-value date"),
+            format: 'YYYY-MM-DD',
+            defaultValue: function () {
+              if (_.isArray(fieldValue)) return fieldValue.map(function (d) {
+                return moment(d);
+              });
+              return undefined;
+            }(),
+            onChange: function onChange() {
+              setFieldValue(arguments.length <= 1 ? undefined : arguments[1]);
+            }
+          });
+          if ((operator === null || operator === void 0 ? void 0 : operator.value) === 'relative') return /*#__PURE__*/React.createElement(Input, {
+            key: "relative-date",
+            className: "".concat(classPrefix, "-value date"),
+            type: "number",
+            defaultValue: fieldValue && fieldValue[0],
+            onChange: function onChange(e) {
+              e.persist();
+              setFieldValue([e.target.value]);
+            },
+            suffix: "\u5929"
+          });
+
+        case PropType.STRING:
+          if (['is null', 'is not null'].includes(operator === null || operator === void 0 ? void 0 : operator.value)) return null;
+          return /*#__PURE__*/React.createElement(Input, {
+            className: "".concat(classPrefix, "-value"),
+            value: fieldValue && fieldValue[0],
+            onChange: function onChange(e) {
+              e.persist();
+              setFieldValue([e.target.value]);
+            }
+          });
+
+        case PropType.NUMBER:
+          return /*#__PURE__*/React.createElement(Input, {
+            type: "number",
+            className: "".concat(classPrefix, "-value"),
+            value: fieldValue && fieldValue[0],
+            onChange: function onChange(e) {
+              e.persist();
+              setFieldValue([e.target.value]);
+            }
+          });
+      }
+    }());
+  }
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-content")
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    className: "".concat(classPrefix, "-select-dataset"),
+    options: datasetList,
+    placeholder: "\u9009\u62E9\u660E\u7EC6\u8868",
+    labelField: "datasetName",
+    keyField: "tableName",
+    value: dataset,
+    onChange: onTableChange
+  }), dataset ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-item")
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    className: "".concat(classPrefix, "-select-field"),
+    options: fieldList,
+    placeholder: "\u9009\u62E9\u5B57\u6BB5",
+    labelField: "name",
+    keyField: "name",
+    value: field,
+    onChange: onFieldChange
+  }), renderByType()) : null);
+};
+
+var CdpCondition = function CdpCondition(props) {
+  var dataId = props.dataId,
+      defaultValue = props.defaultValue,
+      onChange = props.onChange;
+
+  var _useState13 = useState([undefined]),
+      _useState14 = _slicedToArray(_useState13, 2),
+      cdpConditions = _useState14[0],
+      setCdpConditions = _useState14[1];
+
+  useEffect(function () {
+    if (defaultValue && defaultValue.dataset) {
+      setCdpConditions(defaultValue.dataset.length ? defaultValue.dataset : [undefined]);
+    }
+  }, []);
+
+  var onChangeCondition = function onChangeCondition(condition, index) {
+    var resData = _.cloneDeep(cdpConditions);
+
+    resData[index] = _objectSpread({}, condition);
+    onChange(dataId, resData);
+  };
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: classPrefix
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-label")
+  }, "\u660E\u7EC6\u6570\u636E"), cdpConditions.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(CdpConditionItem, {
+      value: item,
+      key: (item === null || item === void 0 ? void 0 : item.fieldName) || index,
+      onChange: function onChange(data) {
+        return onChangeCondition(data, index);
+      }
+    });
+  }));
+};
+
+export default CdpCondition;

package/es/userCondition/conditions/constants.d.ts

@@ -18,6 +18,10 @@ export declare const operatorMap: {
     '>': string;
     '>=': string;
     '<=': string;
+    lt: string;
+    gt: string;
+    ge: string;
+    le: string;
 };
 export declare const durationHandler: {
     [key: string]: any;

package/es/userCondition/conditions/constants.js

@@ -17,7 +17,11 @@ export var operatorMap = {
   '<': '<',
   '>': '>',
   '>=': '≥',
-  '<=': '≤'
+  '<=': '≤',
+  lt: '<',
+  gt: '>',
+  ge: '≥',
+  le: '≤'
 };
 export var durationHandler = {
   1: {

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

@@ -0,0 +1,31 @@
+@import '../../../assets/styles/variable.less';
+
+.biz-user-condition-cdp {
+  display: flex;
+
+  &-content,
+  &-condition-group {
+    display: flex;
+  }
+
+  &-label {
+    margin-right: @margin-xs;
+    line-height: 32px;
+  }
+
+  &-item {
+    display: flex;
+    margin-left: @margin-xs;
+  }
+
+  &-select-dataset {
+    width: 255px;
+  }
+  &-select-field {
+    width: 129px;
+  }
+  &-select-condition {
+    width: 96px;
+    margin: 0 @margin-xs;
+  }
+}

package/es/userCondition/conditions/textDesc.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { BizUserConditionT } from '../types';
 import './styles/textDesc.less';
 export interface TextProps {
-    condition: BizUserConditionT.ActiveCondition | BizUserConditionT.AddCondition | BizUserConditionT.PropCondition | BizUserConditionT.EventCondition | BizUserConditionT.TagsCondition;
+    condition: BizUserConditionT.ActiveCondition | BizUserConditionT.AddCondition | BizUserConditionT.PropCondition | BizUserConditionT.EventCondition | BizUserConditionT.TagsCondition | BizUserConditionT.CdpCondition;
     showOrDesc: boolean;
 }
 declare const Text: React.FC<TextProps>;

package/es/userCondition/conditions/textDesc.js

@@ -40,30 +40,34 @@ var Text = function Text(props) {
       userTagsData = _useContext3.userTagsData;
 
   function render() {
-    var data = condition;
+    if (condition.labels) {
+      return renderTags(condition);
+    }
 
-    if (data.labels) {
-      return renderTags(data);
+    if (condition.dataset) {
+      return renderCdp(condition);
     }
 
-    if (String(condition.eventId) === '-4') {
+    var data = condition;
+
+    if (String(data.eventId) === '-4') {
       return renderPeriod({
         before: '活跃于'
-      }, condition.runPeriod);
+      }, data.runPeriod);
     }
 
-    if (String(condition.eventId) === '-3') {
+    if (String(data.eventId) === '-3') {
       return renderPeriod({
         before: '新增于'
-      }, condition.runPeriod);
+      }, data.runPeriod);
     }
 
-    if (condition.eventId === undefined) {
-      return renderProps(condition.attrs[0], 'user');
+    if (data.eventId === undefined) {
+      return renderProps(data.attrs[0], 'user');
     }
 
-    if (condition.eventId) {
-      return renderEvent(condition);
+    if (data.eventId) {
+      return renderEvent(data);
     }
   }
 
@@ -206,6 +210,51 @@ var Text = function Text(props) {
     }), /*#__PURE__*/React.createElement("span", null, ")")));
   }
 
+  function renderCdp(condition) {
+    var dataset = condition.dataset;
+    return /*#__PURE__*/React.createElement("span", {
+      style: {
+        backgroundColor: '#effcff',
+        padding: '6px 7px'
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-text-desc-value")
+    }, /*#__PURE__*/React.createElement("span", null, "("), dataset.map(function (value) {
+      if (!value) return null;
+      var operator = value.operator,
+          _value$params = value.params,
+          params = _value$params === void 0 ? [] : _value$params;
+      var valuesDom = '';
+
+      var numOperatorMap = _objectSpread(_objectSpread({}, operatorMap), {}, {
+        'not equal': '≠'
+      });
+
+      if (value.webType === 'date') {
+        if (operator === 'relative') {
+          valuesDom = "\u4E3A\u6700\u8FD1".concat(params[0], "\u5929");
+        }
+
+        if (operator === 'absolute') {
+          valuesDom = "\u4E3A".concat(params[0], "\u5230").concat(params[1]);
+        }
+      } else {
+        if (operator) {
+          var operateTxt = numOperatorMap[operator];
+          valuesDom = operateTxt;
+
+          if (params && params[0]) {
+            valuesDom += params[0];
+          }
+        }
+      }
+
+      return /*#__PURE__*/React.createElement("span", {
+        key: Math.random()
+      }, "".concat(value.datasetTable, "\u4E2D").concat(value.fieldName).concat(valuesDom));
+    }), /*#__PURE__*/React.createElement("span", null, ")")));
+  }
+
   function renderPropValues(attr) {
     if (attr.attrType === 'cont-date') {
       return renderDateValues(attr.operator, attr.params);

package/es/userCondition/demo/index.d.ts

@@ -1,2 +1,3 @@
+import '@zgfe/business-lib/es/assets/iconfont/iconfont.css';
 declare const _default: () => JSX.Element;
 export default _default;

package/es/userCondition/demo/index.js

@@ -16,6 +16,7 @@ import envData from '../../mock/env';
 import userData from '../../mock/user';
 import { BizUserCondition, BizGlobalDataContext, convertAttributeData } from '@zgfe/business-lib';
 import { conditions, tagList } from './mockData';
+import '@zgfe/business-lib/es/assets/iconfont/iconfont.css';
 var getTagList = Promise.resolve(tagList);
 export default (function () {
   var _useState = useState({
@@ -49,7 +50,7 @@ export default (function () {
   }, [conditions]);
 
   function onChange(value) {
-    console.log(JSON.stringify(value));
+    console.log('change:', JSON.stringify(value));
   }
 
   var descDom = /*#__PURE__*/React.createElement(BizUserCondition, {
@@ -57,6 +58,7 @@ export default (function () {
     onChange: onChange,
     eventAttrNum: 3,
     openTagCondition: true,
+    openCdpCondition: true,
     userTagsData: userTagsData,
     isRealTime: true
   });
@@ -66,7 +68,7 @@ export default (function () {
       userPropList: newStore.userPropList,
       eventEnvList: newStore.envPropList,
       currentApp: {
-        appId: 160,
+        appId: 181,
         platform: 0
       }
     }

package/es/userCondition/demo/mockData.d.ts

@@ -73,7 +73,7 @@ export declare const tagList: ({
     }[];
     startProcessTime: string;
 })[];
-export declare const conditions: {
+export declare const conditions: ({
     attrs: {
         attrId: number;
         attrName: string;
@@ -82,4 +82,27 @@ export declare const conditions: {
         params: string[];
         attrType: string;
     }[];
-}[][];
+    dataset?: undefined;
+} | {
+    dataset: {
+        datasetId: number;
+        datasetTable: string;
+        fieldName: string;
+        fieldType: string;
+        webType: string;
+        paramType: string;
+        operator: string;
+        params: string[];
+    }[];
+    attrs?: undefined;
+})[][];
+export declare const datasetList: {
+    id: number;
+    datasetName: string;
+    tableName: string;
+}[];
+export declare const datasetNames: {
+    name: string;
+    type: string;
+    webType: string;
+}[];

package/es/userCondition/demo/mockData.js

@@ -543,4 +543,71 @@ export var conditions = [[{
     params: ['2022-09-07', '2022-09-08'],
     attrType: 'cont-date'
   }]
-}]];
+}, {
+  dataset: [{
+    datasetId: 12,
+    datasetTable: 'table_2',
+    fieldName: 'b_id',
+    fieldType: 'bigint',
+    webType: 'string',
+    paramType: 'string',
+    operator: 'equal',
+    params: ['88']
+  }]
+}], [{
+  dataset: [{
+    datasetId: 13,
+    datasetTable: 'table_3',
+    fieldName: 'a_id',
+    fieldType: 'bigint',
+    webType: 'number',
+    paramType: 'number',
+    operator: 'lt',
+    params: ['222']
+  }]
+}, {
+  dataset: [{
+    datasetId: 16,
+    datasetTable: 'table_4',
+    fieldName: 'b_id',
+    fieldType: 'bigint',
+    webType: 'string',
+    paramType: 'string',
+    operator: 'is not null',
+    params: []
+  }]
+}]];
+export var datasetList = [{
+  id: 12,
+  datasetName: '数据集2',
+  tableName: 'table_2'
+}, {
+  id: 13,
+  datasetName: '数据集3',
+  tableName: 'table_3'
+}, {
+  id: 16,
+  datasetName: '数据集4',
+  tableName: 'table_4'
+}, {
+  id: 18,
+  datasetName: '数据集5',
+  tableName: 'table_5'
+}];
+export var datasetNames = [{
+  name: 'a_id',
+  type: 'bigint',
+  webType: 'number'
+}, {
+  name: 'b_id',
+  type: 'bigint',
+  webType: 'string'
+}, {
+  name: 'e_id',
+  type: 'bigint',
+  webType: 'date'
+}, {
+  name: 'f_id',
+  type: 'bigint',
+  webType: 'number'
+}];

package/es/userCondition/index.js

@@ -26,25 +26,33 @@ import './styles/index.less';
 import { buildCondition } from './util';
 import _ from 'lodash';
 import BizGlobalDataContext from '../context';
+import IconFont from '../icon/iconFont';
+import request from '../utils/ajax';
+import Apis from '../constants/apis';
 export var BizUserConditionContext = /*#__PURE__*/createContext({
   orConditionNum: 2,
   eventAttrNum: 1,
   textMode: false,
   openTagCondition: false,
+  openCdpCondition: false,
   userTagsData: [],
   envNameList: [],
-  userPropsMap: {}
+  userPropsMap: {},
+  datasetList: []
 });
 export var classPrefix = 'biz-user-condition';
 
 var BizUserCondition = function BizUserCondition(props) {
   var _useContext = useContext(BizGlobalDataContext),
       eventEnvList = _useContext.eventEnvList,
-      userPropList = _useContext.userPropList;
+      userPropList = _useContext.userPropList,
+      menuNameMap = _useContext.menuNameMap,
+      currentApp = _useContext.currentApp;
 
   var andConditionNum = props.andConditionNum,
       defaultValue = props.defaultValue,
       openTagCondition = props.openTagCondition,
+      openCdpCondition = props.openCdpCondition,
       userTagsData = props.userTagsData;
 
   var _useState = useState([]),
@@ -68,6 +76,11 @@ var BizUserCondition = function BizUserCondition(props) {
       value = _useState6[0],
       setValue = _useState6[1];
 
+  var _useState7 = useState([]),
+      _useState8 = _slicedToArray(_useState7, 2),
+      dataset = _useState8[0],
+      setDataset = _useState8[1];
+
   var envNameList = useMemo(function () {
     return eventEnvList ? eventEnvList.map(function (env) {
       return env.name;
@@ -82,6 +95,10 @@ var BizUserCondition = function BizUserCondition(props) {
   }, [userPropList]);
   useEffect(function () {
     initShowList();
+
+    if (props.openCdpCondition && (!menuNameMap || menuNameMap['cdp'])) {
+      getDatasetList();
+    }
   }, []);
 
   function initShowList() {
@@ -140,16 +157,33 @@ var BizUserCondition = function BizUserCondition(props) {
     props.onChange && props.onChange(newValue);
   }
 
+  function getDatasetList() {
+    request(Apis.queryDatasetList, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform
+      }
+    }).then(function (result) {
+      setDataset(result.data || []);
+    }).catch(function (e) {
+      console.error(e);
+      setDataset([]);
+    });
+  }
+
   return /*#__PURE__*/React.createElement(BizUserConditionContext.Provider, {
     value: {
       orConditionNum: props.orConditionNum || 2,
       eventAttrNum: props.eventAttrNum || 1,
       textMode: props.textMode,
       openTagCondition: openTagCondition,
+      openCdpCondition: openCdpCondition,
       userTagsData: userTagsData !== null && userTagsData !== void 0 ? userTagsData : [],
       isRealTime: props.isRealTime,
       envNameList: envNameList,
-      userPropsMap: userPropsMap
+      userPropsMap: userPropsMap,
+      datasetList: dataset
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
@@ -172,7 +206,11 @@ var BizUserCondition = function BizUserCondition(props) {
     show: value.length < andConditionNum,
     label: "\u4E14",
     onAdd: onAdd
-  })));
+  }), openCdpCondition && (!menuNameMap || menuNameMap['cdp']) ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-tip")
+  }, ' ', /*#__PURE__*/React.createElement(IconFont, {
+    type: "tishiicon"
+  }), "\u660E\u7EC6\u8868\u4E2D\u9700\u5B58\u5728\u300Cuser_id\u300D\u6761\u4EF6\u65B9\u53EF\u751F\u6548\u3002") : null));
 };
 
 BizUserCondition.defaultProps = {

package/es/userCondition/orConditions.js

@@ -32,12 +32,14 @@ import EventCondition from './conditions/eventCondition';
 import TagsCondition from './conditions/tagsCondition';
 import { classPrefix } from '.';
 import Text from './conditions/textDesc';
+import CdpCondition from './conditions/cdpCondition';
 
 var OrConditions = function OrConditions(props) {
   var _useContext = useContext(BizUserConditionContext),
       orConditionNum = _useContext.orConditionNum,
       textMode = _useContext.textMode,
-      openTagCondition = _useContext.openTagCondition;
+      openTagCondition = _useContext.openTagCondition,
+      openCdpCondition = _useContext.openCdpCondition;
 
   var orConditions = props.orConditions,
       showAndDesc = props.showAndDesc;
@@ -121,6 +123,10 @@ var OrConditions = function OrConditions(props) {
     changeData('tag', id, newTags);
   }
 
+  function onChangeCdp(id, newCdp) {
+    changeData('cdp', id, newCdp);
+  }
+
   function changeData(type, id, newData) {
     var newValue = [];
     showList.forEach(function (data) {
@@ -133,6 +139,8 @@ var OrConditions = function OrConditions(props) {
           data.condition = newData;
         } else if (type === 'tag') {
           data.condition.labels = newData;
+        } else if (type === 'cdp') {
+          data.condition.dataset = newData;
         }
       }
 
@@ -185,34 +193,45 @@ var OrConditions = function OrConditions(props) {
         dataId: id,
         onChange: onChangeTags
       });
-    } else if (condition.eventId === undefined) {
-      conditionDom = /*#__PURE__*/React.createElement(PropCondition, {
-        label: "\u5C5E\u6027",
-        attrs: condition.attrs,
+    } else if (condition.dataset) {
+      if (!openCdpCondition) return null;
+      conditionDom = /*#__PURE__*/React.createElement(CdpCondition, {
+        defaultValue: condition,
         dataId: id,
-        onChange: onChangeAttrs
+        onChange: onChangeCdp
       });
-    } else if (String(condition.eventId) === '-3') {
-      conditionDom = /*#__PURE__*/React.createElement(PeriodCondition, {
-        label: "\u65B0\u589E\u4E8E",
-        dataId: id,
-        onChange: onChangeRunPeriod,
-        runPeriod: condition.runPeriod
-      });
-    } else if (String(condition.eventId) === '-4') {
-      conditionDom = /*#__PURE__*/React.createElement(PeriodCondition, {
-        label: "\u6D3B\u8DC3\u4E8E",
-        isRealTime: true,
-        dataId: id,
-        onChange: onChangeRunPeriod,
-        runPeriod: condition.runPeriod
-      });
-    } else if (util.isNumber(condition.eventId)) {
-      conditionDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EventCondition, {
-        dataId: id,
-        onChange: onChangeEvent,
-        condition: condition
-      }));
+    } else {
+      var conditionData = condition;
+
+      if (conditionData.eventId === undefined) {
+        conditionDom = /*#__PURE__*/React.createElement(PropCondition, {
+          label: "\u5C5E\u6027",
+          attrs: conditionData.attrs,
+          dataId: id,
+          onChange: onChangeAttrs
+        });
+      } else if (String(conditionData.eventId) === '-3') {
+        conditionDom = /*#__PURE__*/React.createElement(PeriodCondition, {
+          label: "\u65B0\u589E\u4E8E",
+          dataId: id,
+          onChange: onChangeRunPeriod,
+          runPeriod: conditionData.runPeriod
+        });
+      } else if (String(conditionData.eventId) === '-4') {
+        conditionDom = /*#__PURE__*/React.createElement(PeriodCondition, {
+          label: "\u6D3B\u8DC3\u4E8E",
+          isRealTime: true,
+          dataId: id,
+          onChange: onChangeRunPeriod,
+          runPeriod: conditionData.runPeriod
+        });
+      } else if (util.isNumber(conditionData.eventId)) {
+        conditionDom = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EventCondition, {
+          dataId: id,
+          onChange: onChangeEvent,
+          condition: condition
+        }));
+      }
     }
 
     return /*#__PURE__*/React.createElement(ConditionWrap, {

package/es/userCondition/styles/index.less

@@ -23,4 +23,11 @@
       margin-bottom: 0;
     }
   }
+  &-tip {
+    margin-top: @margin-lg;
+    color: @warning-color;
+    span {
+      margin-right: @margin-xs;
+    }
+  }
 }

package/es/userCondition/types.d.ts

@@ -15,8 +15,13 @@ export interface AllConditionBasePropsI<T> {
     dataId: number;
     onChange: (dataId: number, newData: T) => void;
 }
+export declare enum PropType {
+    STRING = "string",
+    NUMBER = "number",
+    DATE = "date"
+}
 export declare namespace BizUserConditionT {
-    type ConditionType = 'add' | 'active' | 'event' | 'prop' | 'tag';
+    type ConditionType = 'add' | 'active' | 'event' | 'prop' | 'tag' | 'cdp';
     interface PropsI {
         defaultValue: BizUserConditionT.Conditions;
         onChange: (value: any[]) => void;
@@ -27,6 +32,7 @@ export declare namespace BizUserConditionT {
         openTagCondition?: boolean;
         userTagsData?: UserTagsDataI[];
         isRealTime?: boolean;
+        openCdpCondition?: boolean;
     }
     interface UserTagsDataI {
         appId: number;
@@ -91,18 +97,43 @@ export declare namespace BizUserConditionT {
         attrs: AttrCondition[];
         eventId: undefined;
     }
-    type Condition = EventCondition | AddCondition | ActiveCondition | PropCondition | TagsCondition;
+    interface CdpDataSet {
+        id: number;
+        datasetName: string;
+        tableName: string;
+    }
+    interface CdpDataSetDetail {
+        name?: string;
+        type?: string;
+        webType?: PropType;
+    }
+    interface CdpConditionDetail {
+        datasetId?: number;
+        datasetTable?: string;
+        fieldName?: string;
+        fieldType?: string;
+        webType?: PropType;
+        operator?: string;
+        params?: string[];
+        paramType?: PropType;
+    }
+    interface CdpCondition {
+        dataset: (BizUserConditionT.CdpConditionDetail | undefined)[];
+    }
+    type Condition = EventCondition | AddCondition | ActiveCondition | PropCondition | TagsCondition | CdpCondition;
     type Conditions = Condition[][];
+    type OtherCondition = EventCondition | AddCondition | ActiveCondition | PropCondition;
     interface ShowItemI {
         id: number;
         orConditions: Conditions[number];
     }
     type ShowListT = ShowItemI[];
-    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'textMode' | 'isRealTime'> & {
+    type GlobalContext = Pick<BizUserConditionT.PropsI, 'orConditionNum' | 'eventAttrNum' | 'openTagCondition' | 'userTagsData' | 'openCdpCondition' | 'textMode' | 'isRealTime'> & {
         envNameList: string[];
         userPropsMap: {
             [key: string]: UserProp;
         };
+        datasetList: CdpDataSet[];
     };
 }
 export declare namespace OrConditionsT {

package/es/userCondition/types.js

@@ -1 +1,7 @@
-export {};
+export var PropType;
+
+(function (PropType) {
+  PropType["STRING"] = "string";
+  PropType["NUMBER"] = "number";
+  PropType["DATE"] = "date";
+})(PropType || (PropType = {}));

package/es/userCondition/util.d.ts

@@ -1,6 +1,6 @@
 import type { GlobalContextProps } from '../context';
 import type { BizUserConditionT, Unpacked } from './types';
-export declare function buildCondition(type: BizUserConditionT.ConditionType): BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition;
+export declare function buildCondition(type: BizUserConditionT.ConditionType): BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition | BizUserConditionT.CdpCondition;
 export declare function transformNumberOperate(key: string, output?: boolean): string;
 export declare function findEvent(eventId: number, eventGroupList: Unpacked<GlobalContextProps, 'eventGroupList'>): import("../attributeSelector/types").AnalysisEvent | null;
 export declare function findPropAndEnv(name: string, list: Unpacked<GlobalContextProps, 'userPropList' | 'eventEnvList'>): import("../attributeSelector/types").UserProp | import("../attributeSelector/types").EnvProp | null;

package/es/userCondition/util.js

@@ -66,6 +66,11 @@ export function buildCondition(type) {
         },
         eventId: undefined
       };
+
+    case 'cdp':
+      return {
+        dataset: []
+      };
   }
 }
 export function transformNumberOperate(key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.30-alpha.0",
+  "version": "1.0.30-user.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "2413963520046325cf1efe05bd0dd749680c37a6"
+  "gitHead": "1937fcaa33dd321f961d65873b579565900e8ad4"
 }