@zgfe/modules-attribution 1.0.5 → 1.1.0

package/es/modules/searchPanel/styles/index.less

@@ -0,0 +1,226 @@
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.form-box {
+  .xiangxia {
+    font-size: 14px !important;
+  }
+  &-form-item {
+    margin-bottom: 16px;
+    .attr-box-show {
+      margin: 12px 0px;
+    }
+  }
+
+  &-bottom-form-title {
+    font-size: 14px;
+    margin-bottom: 16px;
+    color: #021429;
+    font-weight: 500;
+  }
+  &-bottom-form {
+    display: flex;
+    min-width: 860px;
+    height: 32px;
+    margin-bottom: 14px;
+    .p {
+      margin: 0;
+      margin-right: 12px;
+      padding: 0;
+      color: #5f6085;
+      line-height: 32px;
+      .tishiicon {
+        margin-left: 8px;
+        color: #9aa1a9;
+      }
+    }
+    .attribution-type {
+      margin-right: 24px;
+    }
+    .windowCnt {
+      margin: 0 16px;
+    }
+  }
+  
+  #attribution-type{
+    position: relative;
+    .ant-select-dropdown{
+      z-index: 998;
+    }
+    .attribution-type-tooltip {
+      z-index: 999;
+      right: 0px!important;
+      // left: 200px!important;
+      &-distance{
+        // left: 170px!important;
+      }
+    }
+  }
+
+  &-otherEvent {
+    color: #021429;
+    font-size: 14px;
+    margin-bottom: 34px;
+    .tishiicon {
+      margin-left: 1px;
+      color: #9aa1a9;
+    }
+  }
+  &-search-button-box {
+    text-align: right;
+    .ant-btn {
+      border: none;
+    }
+    > :nth-child(1) {
+      margin-right: 16px;
+      background: #29bd52;
+    }
+    .disable,
+    .disable:hover {
+      color: #ffffff;
+      background: #d0dfff;
+    }
+  }
+  &-title.ant-form-item {
+    margin-bottom: 12px;
+    color: #5f6085;
+    font-size: 14px;
+    line-height: 20px;
+    .bsicon {
+      margin-left: 9px;
+      color: #9aa1a9;
+    }
+    .ant-form-item-control-input {
+      min-height: 20px;
+      .ant-form-item-control-input-content {
+        height: 20px;
+      }
+    }
+  }
+
+  &-item.ant-form-item {
+    margin-bottom: 0px;
+  }
+
+  &-add {
+    width: fit-content;
+    height: 20px;
+    color: #165dff;
+    font-size: 14px;
+    line-height: 20px;
+    border-radius: @border-radius-small;
+    cursor: pointer;
+    span {
+      margin-right: 4px;
+    }
+
+    // &:not(.disabled):hover {
+    //   .__default-hover();
+    // }
+
+    &.disabled {
+      color: @disabled-color;
+      cursor: not-allowed;
+    }
+  }
+
+  .global-attr {
+    margin-bottom: 0 !important;
+  }
+
+  .biz-condition-item-input {
+    border-color: transparent;
+  }
+
+  .ant-input-affix-wrapper > input.ant-input {
+    height: 100%;
+  }
+  .attributable-events-box {
+    .select-and-attr {
+      display: flex;
+      margin-bottom: 12px;
+      .ant-dropdown-trigger {
+        width: 208px;
+        margin-right: 16px;
+      }
+      .biz-select-handle-input {
+        background: #fafafb;
+      }
+      .biz-attr-select {
+        width: 208px;
+        margin-right: 16px;
+        .biz-attr-select-handle {
+          position: relative;
+          padding: 0;
+          border: none;
+          .qingchu {
+            position: absolute;
+            top: 5px;
+            right: 40px;
+          }
+        }
+      }
+      .button-box {
+        .qingchu,
+        .tianjia2,
+        .shaixuan {
+          margin-top: 2px;
+          margin-right: 16px;
+          // color: #CCD0D4;
+          color: #9aa1a9;
+          font-size: 20px !important;
+          cursor: pointer;
+        }
+        .tianjia2:hover,
+        .shaixuan:hover {
+          color: #165dff;
+        }
+        .qingchu:hover {
+          color: #e96150;
+        }
+        .disable {
+          color: #ccd0d4 !important;
+          cursor: not-allowed !important;
+        }
+      }
+    }
+  }
+  .target-events-box {
+    .selector-content {
+      display: flex;
+      .ant-dropdown-trigger {
+        width: 208px;
+        margin-right: 16px;
+      }
+      .biz-select-handle-input {
+        background: #fafafb;
+      }
+      .ant-select-selection-placeholder::after {
+        content: '\e76d' !important;
+      }
+    }
+    .shaixuan {
+      margin: 2px 0 0 16px;
+      color: #9aa1a9;
+      font-size: 20px !important;
+      cursor: pointer;
+    }
+    .shaixuan:hover {
+      color: #165dff;
+    }
+    .shaixuan.disable {
+      color: #ccd0d4;
+      cursor: not-allowed;
+    }
+  }
+
+  .verify-error {
+    .biz-select-handle-input {
+      background-color: #fff;
+      border: 1px solid #fb5547 !important;
+    }
+  }
+  .error-tips {
+    margin-top: -14px;
+    color: #fb5547;
+  }
+}

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

@@ -0,0 +1,49 @@
+import { SearchValueProps, FiltersProps } from '../../types';
+export declare namespace SearchPanelTypes {
+    interface Props {
+        defaultValue?: SearchValueProps;
+        onChange: (values: SearchValueProps, isFetchRequest: boolean) => void;
+        resetTime?: Function;
+    }
+    interface FieldProp {
+        key: string;
+        type: string;
+        name: string;
+        label: string;
+        max: number;
+        addLabel: string;
+        tips?: string;
+        required?: boolean;
+    }
+    interface PanelProp {
+        type: string;
+        value?: FiltersProps;
+        fieldsLength?: number;
+        eventIdList?: number[];
+        onChange?: (data: FiltersProps | undefined) => void;
+        onDelete: () => void;
+        formData: SearchValueProps;
+        setAttrTargetCount: Function;
+        setAttrSourceCount: Function;
+        attrSourceCount: {
+            [x: number]: number;
+        };
+        setMincePropCount: Function;
+        mincePropCount: {
+            [x: number]: number;
+        };
+    }
+    interface bizAttributeSelectorValueProp {
+        id?: number;
+        propCategory?: string;
+        name?: string;
+        category?: string;
+    }
+    interface targetDataProp {
+        event?: {
+            id: number;
+            name: string;
+            alias?: string;
+        };
+    }
+}

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

@@ -0,0 +1,8 @@
+import { SearchValueProps } from '../../types';
+import { EventSelectTypes } from '@zgfe/business-lib/es/eventSelector/types';
+export declare function targetChangeCallback(data: SearchValueProps, eList: number[], eventGroupList: EventSelectTypes.Value[]): SearchValueProps;
+export declare function operableOrNotHandle(data: SearchValueProps, attrSourceCount: {
+    [x: number]: number;
+}, attrTargetCount: number, mincePropCount: {
+    [x: number]: number;
+}, attrGlobalCount: number): boolean;

package/es/modules/searchPanel/utils.js

@@ -0,0 +1,81 @@
+export function targetChangeCallback(data, eList, eventGroupList) {
+  if (eList.length <= 0) {
+    data.globalFilters = undefined;
+  } else {
+    if (data.globalFilters && data.globalFilters.conditions) {
+      var flag = true;
+      data.globalFilters.conditions.forEach(function (condition) {
+        if (condition) {
+          if (condition.propCategory === 'eventProp' && condition.attrId) {
+            var hasExit = judgeAttrInEvents(eList, condition.attrId, eventGroupList);
+            if (!hasExit) {
+              flag = false;
+            }
+          }
+        }
+      });
+      if (!flag) {
+        data.globalFilters = undefined;
+      }
+    }
+  }
+  return data;
+}
+var judgeAttrInEvents = function judgeAttrInEvents(elds, attrId, eventGroupList) {
+  var flag = false;
+  if (!eventGroupList) return false;
+  eventGroupList.forEach(function (group) {
+    group.eventList.forEach(function (event) {
+      if (elds.includes(event.id)) {
+        event.attrList.forEach(function (attr) {
+          if (attr.id === attrId) {
+            flag = true;
+            return;
+          }
+        });
+      }
+    });
+  });
+  return flag;
+};
+export function operableOrNotHandle(data, attrSourceCount, attrTargetCount, mincePropCount, attrGlobalCount) {
+  var flagList = [];
+  if (data.attributionType === undefined) return true;
+  subsetHandle(flagList, data, 'sourceFilters', attrSourceCount, mincePropCount);
+  subsetHandle(flagList, data, 'targetFilters', attrTargetCount);
+  if (attrGlobalCount && data.globalFilters === undefined) return true;
+  data.globalFilters && conditionsHandle('globalFilters', data.globalFilters, attrGlobalCount, 0, flagList);
+  return flagList.indexOf(true) !== -1;
+}
+var subsetHandle = function subsetHandle(flagList, data, type, count, mincePropCount) {
+  data[type].map(function (item) {
+    item === undefined ? flagList.push(true) : null;
+    if (item !== undefined) {
+      (item === null || item === void 0 ? void 0 : item.eventId) === -100 ? flagList.push(true) : null;
+      if (type === 'targetFilters') {
+        item.filters === undefined && count != 0 ? flagList.push(true) : null;
+      } else {
+        item.filters === undefined && Object.keys(count).length > 0 && count[item.eventId] !== undefined ? flagList.push(true) : null;
+        if (mincePropCount != undefined) {
+          item.attributionSubdivision === undefined && Object.keys(mincePropCount).length > 0 && mincePropCount[item.eventId] !== undefined ? flagList.push(true) : null;
+        }
+      }
+      (item === null || item === void 0 ? void 0 : item.filters) && conditionsHandle(type, item.filters, count, item.eventId, flagList);
+    }
+  });
+};
+var conditionsHandle = function conditionsHandle(type, data, count, eventId, flagList) {
+  if (data.conditions.length > 0) {
+    data.conditions.map(function (_item) {
+      if (_item.operator !== 'is null' && _item.operator !== 'is not null') {
+        var _item$values;
+        _item.values && (((_item$values = _item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || _item.values[0] === '') ? flagList.push(true) : null;
+      }
+    });
+  }
+  if (type === 'targetFilters' || type === 'globalFilters') {
+    data.conditions.length != count ? flagList.push(true) : null;
+  } else {
+    count[eventId] && data.conditions.length != count[eventId] ? flagList.push(true) : null;
+  }
+};

package/{dist/esm → es}/style/index.less

@@ -1,5 +1,5 @@
 @import '~@zgfe/business-lib/es/assets/styles/variable.less';
-.insight {
+.attribution {
   &-table-td {
     padding: 0 !important;
 
@@ -39,7 +39,7 @@
     &-link {
       cursor: pointer;
       &:hover {
-        color: @primary-color;
+        // color: @primary-color;
         text-decoration: underline;
       }
     }

package/{dist/esm → es}/style/theme.js

@@ -3,9 +3,7 @@ export default {
   'border-color-base': '#ECEDF0',
   'background-color-base': '#fafafb',
   'text-color': '#021429',
-  // 正文
   'text-color-secondary': '#5f6085',
-  // 次要
   'tooltip-bg': '#242541',
   'error-color': '#fb5547',
   'shadow-color': 'rgba(0, 0, 0, 0.1)',

package/es/types.d.ts

@@ -0,0 +1,52 @@
+/// <reference types="react" />
+import { AttrConditionTypes } from '@zgfe/business-lib';
+import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
+export interface SearchValueProps {
+    targetFilters: Array<FiltersProps>;
+    sourceFilters: Array<FiltersProps>;
+    globalFilters?: AttrConditionTypes.GroupValue;
+    globalDimensions?: Array<AttrConditionTypes.ItemValue>;
+    time?: DatePickerTypes.Value;
+    otherEvent?: boolean;
+    windowCnt?: number;
+    windowType?: 'hour' | 'day';
+    attributionType?: number;
+}
+export interface FiltersProps {
+    eventId: number;
+    eventName: string;
+    filters?: AttrConditionTypes.GroupValue | undefined;
+    attributionSubdivision?: AttributionSubdivisionProps | undefined;
+}
+export interface AttributionSubdivisionProps {
+    relation: string;
+    conditions: ConditionsnProps;
+}
+export interface ConditionsnProps {
+    attrId: number | undefined;
+    propCategory: string | undefined;
+    type: string | undefined;
+    id?: number | undefined;
+    name?: string | undefined;
+    category?: string | undefined;
+    attrName?: string | undefined;
+}
+export interface TableDataHandleProps {
+    xAxis: string[];
+    series: {
+        values: string[];
+    }[];
+}
+export interface TableDataProps {
+    columns?: ColumnsProps[];
+    dataSource?: DataSourceProps[];
+}
+export interface DataSourceProps {
+    [x: string]: string;
+}
+export interface ColumnsProps {
+    key: string;
+    title: string;
+    dataIndex: string;
+}
+export declare const AttributableContext: import("react").Context<any>;

package/es/types.js

@@ -0,0 +1,2 @@
+import { createContext } from 'react';
+export var AttributableContext = /*#__PURE__*/createContext(null);

package/{dist/esm → es}/utils/ajaxConfig.js

@@ -1,11 +1,4 @@
 import _ from 'lodash';
-
-/**
- * 接口option封装
- * @param url url
- * @param options  操作
- * @returns
- */
 function setOptionWapper(url, options) {
   var reqOption = _.cloneDeep(options);
   if (/^\/v1|\.jsp$/.test(url)) {

package/es/utils/request.d.ts

@@ -0,0 +1,3 @@
+import { ajaxConfig } from '@zgfe/business-lib/es/utils/type';
+declare function request<T>(url: string, options: ajaxConfig<T>): Promise<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<T> | null>;
+export default request;

package/es/utils/request.js

@@ -0,0 +1,5 @@
+import { ajax } from '@zgfe/business-lib';
+function request(url, options) {
+  return ajax(url, options);
+}
+export default request;

package/{dist/esm → es}/utils/util.js

@@ -29,12 +29,6 @@ var util = {
   equal: function equal(a, b) {
     return JSON.stringify(a) === JSON.stringify(b);
   },
-  /**
-   * 获取指定范围的随机数
-   * @param min
-   * @param max
-   * @returns {*}
-   */
   random: function random(min, max) {
     return Math.round(Math.random() * (max - min)) + min;
   },
@@ -68,43 +62,20 @@ var util = {
     }
     return option;
   },
-  /**
-   * 将数字转为千分位分割格式
-   * @param num
-   * @returns {string}
-   */
   toThousands: function toThousands(num) {
-    var source = String(num).split('.'); // 按小数点分成2部分
-    source[0] = source[0].replace(new RegExp('(\\d)(?=(\\d{3})+$)', 'ig'), '$1,'); // 只将整数部分进行都好分割
-    return source.join('.'); // 再将小数部分合并进来
-  },
-  /**
-   * 为单数前补0
-   * @param num
-   * @returns {string}
-   */
+    var source = String(num).split('.');
+    source[0] = source[0].replace(new RegExp('(\\d)(?=(\\d{3})+$)', 'ig'), '$1,');
+    return source.join('.');
+  },
   toDoubleNumber: function toDoubleNumber(num) {
-    // num += ''
     var num2 = num.toString();
     return num > 9 ? num2 : '0' + num2;
   },
-  /**
-   * 日期格式化
-   * @param date
-   * @param formatter
-   * @returns {string}
-   */
   dateFormat: function dateFormat() {
     var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
     var formatter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'yyyy-mm-dd';
     return formatter.replace('yyyy', date.getFullYear()).replace('mm', this.toDoubleNumber(date.getMonth() + 1)).replace('dd', this.toDoubleNumber(date.getDate()));
   },
-  /**
-   * 日期格式化
-   * @param date
-   * @param formatter
-   * @returns {string}
-   */
   timeFormat: function timeFormat() {
     var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
     var formatter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'hh:mm:ss';
@@ -112,7 +83,6 @@ var util = {
     if (this.isDate(date)) {
       return formatter.replace('hh', this.toDoubleNumber(date.getHours())).replace('mm', this.toDoubleNumber(date.getMinutes())).replace('ss', this.toDoubleNumber(date.getSeconds()));
     } else if (this.isNumber(date)) {
-      // formatter 格式化规则 如:{s:'秒', h:'小时', m: '分钟'}
       var s = parseInt(date / 1000 + '');
       var m = parseInt(s / 60 + '');
       var h = parseInt(m / 60 + '');
@@ -128,12 +98,6 @@ var util = {
       return formatter.replace('hh', this.toDoubleNumber(h)).replace('mm', this.toDoubleNumber(m)).replace('ss', this.toDoubleNumber(s));
     }
   },
-  /**
-   * 从中间拆分字符串,长度超出的话，解析为xxx...xxx
-   * @param str
-   * @param config
-   * @returns {string}
-   */
   strMiddleSplit: function strMiddleSplit(str) {
     var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
       maxLength: 20,
@@ -143,9 +107,7 @@ var util = {
     };
     str += '';
     var reg = {
-      // eslint-disable-next-line
       fullCharReg: /[^\x00-\xff]/,
-      // eslint-disable-next-line
       fullCharsReg: /[^\x00-\xff]/g,
       anyChars: /[\S\s]{1}/g
     };

package/package.json

@@ -1,25 +1,22 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.0.5",
+  "version": "1.1.0",
+  "module": "es/index.js",
+  "typings": "es/index.d.ts",
+  "files": [
+    "es"
+  ],
   "scripts": {
-    "start": "dumi dev",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
     "docs:build": "dumi build",
     "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
+    "prepublishOnly": "npm run build",
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "pub": "lerna publish",
+    "start": "dumi dev",
     "test": "umi-test",
-    "test:coverage": "umi-test --coverage",
-    "prepublishOnly": "npm run build",
-    "pub": "lerna publish"
-  },
-  "files": [
-    "dist"
-  ],
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
+    "test:coverage": "umi-test --coverage"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -30,25 +27,28 @@
     ]
   },
   "dependencies": {
-    "react": "^18.0.0"
+    "caniuse-lite": "^1.0.30001491",
+    "nanoid": "^4.0.2"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.15.1",
-    "@testing-library/react": "^13.0.0",
+    "@testing-library/react": "^12.1.2",
     "@types/jest": "^27.0.3",
+    "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.30-insight.0",
-    "antd": "4.21.4",
+    "@zgfe/business-lib": "1.1.41-attribution.19",
+    "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
     "echarts-for-react": "^3.0.2",
-    "father": "^4.0.0-rc.2",
+    "father-build": "^1.17.2",
     "gh-pages": "^3.0.0",
     "lerna": "^4.0.0",
     "lint-staged": "^10.0.7",
     "prettier": "^2.2.1",
+    "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "207fd739d93b448e6b125a18105c840511bbd7d1"
+  "gitHead": "c39f3d7a6efe23957437bc6bc78b8b7a6d75fdd1"
 }

package/dist/esm/components/index.d.ts

@@ -1,6 +0,0 @@
-import OptionGroup from './option';
-import ContentPanel from './renderContent';
-import SearchPanel from './searchPanel';
-import InsightTable from './table';
-import { MiNone, MiSpin } from './common';
-export { OptionGroup, ContentPanel, SearchPanel, InsightTable, MiNone, MiSpin };

package/dist/esm/components/index.js

@@ -1,6 +0,0 @@
-import OptionGroup from "./option";
-import ContentPanel from "./renderContent";
-import SearchPanel from "./searchPanel";
-import InsightTable from "./table";
-import { MiNone, MiSpin } from "./common";
-export { OptionGroup, ContentPanel, SearchPanel, InsightTable, MiNone, MiSpin };