@zgfe/modules-attribution 1.1.6 → 1.1.13-zhongyuan.1

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

@@ -1,226 +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;
-  }
-}
+@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 {
+    margin-bottom: 16px;
+    color: #021429;
+    font-weight: 500;
+    font-size: 14px;
+  }
+  &-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 {
+      right: 0px !important;
+      z-index: 999;
+      // left: 200px!important;
+      &-distance {
+        // left: 170px!important;
+      }
+    }
+  }
+
+  &-otherEvent {
+    margin-bottom: 34px;
+    color: #021429;
+    font-size: 14px;
+    .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/style/image/ring.svg

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
-<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
-</circle>
-<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
-</circle>
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
+</circle>
+<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
+</circle>
 <!-- [ldio] generated by https://loading.io/ --></svg>

package/es/style/index.less

@@ -1,47 +1,47 @@
-@import '~@zgfe/business-lib/es/assets/styles/variable.less';
-.attribution {
-  &-table-td {
-    padding: 0 !important;
-
-    &-show {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      min-width: 60px;
-      height: 48px;
-      cursor: pointer;
-      span {
-        width: 10px;
-        height: 10px;
-        border-radius: 50%;
-        cursor: pointer;
-      }
-    }
-
-    &-name {
-      display: flex;
-      align-items: center;
-      .bsicon {
-        margin-right: 4px;
-        color: #fd9f41;
-      }
-
-      &-content {
-        display: inline-block;
-        max-width: 300px;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        cursor: pointer;
-      }
-    }
-
-    &-link {
-      cursor: pointer;
-      &:hover {
-        // color: @primary-color;
-        text-decoration: underline;
-      }
-    }
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/variable.less';
+.attribution {
+  &-table-td {
+    padding: 0 !important;
+
+    &-show {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      min-width: 60px;
+      height: 48px;
+      cursor: pointer;
+      span {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        cursor: pointer;
+      }
+    }
+
+    &-name {
+      display: flex;
+      align-items: center;
+      .bsicon {
+        margin-right: 4px;
+        color: #fd9f41;
+      }
+
+      &-content {
+        display: inline-block;
+        max-width: 300px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        cursor: pointer;
+      }
+    }
+
+    &-link {
+      cursor: pointer;
+      &:hover {
+        // color: @primary-color;
+        text-decoration: underline;
+      }
+    }
+  }
+}

package/es/types.d.ts

@@ -2,6 +2,8 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
 export interface SearchValueProps {
+    refresh?: boolean;
+    refreshMark?: string;
     targetFilters: Array<FiltersProps>;
     sourceFilters: Array<FiltersProps>;
     globalFilters?: AttrConditionTypes.GroupValue;
@@ -9,6 +11,7 @@ export interface SearchValueProps {
     time?: DatePickerTypes.Value;
     otherEvent?: boolean;
     windowCnt?: number;
+    platform?: number;
     windowType?: 'hour' | 'day';
     attributionType?: number;
     app_id?: number;
@@ -39,10 +42,12 @@ export interface TableDataHandleProps {
     series: {
         values: string[];
     }[];
+    delEvent?: number;
 }
 export interface TableDataProps {
     columns?: ColumnsProps[];
     dataSource?: DataSourceProps[];
+    delEvent?: number;
 }
 export interface DataSourceProps {
     [x: string]: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-attribution",
-  "version": "1.1.6",
+  "version": "1.1.13-zhongyuan.1",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -37,7 +37,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.87-auth.7",
+    "@zgfe/business-lib": "1.2.70-hxd.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -50,5 +50,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "5a6809d0aba18d2e044de2299e0820c138bc334c"
+  "gitHead": "8565675991aca9effea6fd0ca22c73bec394b343"
 }