@zgfe/business-lib 1.0.30-user.2 → 1.0.30-user.4

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) {
@@ -154,6 +159,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       return;
     }
 
+    setLoading(true);
     request(Apis.queryDatasetDetail, {
       method: 'post',
       data: {
@@ -162,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([]);
     });
   };
@@ -297,6 +305,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     labelField: "name",
     keyField: "name",
     value: field,
+    loading: loading,
     onChange: onFieldChange
   }), renderByType()) : null);
 };
@@ -306,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/index.js

@@ -220,7 +220,7 @@ var BizUserCondition = function BizUserCondition(props) {
     show: value.length < andConditionNum,
     label: "\u4E14",
     onAdd: onAdd
-  }), openCdpCondition && (!menuNameMap || menuNameMap['cdp']) ? /*#__PURE__*/React.createElement("div", {
+  }), openCdpCondition && (!menuNameMap || menuNameMap['dataset']) ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-tip")
   }, ' ', /*#__PURE__*/React.createElement(IconFont, {
     type: "tishiicon"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.30-user.2",
+  "version": "1.0.30-user.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -58,5 +58,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "86ed742788efaad89eeadfef7357ece4292ac5f7"
+  "gitHead": "5c04c0ca433d8ffeabc76c819312b5ca6d7f3280"
 }