@zgfe/business-lib 1.0.16 → 1.0.18

package/es/assets/styles/resetAntd.less

@@ -429,15 +429,6 @@
     background-color: #94a6ce !important;
   }
 }
-
-.ant-btn-primary {
-  color: #fff !important;
-}
-
-.ant-btn-ghost {
-  color: @text-color-secondary!important;
-}
-
 .ant-form-item-explain-error {
   color: @error-color!important;
 }

package/es/assets/theme.js

@@ -6,7 +6,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
   'use strict';
 
   exports.theme = {
-    'primary-color': 'red',
+    'primary-color': '#165dff',
     'border-color-base': '#ECEDF0',
     'background-color-base': '#fafafb',
     'text-color': '#021429',

package/es/attrConditions/components/stringList.js

@@ -43,6 +43,16 @@ var StringList = function StringList(props) {
       isFirst = _useState6[0],
       setIsFirst = _useState6[1];
 
+  var _useState7 = useState(''),
+      _useState8 = _slicedToArray(_useState7, 2),
+      searchValue = _useState8[0],
+      setSearchValue = _useState8[1];
+
+  var _useState9 = useState(0),
+      _useState10 = _slicedToArray(_useState9, 2),
+      timer = _useState10[0],
+      setTimer = _useState10[1];
+
   useEffect(function () {
     if (props.value) {
       var data = props.value.map(function (item) {
@@ -57,7 +67,7 @@ var StringList = function StringList(props) {
     }
   }, [props.value]);
   useEffect(function () {
-    fetchValues(props.attr);
+    fetchValues();
 
     if (isFirst) {
       setIsFirst(false);
@@ -71,55 +81,66 @@ var StringList = function StringList(props) {
       onChange([]);
     }
   }, [props.operate]);
+  useEffect(function () {
+    fetchValues();
+  }, [searchValue]);
 
   var fetchValues = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(attrData) {
-      var requestData, transformRequest, formData;
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var fetch;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              requestData = {
-                app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-                platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
-                limit: 10000,
-                attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
-                dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
-                v: ''
-              };
-
-              transformRequest = function transformRequest(params) {
-                var arr = [];
-
-                for (var key in params) {
-                  arr.push("".concat(key, "=").concat(encodeURIComponent(params[key])));
-                }
-
-                return arr.join('&');
+              fetch = function fetch() {
+                var attrData = props.attr;
+                var requestData = {
+                  app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+                  platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
+                  limit: 20,
+                  attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
+                  dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
+                  v: searchValue || ''
+                };
+
+                var transformRequest = function transformRequest(params) {
+                  var arr = [];
+
+                  for (var key in params) {
+                    arr.push("".concat(key, "=").concat(encodeURIComponent(params[key])));
+                  }
+
+                  return arr.join('&');
+                };
+
+                var formData = transformRequest(requestData);
+                request(Apis.esQuery, {
+                  method: 'post',
+                  data: formData,
+                  headers: {
+                    'Content-Type': 'application/x-www-form-urlencoded'
+                  }
+                }).then(function (result) {
+                  setOptions(function () {
+                    return result && result.sources ? result.sources.map(function (item) {
+                      return {
+                        name: item,
+                        value: item
+                      };
+                    }) : [];
+                  });
+                }).catch(function (e) {
+                  console.error(e);
+                  setOptions([]);
+                });
               };
 
-              formData = transformRequest(requestData);
-              request(Apis.esQuery, {
-                method: 'post',
-                data: formData,
-                headers: {
-                  'Content-Type': 'application/x-www-form-urlencoded'
-                }
-              }).then(function (result) {
-                setOptions(function () {
-                  return result && result.sources ? result.sources.map(function (item) {
-                    return {
-                      name: item,
-                      value: item
-                    };
-                  }) : [];
-                });
-              }).catch(function (e) {
-                console.error(e);
-                setOptions([]);
-              });
+              if (timer) clearTimeout(timer);
+              setTimer(setTimeout(function () {
+                fetch();
+              }, 400));
 
-            case 4:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -127,7 +148,7 @@ var StringList = function StringList(props) {
       }, _callee);
     }));
 
-    return function fetchValues(_x) {
+    return function fetchValues() {
       return _ref.apply(this, arguments);
     };
   }();
@@ -162,7 +183,8 @@ var StringList = function StringList(props) {
     labelField: "name",
     keyField: "value",
     options: options,
-    onChange: onChange
+    onChange: onChange,
+    onSearch: setSearchValue
   });
 };
 

package/es/attrConditions/demo/index.js

@@ -23,14 +23,13 @@ export default (function () {
 
   var _useState = useState({
     condition: {
-      propCategory: 'userProp',
-      type: 2,
-      operator: 'lt',
-      values: ['25200', '1'],
-      subtype: 2,
-      attrName: 'duration',
-      attrId: 0,
-      category: 'fixed'
+      attrId: 30183426,
+      propCategory: 'eventProp',
+      type: 1,
+      operator: 'equal',
+      values: [],
+      dimensionSub: 'event_attr',
+      attrName: '公众号名称'
     }
   }),
       _useState2 = _slicedToArray(_useState, 2),

package/es/select/handle.js

@@ -29,6 +29,7 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var handleRef = useRef(null);
   var inputRef = useRef(null);
+  var textRef = useRef();
 
   var _useState3 = useState(''),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -47,16 +48,12 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
         }
 
         setSearchValue('');
-
-        if (props.enableCreate && searchValue && !flag) {
-          if (props.onCreate) props.onCreate(searchValue);
-        }
       },
       width: handleRef.current.clientWidth
     };
   });
   var searchInputWidth = useMemo(function () {
-    return searchValue.length * 14 || 3;
+    return textRef.current && searchValue ? textRef.current.offsetWidth : 3;
   }, [searchValue]);
 
   var onDelete = function onDelete(data) {
@@ -98,7 +95,10 @@ var SelectHandle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       },
       value: searchValue,
       onChange: onSearch
-    }));
+    }), /*#__PURE__*/React.createElement("span", {
+      className: "".concat(classPrefix, "-temp"),
+      ref: textRef
+    }, searchValue));
   }
 
   return /*#__PURE__*/React.createElement("div", {

package/es/select/index.js

@@ -132,28 +132,6 @@ var BizSelect = function BizSelect(props) {
     if (props.onChange) props.onChange(data);
   };
 
-  var onCreate = function onCreate(val) {
-    var _newItem;
-
-    var data = _.cloneDeep(current) || [];
-    var newItem = (_newItem = {}, _defineProperty(_newItem, keyField, val), _defineProperty(_newItem, labelField, val), _newItem);
-    var flag = false;
-    current === null || current === void 0 ? void 0 : current.forEach(function (item) {
-      if (item[labelField] === val) {
-        flag = true;
-        return;
-      }
-    });
-    setSearchValue('');
-
-    if (!flag) {
-      newItem = getCheckedData(newItem);
-      data.push(newItem);
-      setCurrent(data);
-      if (props.onChange) props.onChange(data);
-    }
-  };
-
   var onChange = function onChange(option) {
     setCurrent(option);
     setSearchValue('');
@@ -166,6 +144,7 @@ var BizSelect = function BizSelect(props) {
   };
 
   var onVisibleChange = function onVisibleChange(flag) {
+    setSearchValue('');
     setVisible(flag);
   };
 
@@ -201,13 +180,14 @@ var BizSelect = function BizSelect(props) {
     keyField: keyField,
     disable: props.disable,
     multiple: props.multiple,
-    enableCreate: props.enableCreate,
     theme: props.theme,
     size: props.size,
     border: props.border,
     onDelete: onDelete,
-    onSearch: setSearchValue,
-    onCreate: onCreate
+    onSearch: function onSearch(v) {
+      setSearchValue(v);
+      if (props.onSearch) props.onSearch(v);
+    }
   })));
 };
 

package/es/select/overlay.js

@@ -1,3 +1,5 @@
+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."); }
@@ -96,8 +98,20 @@ var SelectOverlay = function SelectOverlay(props) {
 
   function getOptionDom(data, ids) {
     var optionsDom = [];
-    data.forEach(function (option) {
+
+    var list = _.cloneDeep(data);
+
+    if (props.enableCreate && searchValue) {
+      var _list$push;
+
+      list.push((_list$push = {}, _defineProperty(_list$push, props.keyField, searchValue), _defineProperty(_list$push, props.labelField, searchValue), _defineProperty(_list$push, "isTemp", true), _list$push));
+    }
+
+    var tempOption = null;
+    var useTemp = true;
+    list.forEach(function (option) {
       if (searchValue && !new RegExp(searchValue, 'i').test(option[labelField])) return;
+      if (searchValue && searchValue === option[labelField] && !option.isTemp) useTemp = false;
       var disabled = false;
       disableItemList === null || disableItemList === void 0 ? void 0 : disableItemList.forEach(function (item) {
         if (item[keyField] === option[keyField] && (!current || current && ids.indexOf(option[keyField]) < 0)) {
@@ -118,8 +132,19 @@ var SelectOverlay = function SelectOverlay(props) {
         disabled: disabled,
         key: option[keyField] || String(Math.random())
       });
+
+      if (option.isTemp) {
+        tempOption = dom;
+        return;
+      }
+
       optionsDom.push(dom);
     });
+
+    if (useTemp) {
+      optionsDom.push(tempOption);
+    }
+
     return optionsDom;
   }
 

package/es/select/styles/handle.less

@@ -69,6 +69,12 @@
       box-shadow: none;
     }
   }
+  &-temp {
+    position: absolute;
+    top: -999999999999999px;
+    padding: 0 @padding-sm;
+    font-size: @font-size-base;
+  }
 
   &-single-input {
     .__default-overflow();

package/es/select/types.d.ts

@@ -34,6 +34,7 @@ export declare namespace BizSelectTypes {
         notFound?: string | ReactNode;
         loading?: boolean;
         onChange?: (val: Option) => void;
+        onSearch?: (val: string) => void;
     }
     interface OverlayProps {
         option?: Option;
@@ -56,7 +57,6 @@ export interface HandlerTypes {
     placeholder?: string;
     value?: BizSelectTypes.Option | BizSelectTypes.Option[];
     multiple?: boolean;
-    enableCreate?: boolean;
     labelField?: string;
     keyField?: string | number;
     disable?: boolean;
@@ -65,5 +65,4 @@ export interface HandlerTypes {
     border?: boolean;
     onDelete?: (data: BizSelectTypes.Option) => void;
     onSearch?: (val: string) => void;
-    onCreate?: (val: string) => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -59,5 +59,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "57a9a501f4c4c94f115102d565c94a449b08caa8"
+  "gitHead": "572cbe41c1052ce19fa66b5c95b0e7738f2ceb6c"
 }