@zgfe/business-lib 1.0.12 → 1.0.13-alpha.2

package/es/assets/styles/resetAntd.less

@@ -4,89 +4,92 @@
 
 // 输入框（带icon)
 .ant-input-affix-wrapper {
-  height: @height-lg;
-  padding: @padding-xss @padding-xs;
-  line-height: @height-lg;
-  background-color: @background-color-base;
-  border-color: #fff;
-  border-radius: @border-radius-small;
+  height: @height-lg!important;
+  padding: @padding-xss @padding-xs!important;
+  line-height: @height-lg!important;
+  background-color: @background-color-base!important;
+  border-color: #fff !important;
+  border-radius: @border-radius-small!important;
 
   .ant-input {
-    background-color: @background-color-base;
+    background-color: @background-color-base!important;
   }
 
   &:hover {
-    border-color: @primary-color;
+    border-color: @primary-color!important;
   }
 
   &.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless):not(.ant-input-affix-wrapper-focused).ant-input-affix-wrapper,
   &.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless):not(.ant-input-affix-wrapper-focused).ant-input-affix-wrapper:hover {
-    background-color: @background-color-base;
+    background-color: @background-color-base!important;
   }
 }
 
 .ant-input-affix-wrapper-focused {
-  background-color: #fff;
-  border-color: @primary-color;
+  background-color: #fff !important;
+  border-color: @primary-color!important;
 
   .ant-input {
-    background-color: #fff;
+    background-color: #fff !important;
   }
 }
 
 // 输入框
 .ant-input {
-  background-color: @background-color-base;
-  border-color: @background-color-base;
-  border-radius: @border-radius-small;
+  background-color: @background-color-base!important;
+  // border-color: @background-color-base!important;
+  border-radius: @border-radius-small!important;
 
   &:focus,
   &-focused {
-    background-color: #fff;
-    box-shadow: 0 0 0 4px @primary-1;
+    background-color: #fff !important;
+    box-shadow: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `) !important;
+  }
+  &.ant-input-status-error {
+    border-color: @error-color !important;
   }
 }
 
 .ant-input-group-addon {
-  color: @text-color-secondary;
-  background-color: @background-color-base;
+  color: @text-color-secondary!important;
+  background-color: @background-color-base!important;
 }
 
 .ant-select-dropdown {
-  .__select-panel();
+  .__select-panel() !important;
 }
 
 // 选择框下拉选项
 .ant-select-item {
-  height: @height-lg;
-  padding: 0 @padding-sm;
-  border-radius: @border-radius-normal;
+  height: @height-lg!important;
+  padding: @padding-xs @padding-sm!important;
+  border-radius: @border-radius-normal!important;
 
   &:hover:not(.ant-select-item-option-disabled, .ant-select-item-option-selected) {
-    .__default-hover();
+    .__default-hover() !important;
   }
 
   &.ant-select-item-option-selected:not(.ant-select-item-option-disabled) {
-    color: #fff;
-    font-weight: 400;
-    background: @primary-color;
+    color: #fff !important;
+    font-weight: 400 !important;
+    background: @primary-color!important;
   }
 }
 
 .ant-dropdown-menu {
-  .__select-panel();
+  .__select-panel() !important;
 
   .ant-dropdown-menu-item,
   .ant-dropdown-menu-submenu-title {
-    .__select-option();
+    .__select-option() !important;
 
     &.active {
-      color: #fff;
-      background: @primary-color;
+      color: #fff !important;
+      background: @primary-color!important;
     }
 
     .ant-dropdown-menu-title-content {
-      .__default-overflow();
+      .__default-overflow() !important;
     }
   }
 
@@ -94,19 +97,19 @@
     &.active,
     &.active:hover {
       .ant-dropdown-menu-submenu-title {
-        background: @primary-color;
+        background: @primary-color!important;
 
         span {
-          color: #fff;
+          color: #fff !important;
         }
       }
     }
 
     &.ant-dropdown-menu-submenu-active .ant-dropdown-menu-submenu-title {
-      .__default-hover();
+      .__default-hover() !important;
 
       span {
-        color: @primary-color;
+        color: @primary-color!important;
       }
     }
   }
@@ -116,49 +119,49 @@
 
 /*日历文本框*/
 .ant-picker {
-  border-radius: @border-radius-small;
+  border-radius: @border-radius-small!important;
 
   span {
-    color: @text-color-secondary;
+    color: @text-color-secondary!important;
   }
 
   .ant-picker-input > input {
-    color: @text-color;
+    color: @text-color!important;
   }
 
   &:hover,
   &.ant-picker-focused {
-    .__default-hover();
-    border-color: @border-color-base;
-    box-shadow: none;
+    .__default-hover() !important;
+    border-color: @border-color-base!important;
+    box-shadow: none !important;
 
     span,
     input {
-      color: @primary-color;
+      color: @primary-color!important;
     }
   }
 
   .ant-picker-active-bar {
-    display: none;
+    display: none !important;
   }
 }
 
 /*日历下拉框*/
 .ant-picker-dropdown {
   .ant-picker-cell {
-    min-width: 30px;
-    padding: 0;
+    min-width: 30px !important;
+    padding: 0 !important;
 
     &::before {
-      height: 30px;
+      height: 30px !important;
     }
 
     /*禁止选择*/
     &.ant-picker-cell-disabled {
-      color: @disabled-color;
+      color: @disabled-color!important;
 
       &::before {
-        background: #fff;
+        background: #fff !important;
       }
     }
 
@@ -166,32 +169,32 @@
     &.ant-picker-cell-today {
       &.ant-picker-cell-selected {
         .ant-picker-cell-inner::before {
-          background: #fff;
+          background: #fff !important;
         }
       }
 
       .ant-picker-cell-inner::before {
-        position: absolute;
-        top: auto;
-        bottom: 4px;
-        left: 50%;
-        width: 6px;
-        height: 1.5px;
-        background: @primary-color;
-        border: none;
-        border-radius: 0.5px;
-        transform: translateX(-50%);
-        content: '';
+        position: absolute !important;
+        top: auto !important;
+        bottom: 4px !important;
+        left: 50% !important;
+        width: 6px !important;
+        height: 1.5px !important;
+        background: @primary-color!important;
+        border: none !important;
+        border-radius: 0.5px !important;
+        transform: translateX(-50%) !important;
+        content: '' !important;
       }
     }
 
     .ant-picker-cell-inner {
-      min-width: 30px;
-      height: 30px;
-      line-height: 28px;
-      text-align: center;
-      border: 1px solid transparent;
-      border-radius: @border-radius-large;
+      min-width: 30px !important;
+      height: 30px !important;
+      line-height: 28px !important;
+      text-align: center !important;
+      border: 1px solid transparent !important;
+      border-radius: @border-radius-large!important;
     }
 
     /*日期hover*/
@@ -199,8 +202,8 @@
       &:not(.ant-picker-cell-in-view) .ant-picker-cell-inner,
       &:not(.ant-picker-cell-selected):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end):not(.ant-picker-cell-range-hover-start):not(.ant-picker-cell-range-hover-end)
         .ant-picker-cell-inner {
-        background-color: transparent;
-        border: 1px solid @primary-color;
+        background-color: transparent !important;
+        border: 1px solid @primary-color!important;
       }
     }
   }
@@ -211,7 +214,7 @@
     .ant-picker-cell-inner,
   .ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single):not(.ant-picker-cell-range-start)
     .ant-picker-cell-inner {
-    border-radius: 50%;
+    border-radius: 50% !important;
   }
 
   /*日期范围每行最后一个和第一个添加border-radius*/
@@ -219,13 +222,13 @@
     .ant-picker-cell-in-view:not(.ant-picker-cell-selected) {
       &:first-child {
         &.ant-picker-cell-in-range::before {
-          border-radius: @border-radius-small 0 0 @border-radius-small;
+          border-radius: @border-radius-small 0 0 @border-radius-small!important;
         }
       }
 
       &:last-child {
         &.ant-picker-cell-in-range::before {
-          border-radius: 0 @border-radius-small @border-radius-small 0;
+          border-radius: 0 @border-radius-small @border-radius-small 0 !important;
         }
       }
     }
@@ -233,7 +236,7 @@
 
   /*日期范围内背景色*/
   .ant-picker-cell-in-range::before {
-    background: @primary-1;
+    background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
   }
 
   /*日期范围内的hover效果-背景不变*/
@@ -248,7 +251,7 @@
   .ant-picker-panel
     > :not(.ant-picker-date-panel)
     .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-end::before {
-    background: @primary-1;
+    background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
   }
 
   /*日期范围内的hover效果*/
@@ -257,10 +260,10 @@
   .ant-picker-date-panel
     .ant-picker-cell-in-view.ant-picker-cell-in-range.ant-picker-cell-range-hover-end {
     .ant-picker-cell-inner {
-      border: 1px solid @primary-color;
+      border: 1px solid @primary-color!important;
 
       &::after {
-        background-color: transparent;
+        background-color: transparent !important;
       }
     }
   }
@@ -269,63 +272,64 @@
 // 弹窗
 
 .ant-modal-content {
-  border-radius: @border-radius-normal;
+  border-radius: @border-radius-normal!important;
 
   .ant-modal-footer {
-    padding: 0 24px 24px 24px;
-    border-top: none;
+    padding: 0 24px 24px 24px !important;
+    border-top: none !important;
 
     .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
-      margin-left: 16px;
+      margin-left: 16px !important;
     }
   }
 
   .ant-modal-header {
-    padding-top: 24px;
-    border-bottom: none;
-    border-radius: @border-radius-normal @border-radius-normal 0 0;
+    padding-top: 24px !important;
+    border-bottom: none !important;
+    border-radius: @border-radius-normal @border-radius-normal 0 0 !important;
 
     .ant-modal-title {
-      color: #000;
-      font-weight: 500;
-      font-size: 24px;
-      line-height: 24px;
+      color: #000 !important;
+      font-weight: 500 !important;
+      font-size: 24px !important;
+      line-height: 24px !important;
     }
   }
 
   .ant-modal-body {
-    max-height: 400px;
-    padding-bottom: 0;
-    overflow: auto;
+    max-height: 400px !important;
+    padding-top: @padding-xs !important;
+    padding-bottom: 0 !important;
+    overflow: auto !important;
   }
 }
 
 // 分页
 .ant-pagination {
-  margin: 0;
-  margin-top: 20px;
+  margin: 0 !important;
+  margin-top: 20px !important;
 
   .ant-select:not(.ant-select-customize-input) .ant-select-selector {
-    border-radius: @border-radius-small;
+    border-radius: @border-radius-small!important;
   }
 
   .ant-pagination-item {
-    color: @text-color-secondary;
-    background: @background-color-base;
-    border: none;
-    border-radius: @border-radius-small;
+    color: @text-color-secondary!important;
+    background: @background-color-base!important;
+    border: none !important;
+    border-radius: @border-radius-small!important;
 
     &.ant-pagination-item-active {
-      background: @primary-color;
+      background: @primary-color!important;
 
       a {
-        color: @white;
+        color: @white!important;
       }
     }
 
     &:not(.ant-pagination-item-active):hover {
       a {
-        color: @primary-color;
+        color: @primary-color!important;
       }
     }
   }
@@ -333,59 +337,59 @@
   .ant-pagination-prev,
   .ant-pagination-next {
     .ant-pagination-item-link {
-      color: @text-color-secondary;
-      background: @background-color-base;
-      border: none;
-      border-radius: @border-radius-small;
+      color: @text-color-secondary!important;
+      background: @background-color-base!important;
+      border: none !important;
+      border-radius: @border-radius-small!important;
     }
 
     &:not(.ant-pagination-disabled) .ant-pagination-item-link:hover {
-      color: @primary-color;
+      color: @primary-color!important;
     }
   }
 
   .ant-pagination-options-quick-jumper input {
-    border-radius: @border-radius-small;
+    border-radius: @border-radius-small!important;
   }
 }
 
 // 表格
 .ant-table {
-  overflow: hidden;
-  color: @text-color;
-  border: 1px solid @border-color-base;
-  border-radius: @border-radius-normal;
+  overflow: hidden !important;
+  color: @text-color!important;
+  border: 1px solid @border-color-base!important;
+  border-radius: @border-radius-normal!important;
 
   .ant-table-container {
     .ant-table-thead > tr > th {
-      color: @text-color;
-      line-height: 16px;
-      background: @background-color-base;
-      border: none;
+      color: @text-color!important;
+      line-height: 16px !important;
+      background: @background-color-base!important;
+      border: none !important;
 
       &::before {
         width: 0 !important;
       }
 
       &.ant-table-cell-fix-left-last {
-        border-right: 1px solid @border-color-base;
+        border-right: 1px solid @border-color-base!important;
       }
     }
 
     .ant-table-tbody {
-      color: @text-color-secondary;
+      color: @text-color-secondary!important;
     }
 
     .ant-table-tbody > tr:not(:last-child) > td {
-      border-bottom: 1px solid @border-color-base;
+      border-bottom: 1px solid @border-color-base!important;
     }
 
     .ant-table-tbody > tr > td {
-      line-height: 15px;
+      line-height: 15px !important;
 
       &.ant-table-cell-fix-left {
         &.ant-table-cell-fix-left-last {
-          border-right: 1px solid @border-color-base;
+          border-right: 1px solid @border-color-base!important;
         }
       }
     }
@@ -393,47 +397,47 @@
 
   .ant-table-tbody > tr.ant-table-row:hover > td,
   .ant-table-tbody > tr > td.ant-table-cell-row-hover {
-    background: @primary-1;
+    background: color(~`colorPalette('@{primary-color}', 0.1) `) !important;
   }
 }
 
 /* 提示框 */
 .ant-tooltip-inner {
-  padding: @padding-sm @padding-md;
-  border-radius: @border-radius-normal;
+  padding: @padding-sm @padding-md!important;
+  border-radius: @border-radius-normal!important;
 }
 
 .ant-form-item-label > label {
-  color: @text-color-secondary;
+  color: @text-color-secondary!important;
 }
 
 .ant-btn {
-  border-radius: @border-radius-small;
+  border-radius: @border-radius-small!important;
 }
 
 .ant-btn-text {
-  background-color: @background-color-gray;
-  border: none;
+  background-color: @background-color-gray!important;
+  border: none !important;
 
   &:hover {
-    color: @text-color;
-    background-color: @btn-text-hover-bg;
+    color: @text-color!important;
+    background-color: @btn-text-hover-bg!important;
   }
 
   &:focus {
-    color: @text-color;
-    background-color: #94a6ce;
+    color: @text-color!important;
+    background-color: #94a6ce !important;
   }
 }
 
 .ant-btn-primary {
-  color: #fff;
+  color: #fff !important;
 }
 
 .ant-btn-ghost {
-  color: @text-color-secondary;
+  color: @text-color-secondary!important;
 }
 
 .ant-form-item-explain-error {
-  color: @error-color;
+  color: @error-color!important;
 }

package/es/assets/styles/variable.less

@@ -5,24 +5,9 @@
 @border-radius-normal: 8px;
 @border-radius-large: 20px;
 @option-height: @height-lg;
-@background-color-base: #fafafb;
 @background-color-gray: #f6f6f6;
 @icon-width: 24px;
 
-@shadow-color: rgba(0, 0, 0, 0.1);
 @shadow-color-light: rgba(0, 0, 0, 0.1);
-@box-shadow-base: 0px 4px 10px @shadow-color;
 @box-shadow-small: 0px 1px 2px @shadow-color-light;
-@box-shadow-form: 0 0 0 4px @primary-1;
-
-// 正文
-@text-color: #021429;
-// 次要
-@text-color-secondary: #5f6085;
-// 中性色/重要-文标题2
-@tooltip-bg: #242541;
-// 错误颜色
-@error-color: #fb5547;
-
-// text-btn hover背景色
-@btn-text-hover-bg: #cacdd4;
+@box-shadow-form: 0 0 0 4px color(~`colorPalette('@{primary-color}', 0.1) `);

package/es/assets/theme.d.ts

@@ -1,8 +1,15 @@
 declare const _default: {
     'primary-color': string;
     'border-color-base': string;
-    'primary-1': string;
+    'background-color-base': string;
     'text-color': string;
     'text-color-secondary': string;
+    'tooltip-bg': string;
+    'error-color': string;
+    'shadow-color': string;
+    'box-shadow-base': string;
+    'btn-text-hover-bg': string;
+    'warning-color': string;
+    'border-color-split': string;
 };
 export default _default;

package/es/assets/theme.js

@@ -1,7 +1,14 @@
 export default {
   'primary-color': '#165dff',
   'border-color-base': '#ECEDF0',
-  'primary-1': '#E8EFFF',
+  'background-color-base': '#fafafb',
   'text-color': '#021429',
-  'text-color-secondary': '#5f6085'
+  'text-color-secondary': '#5f6085',
+  'tooltip-bg': '#242541',
+  'error-color': '#fb5547',
+  'shadow-color': 'rgba(0, 0, 0, 0.1)',
+  'box-shadow-base': '0px 4px 10px rgba(0, 0, 0, 0.1)',
+  'btn-text-hover-bg': '#cacdd4',
+  'warning-color': '#FD9F41',
+  'border-color-split': '#E8EFFF'
 };

package/es/attrConditions/components/operateList.js

@@ -20,7 +20,7 @@ var BizOperateList = function BizOperateList(props) {
   var _props$attr2;
 
   var _useState = useState({
-    value: props.defaultValue
+    value: ''
   }),
       _useState2 = _slicedToArray(_useState, 2),
       current = _useState2[0],
@@ -39,7 +39,7 @@ var BizOperateList = function BizOperateList(props) {
     setOptions(optionData);
     var flag = true;
 
-    if (current) {
+    if (current.value) {
       optionData.forEach(function (item) {
         if (item.value === current.value) {
           if (current.name && current.name === item.name) {
@@ -47,6 +47,11 @@ var BizOperateList = function BizOperateList(props) {
           }
         }
       });
+    } else if (props.defaultValue) {
+      setCurrent({
+        value: props.defaultValue
+      });
+      return;
     }
 
     if (!flag) return;

package/es/attrConditions/components/stringList.js

@@ -16,7 +16,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useContext, useEffect, useState } from 'react';
 import { classPrefix } from '..';
-import { PropCategory } from '../../attributeSelector/types';
 import Apis from '../../constants/apis';
 import BizGlobalDataContext from '../../context';
 import BizSelect from '../../select';
@@ -84,8 +83,8 @@ var StringList = function StringList(props) {
                 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.propCategory) === PropCategory.EventProp ? attrData.id : 0,
-                dimension_sub: (attrData === null || attrData === void 0 ? void 0 : attrData.propCategory) === PropCategory.EventProp ? 'event_attr' : attrData === null || attrData === void 0 ? void 0 : attrData.name,
+                attr: (attrData === null || attrData === void 0 ? void 0 : attrData.id) || 0,
+                dimension_sub: attrData === null || attrData === void 0 ? void 0 : attrData.dimensionSub,
                 v: ''
               };
 

package/es/attrConditions/demo/group.js

@@ -18,6 +18,7 @@ import userData from '../../mock/user';
 import { Button } from 'antd';
 var conditions = [{
   propCategory: 'userProp',
+  attrId: 0,
   type: 2,
   operator: 'gt',
   values: ['25200', '1'],

package/es/attrConditions/demo/index.js

@@ -29,6 +29,7 @@ export default (function () {
       values: ['25200', '1'],
       subtype: 2,
       attrName: 'duration',
+      attrId: 0,
       category: 'fixed'
     }
   }),