@zgfe/business-lib 1.0.30-user.1 → 1.0.30-user.3

package/es/userCondition/conditionTypeList.js

@@ -62,7 +62,7 @@ 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, openCdpCondition && (!menuNameMap || menuNameMap['cdp']) ? /*#__PURE__*/React.createElement("li", {
+  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("span", null, "\u7528\u6237\u6807\u7B7E"))) : null, openCdpCondition && (!menuNameMap || menuNameMap['dataset']) ? /*#__PURE__*/React.createElement("li", {
     className: "condition-type",
     onClick: function onClick() {
       return onAdd('cdp');

package/es/userCondition/conditions/cdpCondition.js

@@ -52,30 +52,35 @@ var CdpConditionItem = function CdpConditionItem(props) {
       dataset = _useState2[0],
       setDataset = _useState2[1];
 
-  var _useState3 = useState(),
+  var _useState3 = useState(false),
       _useState4 = _slicedToArray(_useState3, 2),
-      field = _useState4[0],
-      setField = _useState4[1];
+      loading = _useState4[0],
+      setLoading = _useState4[1];
 
   var _useState5 = useState(),
       _useState6 = _slicedToArray(_useState5, 2),
-      operator = _useState6[0],
-      setOperator = _useState6[1];
+      field = _useState6[0],
+      setField = _useState6[1];
 
   var _useState7 = useState(),
       _useState8 = _slicedToArray(_useState7, 2),
-      fieldValue = _useState8[0],
-      setFieldValue = _useState8[1];
+      operator = _useState8[0],
+      setOperator = _useState8[1];
 
-  var _useState9 = useState([]),
+  var _useState9 = useState(),
       _useState10 = _slicedToArray(_useState9, 2),
-      fieldList = _useState10[0],
-      setFieldList = _useState10[1];
+      fieldValue = _useState10[0],
+      setFieldValue = _useState10[1];
 
-  var _useState11 = useState(true),
+  var _useState11 = useState([]),
       _useState12 = _slicedToArray(_useState11, 2),
-      isFirst = _useState12[0],
-      setIsFirst = _useState12[1];
+      fieldList = _useState12[0],
+      setFieldList = _useState12[1];
+
+  var _useState13 = useState(true),
+      _useState14 = _slicedToArray(_useState13, 2),
+      isFirst = _useState14[0],
+      setIsFirst = _useState14[1];
 
   useEffect(function () {
     if (!props.value) {
@@ -122,7 +127,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       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,
+      paramType: getType(field === null || field === void 0 ? void 0 : field.webType),
       operator: operator === null || operator === void 0 ? void 0 : operator.value,
       params: fieldValue
     });
@@ -132,12 +137,29 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (['absolute', 'relative', 'is null', 'is not null'].includes(operator === null || operator === void 0 ? void 0 : operator.value)) setFieldValue([]);
   }, [operator]);
 
+  var getType = function getType(type) {
+    if (!type) return;
+
+    if (type === PropType.STRING2) {
+      return PropType.STRING;
+    }
+
+    if (type === PropType.NUMBER2) {
+      return PropType.NUMBER;
+    }
+
+    if (type === PropType.DATE2) {
+      return PropType.DATE;
+    }
+  };
+
   var onDatasetChange = function onDatasetChange(datasetId) {
     if (!datasetId) {
       setFieldList([]);
       return;
     }
 
+    setLoading(true);
     request(Apis.queryDatasetDetail, {
       method: 'post',
       data: {
@@ -146,9 +168,11 @@ var CdpConditionItem = function CdpConditionItem(props) {
         datasetId: datasetId
       }
     }).then(function (result) {
+      setLoading(false);
       setFieldList(result.data || []);
     }).catch(function (e) {
       console.error(e);
+      setLoading(false);
       setFieldList([]);
     });
   };
@@ -177,15 +201,15 @@ var CdpConditionItem = function CdpConditionItem(props) {
     var list = [];
 
     switch (type) {
-      case PropType.DATE:
+      case PropType.DATE2:
         list = dateOperate;
         break;
 
-      case PropType.NUMBER:
+      case PropType.NUMBER2:
         list = numberOperate;
         break;
 
-      case PropType.STRING:
+      case PropType.STRING2:
         list = stringOperate;
         break;
 
@@ -211,7 +235,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       onChange: onOperateChange
     }), function () {
       switch (field.webType) {
-        case PropType.DATE:
+        case PropType.DATE2:
           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',
@@ -237,7 +261,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
             suffix: "\u5929"
           });
 
-        case PropType.STRING:
+        case PropType.STRING2:
           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"),
@@ -248,7 +272,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
             }
           });
 
-        case PropType.NUMBER:
+        case PropType.NUMBER2:
           return /*#__PURE__*/React.createElement(Input, {
             type: "number",
             className: "".concat(classPrefix, "-value"),
@@ -281,6 +305,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     labelField: "name",
     keyField: "name",
     value: field,
+    loading: loading,
     onChange: onFieldChange
   }), renderByType()) : null);
 };
@@ -290,10 +315,10 @@ var CdpCondition = function CdpCondition(props) {
       defaultValue = props.defaultValue,
       onChange = props.onChange;
 
-  var _useState13 = useState([undefined]),
-      _useState14 = _slicedToArray(_useState13, 2),
-      cdpConditions = _useState14[0],
-      setCdpConditions = _useState14[1];
+  var _useState15 = useState([undefined]),
+      _useState16 = _slicedToArray(_useState15, 2),
+      cdpConditions = _useState16[0],
+      setCdpConditions = _useState16[1];
 
   useEffect(function () {
     if (defaultValue && defaultValue.dataset) {

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

@@ -73,17 +73,7 @@ export declare const tagList: ({
     }[];
     startProcessTime: string;
 })[];
-export declare const conditions: ({
-    attrs: {
-        attrId: number;
-        attrName: string;
-        category: string;
-        operator: string;
-        params: string[];
-        attrType: string;
-    }[];
-    dataset?: undefined;
-} | {
+export declare const conditions: {
     dataset: {
         datasetId: number;
         datasetTable: string;
@@ -94,8 +84,7 @@ export declare const conditions: ({
         operator: string;
         params: string[];
     }[];
-    attrs?: undefined;
-})[][];
+}[][];
 export declare const datasetList: {
     id: number;
     datasetName: string;

package/es/userCondition/demo/mockData.js

@@ -535,46 +535,15 @@ export var tagList = [{
   startProcessTime: '2022-09-06T21:08:28'
 }];
 export var conditions = [[{
-  attrs: [{
-    attrId: 0,
-    attrName: 'last_visit_time',
-    category: 'fixed',
-    operator: 'absolute',
-    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',
+    datasetId: 174,
+    datasetTable: '181e55e003bc25945698fdb2e65d3c2193d',
     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: []
+    operator: 'gt',
+    params: ['111']
   }]
 }]];
 export var datasetList = [{

package/es/userCondition/index.js

@@ -29,6 +29,7 @@ import BizGlobalDataContext from '../context';
 import IconFont from '../icon/iconFont';
 import request from '../utils/ajax';
 import Apis from '../constants/apis';
+import { Spin } from 'antd';
 export var BizUserConditionContext = /*#__PURE__*/createContext({
   orConditionNum: 2,
   eventAttrNum: 1,
@@ -76,10 +77,15 @@ var BizUserCondition = function BizUserCondition(props) {
       value = _useState6[0],
       setValue = _useState6[1];
 
-  var _useState7 = useState([]),
+  var _useState7 = useState(true),
       _useState8 = _slicedToArray(_useState7, 2),
-      dataset = _useState8[0],
-      setDataset = _useState8[1];
+      loading = _useState8[0],
+      setLoading = _useState8[1];
+
+  var _useState9 = useState([]),
+      _useState10 = _slicedToArray(_useState9, 2),
+      dataset = _useState10[0],
+      setDataset = _useState10[1];
 
   var envNameList = useMemo(function () {
     return eventEnvList ? eventEnvList.map(function (env) {
@@ -96,8 +102,10 @@ var BizUserCondition = function BizUserCondition(props) {
   useEffect(function () {
     initShowList();
 
-    if (props.openCdpCondition && (!menuNameMap || menuNameMap['cdp'])) {
+    if (props.openCdpCondition && (!menuNameMap || menuNameMap['dataset'])) {
       getDatasetList();
+    } else {
+      setLoading(false);
     }
   }, []);
 
@@ -166,12 +174,18 @@ var BizUserCondition = function BizUserCondition(props) {
       }
     }).then(function (result) {
       setDataset(result.data || []);
+      setLoading(false);
     }).catch(function (e) {
       console.error(e);
       setDataset([]);
+      setLoading(false);
     });
   }
 
+  if (loading) {
+    return /*#__PURE__*/React.createElement(Spin, null);
+  }
+
   return /*#__PURE__*/React.createElement(BizUserConditionContext.Provider, {
     value: {
       orConditionNum: props.orConditionNum || 2,

package/es/userCondition/types.d.ts

@@ -16,9 +16,12 @@ export interface AllConditionBasePropsI<T> {
     onChange: (dataId: number, newData: T) => void;
 }
 export declare enum PropType {
-    STRING = "string",
-    NUMBER = "number",
-    DATE = "date"
+    STRING = "cont-string",
+    NUMBER = "cont-num",
+    DATE = "cont-date",
+    STRING2 = "string",
+    NUMBER2 = "number",
+    DATE2 = "date"
 }
 export declare namespace BizUserConditionT {
     type ConditionType = 'add' | 'active' | 'event' | 'prop' | 'tag' | 'cdp';

package/es/userCondition/types.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.30-user.1",
+  "version": "1.0.30-user.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "263b88167421d0c447ba3ab210e3020be267bbe3"
+  "gitHead": "eaa12ea299f24b2fbb4f33437c89e28c2df32903"
 }