@zgfe/business-lib 1.0.10 → 1.0.13-alpha.0

package/es/assets/styles/resetAntd.less

@@ -4,101 +4,92 @@
 
 // 输入框（带icon)
 .ant-input-affix-wrapper {
-  height: @height-lg;
-  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!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 @primary-1!important;
   }
-}
-
-.ant-input-group-addon {
-  background-color: @background-color-base;
-}
-
-.ant-btn-default {
-  border-radius: 4px;
-
-  &:hover,
-  &:active,
-  &:focus {
-    .__default-hover();
+  &.ant-input-status-error {
+    border-color: @error-color !important;
   }
 }
 
-.ant-btn-primary {
-  border-radius: @border-radius-small;
-}
-
-.ant-btn-sm {
-  padding: 0 5px;
-  font-size: 12px;
+.ant-input-group-addon {
+  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: 10px 8px;
-  border-radius: @border-radius-normal;
+  height: @height-lg!important;
+  padding: 0 @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;
     }
   }
 
@@ -106,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;
       }
     }
   }
@@ -128,41 +119,49 @@
 
 /*日历文本框*/
 .ant-picker {
-  border-radius: @border-radius-small;
+  border-radius: @border-radius-small!important;
+
+  span {
+    color: @text-color-secondary!important;
+  }
+
+  .ant-picker-input > input {
+    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;
       }
     }
 
@@ -170,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*/
@@ -203,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;
       }
     }
   }
@@ -215,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*/
@@ -223,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;
         }
       }
     }
@@ -237,7 +236,7 @@
 
   /*日期范围内背景色*/
   .ant-picker-cell-in-range::before {
-    background: @primary-1;
+    background: @primary-1!important;
   }
 
   /*日期范围内的hover效果-背景不变*/
@@ -252,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: @primary-1!important;
   }
 
   /*日期范围内的hover效果*/
@@ -261,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;
       }
     }
   }
@@ -273,63 +272,63 @@
 // 弹窗
 
 .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-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;
       }
     }
   }
@@ -337,55 +336,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!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,6 +396,47 @@
 
   .ant-table-tbody > tr.ant-table-row:hover > td,
   .ant-table-tbody > tr > td.ant-table-cell-row-hover {
-    background: @primary-1;
+    background: @primary-1!important;
   }
 }
+
+/* 提示框 */
+.ant-tooltip-inner {
+  padding: @padding-sm @padding-md!important;
+  border-radius: @border-radius-normal!important;
+}
+
+.ant-form-item-label > label {
+  color: @text-color-secondary!important;
+}
+
+.ant-btn {
+  border-radius: @border-radius-small!important;
+}
+
+.ant-btn-text {
+  background-color: @background-color-gray!important;
+  border: none !important;
+
+  &:hover {
+    color: @text-color!important;
+    background-color: @btn-text-hover-bg!important;
+  }
+
+  &:focus {
+    color: @text-color!important;
+    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/styles/variable.less

@@ -2,7 +2,7 @@
 
 @border-radius-sx: 2px;
 @border-radius-small: 4px;
-@border-radius-normal: 10px;
+@border-radius-normal: 8px;
 @border-radius-large: 20px;
 @option-height: @height-lg;
 @background-color-base: #fafafb;
@@ -19,3 +19,10 @@
 @text-color: #021429;
 // 次要
 @text-color-secondary: #5f6085;
+// 中性色/重要-文标题2
+@tooltip-bg: #242541;
+// 错误颜色
+@error-color: #fb5547;
+
+// text-btn hover背景色
+@btn-text-hover-bg: #cacdd4;

package/es/assets/theme.d.ts

@@ -1,5 +1,10 @@
 declare const _default: {
     'primary-color': string;
     'border-color-base': string;
+    'primary-1': string;
+    'text-color': string;
+    'text-color-secondary': string;
+    'error-color': string;
+    'warning-color': string;
 };
 export default _default;

package/es/assets/theme.js

@@ -1,4 +1,9 @@
 export default {
   'primary-color': '#165dff',
-  'border-color-base': '#ECEDF0'
+  'border-color-base': '#ECEDF0',
+  'primary-1': '#E8EFFF',
+  'text-color': '#021429',
+  'text-color-secondary': '#5f6085',
+  'error-color': '#FB5547',
+  'warning-color': '#FD9F41'
 };

package/es/attrConditions/components/stringList.js

@@ -101,6 +101,7 @@ var StringList = function StringList(props) {
 
               formData = transformRequest(requestData);
               request(Apis.esQuery, {
+                method: 'post',
                 data: formData,
                 headers: {
                   'Content-Type': 'application/x-www-form-urlencoded'

package/es/attributeSelector/styles/index.less

@@ -12,9 +12,11 @@
     display: none;
     flex: none;
     width: @icon-width;
+    color: @text-color-secondary;
     line-height: 2em;
     text-align: center;
     border-radius: @border-radius-small;
+
     &:hover {
       .__error-hover();
     }

package/es/config.d.ts

@@ -0,0 +1,15 @@
+import { RequestOptionsInit } from 'umi-request';
+import { ApiResult } from './utils/type';
+export interface RequestConfig {
+    optionsWrapper?: (url: string, options?: RequestOptionsInit) => {
+        url: string;
+        options?: RequestOptionsInit;
+    };
+    responseWrapper?: (url: string, apiResult: ApiResult<any>) => ApiResult<any>;
+}
+export interface GlobalConfig {
+    request?: RequestConfig;
+}
+export declare let globalConfig: GlobalConfig;
+declare function setGlobalConfig(config: GlobalConfig): void;
+export default setGlobalConfig;

package/es/config.js

@@ -0,0 +1,8 @@
+import _ from 'lodash';
+export var globalConfig = {};
+
+function setGlobalConfig(config) {
+  globalConfig = _.assignIn(config, globalConfig);
+}
+
+export default setGlobalConfig;

package/es/constants/apis.d.ts

@@ -3,6 +3,7 @@ declare const Apis: {
     addScene: string;
     esQuery: string;
     addPanel: string;
+    updatePanelTarget: string;
     queryPanelGroup: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -2,7 +2,8 @@ var Apis = {
   querySceneGroup: '/scene/queryScenesOfGroup.jsp',
   addScene: '/scene/addScene.jsp',
   esQuery: '/data/queryEsData.jsp',
-  addPanel: '/web/sdk/v2/panel/addPanelElement',
+  addPanel: '/apppanel/addPanelElement.jsp',
+  updatePanelTarget: '/apppanel/updateElemet.jsp',
   queryPanelGroup: '/apppanel/panels.jsp'
 };
 export default Apis;

package/es/datePicker/styles/index.less

@@ -1,4 +1,5 @@
 @import '../../assets/styles/inner.less';
+
 .biz-date-picker {
   display: flex;
 
@@ -10,15 +11,18 @@
     display: flex;
     margin: 0 16px;
   }
+
   .biz-select-handle {
     padding: 0;
   }
+
   &-item {
     display: flex;
     align-items: center;
     justify-content: center;
     width: 58px;
     height: @height-base;
+    color: @text-color-secondary;
     border: 1px solid @border-color-base;
     cursor: pointer;