@zgfe/modules-attribution 1.0.1-alpha.1 → 1.0.1-alpha.13

package/es/modules/searchPanel/index.js

@@ -7,7 +7,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 React, { useContext, useEffect, useState, useImperativeHandle } from 'react';
 import { IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import { Button, Form, Skeleton, Tooltip, Checkbox, Select, InputNumber } from 'antd';
 import SearchContent from './components/index';
@@ -19,12 +19,12 @@ import { initTarget } from '../../constants/initData';
 import { searchFields } from '../../constants/fields';
 import { AttributableContext } from '../../types';
 export var classPrefix = 'mi-left-form';
-var SearchPanel = function SearchPanel(props) {
+var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var defaultValue = props.defaultValue;
+  console.log('SearchPanel', defaultValue);
   var _useContext = useContext(AttributableContext),
     buttonDisable = _useContext.buttonDisable,
     setButtonDisable = _useContext.setButtonDisable;
-  console.log('defaultValue', defaultValue);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -46,7 +46,7 @@ var SearchPanel = function SearchPanel(props) {
     setEventIdList = _useState8[1];
   var _useContext2 = useContext(BizGlobalDataContext),
     eventGroupList = _useContext2.eventGroupList;
-  var _useState9 = useState(1),
+  var _useState9 = useState(0),
     _useState10 = _slicedToArray(_useState9, 2),
     windowCnt = _useState10[0],
     setWindowCnt = _useState10[1];
@@ -58,10 +58,17 @@ var SearchPanel = function SearchPanel(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     attrTargetCount = _useState14[0],
     setAttrTargetCount = _useState14[1];
-  var _useState15 = useState(0),
+  var _useState15 = useState({}),
     _useState16 = _slicedToArray(_useState15, 2),
     attrSourceCount = _useState16[0],
     setAttrSourceCount = _useState16[1];
+  var _useState17 = useState({}),
+    _useState18 = _slicedToArray(_useState17, 2),
+    mincePropCount = _useState18[0],
+    setMincePropCount = _useState18[1];
+  useEffect(function () {
+    console.log('判断提交按钮是否可点击-1234444', mincePropCount);
+  }, [mincePropCount]);
   useEffect(function () {
     if (defaultValue) {
       var data = defaultValue;
@@ -73,12 +80,32 @@ var SearchPanel = function SearchPanel(props) {
           eList.push(target.eventId);
         }
       });
+      console.log('初始化11', eList);
       setEventIdList(eList);
+      if (defaultValue.windowType !== undefined) {
+        setOtherEvent(defaultValue.otherEvent);
+        setWindowCnt(defaultValue.windowCnt);
+        setwindowTypeUnit(defaultValue.windowType);
+        defaultValue.windowCnt == 0 ? setWindowType(1) : setWindowType(2);
+      }
+      var _attrCount = {};
+      var _sourceCount = {};
+      data.sourceFilters.map(function (item) {
+        if (item.propfilters != undefined) {
+          _attrCount[item.eventId] = 1;
+        }
+        if (item.filters != undefined) {
+          _sourceCount[item.eventId] = item.filters.conditions.length;
+        }
+      });
+      setMincePropCount(_attrCount);
+      setAttrSourceCount(_sourceCount);
     }
     setLoading(false);
   }, []);
   var onChange = function onChange(_changedValues, allValues) {
     console.log(666, allValues);
+    setFormData(allValues);
     var data = _.cloneDeep(allValues);
     if (_changedValues.targetFilters) {
       var eList = [];
@@ -97,18 +124,13 @@ var SearchPanel = function SearchPanel(props) {
       var targetData = targetChangeCallback(data, eList, eventGroupList);
       form.setFieldsValue(targetData);
     }
-    setButtonDisable(submitButtonDisableHandle(allValues, attrSourceCount, attrTargetCount));
+    setButtonDisable(submitButtonDisableHandle(allValues, attrSourceCount, attrTargetCount, mincePropCount));
   };
   var attrChange = function attrChange(e) {
     var reason = form.getFieldValue('reason');
     console.log('细分属性变化：', e, reason);
   };
-  var _useState17 = useState(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    verify = _useState18[0],
-    setVerify = _useState18[1];
-  var onFinish = function onFinish() {
-    setVerify(true);
+  var onFinish = function onFinish(isFetchRequest) {
     form.validateFields().then(function (res) {
       if (verifyHandle(res)) {
         console.log('表单检验通过', res);
@@ -117,19 +139,25 @@ var SearchPanel = function SearchPanel(props) {
         res.windowType = windowType === 1 ? 'day' : windowTypeUnit;
         var finalData = removeEmptyValue(res);
         console.log(123123, finalData);
-        props.onChange(finalData);
+        props.onChange(finalData, isFetchRequest);
       }
     }).catch(function (e) {
       console.log('表单检验失败', e);
     });
   };
+  useImperativeHandle(ref, function () {
+    return {
+      onGetSearchData: function onGetSearchData() {
+        onFinish(false);
+      }
+    };
+  });
   var otherEventChange = function otherEventChange(e) {
     setOtherEvent(e.target.checked);
   };
   var onReset = function onReset() {
     setButtonDisable(true);
     form.resetFields();
-    setVerify(false);
     setWindowType(1);
   };
   var _useState19 = useState(1),
@@ -193,12 +221,15 @@ var SearchPanel = function SearchPanel(props) {
           enableDelete: fields.length > 1,
           eventIdList: eventIdList,
           allValues: formData,
-          verify: verify,
           onDelete: function onDelete() {
             return remove(index);
           },
           setAttrTargetCount: setAttrTargetCount,
-          setAttrSourceCount: setAttrSourceCount
+          setAttrSourceCount: setAttrSourceCount,
+          setMincePropCount: setMincePropCount,
+          attrSourceCount: attrSourceCount,
+          mincePropCount: mincePropCount,
+          formData: formData
         }));
       }), fields.length < item.max && /*#__PURE__*/React.createElement("div", {
         className: "".concat(classPrefix, "-add"),
@@ -213,6 +244,7 @@ var SearchPanel = function SearchPanel(props) {
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-otherEvent")
   }, /*#__PURE__*/React.createElement(Checkbox, {
+    checked: otherEvent,
     onChange: otherEventChange
   }, "\u4E5F\u8BA1\u7B97\u5176\u4ED6\u8F6C\u5316\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Tooltip, {
     placement: "right",
@@ -268,7 +300,8 @@ var SearchPanel = function SearchPanel(props) {
       width: 208
     },
     onChange: function onChange(e) {
-      return setWindowType(e);
+      setWindowType(e);
+      e === 1 ? setWindowCnt(0) : setWindowCnt(1);
     },
     options: [{
       value: 1,
@@ -282,12 +315,12 @@ var SearchPanel = function SearchPanel(props) {
     style: {
       width: 80
     },
-    defaultValue: 1,
+    value: windowCnt,
     onChange: function onChange(e) {
       return setWindowCnt(e);
     }
   }), /*#__PURE__*/React.createElement(Select, {
-    defaultValue: "day",
+    value: windowTypeUnit,
     style: {
       width: 80
     },
@@ -310,7 +343,9 @@ var SearchPanel = function SearchPanel(props) {
     className: "".concat(buttonDisable ? 'disable' : ''),
     disabled: buttonDisable,
     type: "primary",
-    onClick: onFinish
+    onClick: function onClick() {
+      return onFinish();
+    }
   }, "\u63D0\u4EA4")))));
-};
+});
 export default SearchPanel;

package/es/modules/searchPanel/types.d.ts

@@ -1,7 +1,7 @@
 export declare namespace SearchPanelTypes {
     interface Props {
         defaultValue?: any;
-        onChange: (values: any) => void;
+        onChange: (values: any, isFetchRequest?: boolean | undefined) => void;
     }
     interface FieldProp {
         key: string;
@@ -22,10 +22,21 @@ export declare namespace SearchPanelTypes {
         eventIdList?: number[];
         showOverview?: boolean;
         onChange?: (data: any) => void;
-        onDelete?: () => void;
+        onDelete: () => void;
         attrChange?: (data: any) => void;
-        verify: boolean;
+        formData: any;
         setAttrTargetCount: Function;
         setAttrSourceCount: Function;
+        attrSourceCount: {
+            [x: number]: number;
+        };
+        setMincePropCount: Function;
+        mincePropCount: {
+            [x: number]: number;
+        };
+    }
+    interface bizAttributeSelectorValueProp {
+        id?: number;
+        propCategory?: string;
     }
 }

package/es/modules/searchPanel/utils.d.ts

@@ -2,4 +2,8 @@ import { SearchData } from '../../types';
 export declare function removeEmptyValue(source: SearchData): any;
 export declare function verifyHandle(data: SearchData): boolean;
 export declare function targetChangeCallback(data: SearchData, eList: number[], eventGroupList: any): SearchData;
-export declare function submitButtonDisableHandle(data: SearchData, attrSourceCount: number, attrTargetCount: number): boolean;
+export declare function submitButtonDisableHandle(data: SearchData, attrSourceCount: {
+    [x: number]: number;
+}, attrTargetCount: number, mincePropCount: {
+    [x: number]: number;
+}): boolean;

package/es/modules/searchPanel/utils.js

@@ -92,32 +92,46 @@ export function targetChangeCallback(data, eList, eventGroupList) {
   }
   return data;
 }
-var buttonDisable = function buttonDisable(data, type, count) {
+var buttonDisable = function buttonDisable(data, type, count, mincePropCount) {
   var flag = false;
   data[type].map(function (item) {
     item === undefined ? flag = true : null;
     if (item !== undefined) {
       var _item$filters;
       (item === null || item === void 0 ? void 0 : item.eventId) === -100 ? flag = true : null;
-      item.filters === undefined && count != 0 ? flag = true : null;
+      if (type === 'targetFilters') {
+        item.filters === undefined && count != 0 ? flag = true : null;
+      } else {
+        item.filters === undefined && Object.keys(count).length > 0 && count[item.eventId] !== undefined ? flag = true : null;
+        if (mincePropCount != undefined) {
+          item.propfilters === undefined && Object.keys(mincePropCount).length > 0 && mincePropCount[item.eventId] !== undefined ? flag = true : null;
+        }
+      }
       if ((item === null || item === void 0 ? void 0 : item.filters) && ((_item$filters = item.filters) === null || _item$filters === void 0 ? void 0 : _item$filters.conditions.length) > 0) {
-        var _item$filters2, _item$filters3;
+        var _item$filters2;
         (_item$filters2 = item.filters) === null || _item$filters2 === void 0 ? void 0 : _item$filters2.conditions.map(function (_item) {
           var _item$values;
           _item.values && ((_item$values = _item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 ? flag = true : null;
         });
-        ((_item$filters3 = item.filters) === null || _item$filters3 === void 0 ? void 0 : _item$filters3.conditions.length) != count ? flag = true : null;
+        if (type === 'targetFilters') {
+          var _item$filters3;
+          ((_item$filters3 = item.filters) === null || _item$filters3 === void 0 ? void 0 : _item$filters3.conditions.length) != count ? flag = true : null;
+        } else {
+          var _item$filters4;
+          console.log('问题排查', item, count);
+          ((_item$filters4 = item.filters) === null || _item$filters4 === void 0 ? void 0 : _item$filters4.conditions.length) != count[item.eventId] ? flag = true : null;
+        }
       }
     }
   });
   return flag;
 };
-export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount) {
+export function submitButtonDisableHandle(data, attrSourceCount, attrTargetCount, mincePropCount) {
   var flag = false;
   data.attributionType === undefined ? flag = true : null;
-  buttonDisable(data, 'sourceFilters', attrSourceCount) ? flag = true : null;
+  buttonDisable(data, 'sourceFilters', attrSourceCount, mincePropCount) ? flag = true : null;
   buttonDisable(data, 'targetFilters', attrTargetCount) ? flag = true : null;
-  console.log('判断提交按钮是否可点击', attrSourceCount, flag, data);
+  console.log('判断提交按钮是否可点击', mincePropCount, flag, data);
   return flag;
 }
 var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.1-alpha.1",
+  "version": "1.0.1-alpha.13",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -50,5 +50,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "e43a616f3df3dd4131a8599ef5f12c23a6d4c2e8"
+  "gitHead": "66b7cbd54d401cbcdb4d496683427c71ae3ee102"
 }