@zgfe/business-lib 1.1.34-alpha.11 → 1.1.34-alpha.12

package/es/attrConditions/components/stringList.js

@@ -128,7 +128,6 @@ var StringList = function StringList(props) {
     };
   }();
   var onChange = function onChange(data) {
-    console.log(8888, data);
     var resData = data.map(function (item) {
       return item.value;
     });

package/es/userCondition/conditions/businessCondition.js

@@ -109,7 +109,23 @@ var BusinessCondition = function BusinessCondition(props) {
         setServiceAttributeList([]);
       }
     }).catch(function () {
-      setServiceAttributeList([]);
+      setServiceAttributeList([{
+        value: 25,
+        uniqueKey: null,
+        name: '444'
+      }, {
+        value: 28,
+        uniqueKey: null,
+        name: 'sql导入'
+      }, {
+        value: 27,
+        uniqueKey: null,
+        name: 'test0322'
+      }, {
+        value: 26,
+        uniqueKey: null,
+        name: '业务数据测试1'
+      }]);
     });
   }
   function onOperatorChange(option) {

package/es/userCondition/conditions/dataAttribute.js

@@ -57,23 +57,29 @@ var DataAttribute = function DataAttribute(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     bizDataAttrList = _useState8[0],
     setBizDataAttrList = _useState8[1];
-  var _useState9 = useState(''),
+  var _useState9 = useState(0),
     _useState10 = _slicedToArray(_useState9, 2),
-    searchValue = _useState10[0],
-    setSearchValue = _useState10[1];
+    timer = _useState10[0],
+    setTimer = _useState10[1];
+  var _useState11 = useState(''),
+    _useState12 = _slicedToArray(_useState11, 2),
+    searchValue = _useState12[0],
+    setSearchValue = _useState12[1];
   var obj = (_condition$attrs$inde = condition.attrs[index]) === null || _condition$attrs$inde === void 0 ? void 0 : _condition$attrs$inde.params.map(function (item) {
     return {
       name: item,
       value: item
     };
   });
-  var _useState11 = useState(obj ? obj : []),
-    _useState12 = _slicedToArray(_useState11, 2),
-    current = _useState12[0],
-    setCurrent = _useState12[1];
+  var _useState13 = useState(obj ? obj : []),
+    _useState14 = _slicedToArray(_useState13, 2),
+    current = _useState14[0],
+    setCurrent = _useState14[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
-  useEffect(function () {}, [searchValue]);
+  useEffect(function () {
+    queryValueList(searchValue, {});
+  }, [searchValue]);
   useEffect(function () {
     if (condition === null || condition === void 0 ? void 0 : condition.typeId) {
       queryBizDataAttrList(condition === null || condition === void 0 ? void 0 : condition.typeId);
@@ -114,39 +120,48 @@ var DataAttribute = function DataAttribute(props) {
     onChange(_objectSpread({}, condition));
   }
   function queryValueList(keyword, operate) {
-    request('/cep-console/api/v1/es/data/attr/value', {
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        attrId: condition.attrs[index].attrId,
-        dataTypeId: operate.bizDataTypeId ? operate.bizDataTypeId : condition.attrs[index].orderType === 'master' ? 1 : 2,
-        keyword: keyword,
-        pageNum: 1,
-        pageSize: 20,
-        attrName: operate.name,
-        eventId: 0
-      }
-    }).then(function (res) {
-      if (res.data) {
-        var _list2 = res.data.map(function (item) {
-          return {
-            name: operate.bizDataTypeId ? item : item.name,
-            value: operate.bizDataTypeId ? item : item.id
+    var fetch = function fetch() {
+      request('/cep-console/api/v1/es/data/attr/value', {
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        method: 'post',
+        data: {
+          appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+          attrId: condition.attrs[index].attrId,
+          dataTypeId: operate.bizDataTypeId ? operate.bizDataTypeId : condition.attrs[index].orderType === 'master' ? 1 : 2,
+          keyword: keyword,
+          pageNum: 1,
+          pageSize: 20,
+          attrName: operate.name,
+          eventId: 0
+        }
+      }).then(function (res) {
+        if (res.data) {
+          var isString = function isString(val) {
+            return typeof val === 'string';
           };
-        });
-        condition.paramsList[index].paramsList = _list2;
-        setParamsList(_list2);
-      } else {
+          var _list2 = res.data.map(function (item) {
+            return {
+              name: !isString(item) ? JSON.stringify(item) : item,
+              value: !isString(item) ? JSON.stringify(item) : item
+            };
+          });
+          condition.paramsList[index].paramsList = _list2;
+          setParamsList(_list2);
+        } else {
+          setParamsList([]);
+          condition.paramsList[index].paramsList = [];
+        }
+      }).catch(function () {
         setParamsList([]);
         condition.paramsList[index].paramsList = [];
-      }
-    }).catch(function () {
-      setParamsList([]);
-      condition.paramsList[index].paramsList = [];
-    });
+      });
+    };
+    if (timer) clearTimeout(timer);
+    setTimer(setTimeout(function () {
+      fetch();
+    }, 400));
     onChange(_objectSpread({}, condition));
   }
   function queryBizDataAttrList(bizDataTypeId) {
@@ -173,7 +188,43 @@ var DataAttribute = function DataAttribute(props) {
       }
     }).catch(function () {
       condition.paramsList[index].bizDataAttrList = [];
-      setBizDataAttrList([]);
+      setBizDataAttrList([{
+        id: 98,
+        value: 98,
+        bizDataTypeId: 28,
+        name: 'ID',
+        propType: 2,
+        isRequired: 1,
+        isShow: 1,
+        isCreateTimeData: '',
+        isUniqueData: 'Y',
+        isUniqueUser: '',
+        attrOrder: 1
+      }, {
+        id: 100,
+        value: 100,
+        bizDataTypeId: 28,
+        name: '姓名',
+        propType: 1,
+        isRequired: 1,
+        isShow: 1,
+        isCreateTimeData: '',
+        isUniqueData: '',
+        isUniqueUser: '',
+        attrOrder: 3
+      }, {
+        id: 101,
+        value: 101,
+        bizDataTypeId: 28,
+        name: '创建时间',
+        propType: 3,
+        isRequired: 1,
+        isShow: 1,
+        isCreateTimeData: 'Y',
+        isUniqueData: '',
+        isUniqueUser: '',
+        attrOrder: 4
+      }]);
     });
     onChange(_objectSpread({}, condition));
   }
@@ -365,12 +416,13 @@ var DataAttribute = function DataAttribute(props) {
     multiple: true,
     size: "middle",
     labelField: "name",
-    options: paramsList.length > 0 ? paramsList : condition === null || condition === void 0 ? void 0 : (_condition$paramsList3 = condition.paramsList[index]) === null || _condition$paramsList3 === void 0 ? void 0 : _condition$paramsList3.paramsList,
     keyField: "value",
+    options: paramsList.length > 0 ? paramsList : condition === null || condition === void 0 ? void 0 : (_condition$paramsList3 = condition.paramsList[index]) === null || _condition$paramsList3 === void 0 ? void 0 : _condition$paramsList3.paramsList,
     value: current,
     onChange: onParamsChange,
     onSearch: setSearchValue,
-    enableCreate: true
+    enableCreate: true,
+    enableSearch: true
   })) : null, condition.attrs[index].attrType === 'cont-num' || condition.attrs[index].attrType === 'cont-date' && condition.attrs[index].operator !== 'absolute' ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-period-condition")
   }, /*#__PURE__*/React.createElement(Input, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.1.34-alpha.11",
+    "version": "1.1.34-alpha.12",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",