Merge branch 'feature/dataflow' of http://gitlab.qgutech.com/tianqiang/qx-common…

… into feature/dataflow

@@ -347,7 +347,7 @@ export const QxAppSelector: React.FC<QxAppSelectProps> = ({
         closeIcon={
         closeIcon={
           <QxBaseIcon
           <QxBaseIcon
             className={'qx-common__modal--close'}
             className={'qx-common__modal--close'}
-            type={'icon-close'}
+            type={'qx-icon-close'}
           />
           />
         }
         }
         keyboard={false}
         keyboard={false}

@@ -40,6 +40,8 @@ import { QxBaseIcon } from '@qx/common';
 import Icon from '@ant-design/icons';
 import Icon from '@ant-design/icons';
 import { SubNodeIcon } from './sub-node-icon';
 import { SubNodeIcon } from './sub-node-icon';
 
 
+import '../style/reset.less';
+
 type ValueOptionProps = {
 type ValueOptionProps = {
   key: number | string;
   key: number | string;
   value: string;
   value: string;
@@ -724,6 +726,13 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
         // onOk={handleCancel}
         // onOk={handleCancel}
         onCancel={onCancel}
         onCancel={onCancel}
         width={960}
         width={960}
+        wrapClassName={'qx-common__modal'}
+        closeIcon={
+          <QxBaseIcon
+            className={'qx-common__modal--close'}
+            type={'qx-icon-close'}
+          />
+        }
       >
       >
         {isShowJson ? (
         {isShowJson ? (
           <Row>
           <Row>

 @import '~@qx/ui/src/style/variable.less';
 @import '~@qx/ui/src/style/variable.less';
 
 
+* {
+  scrollbar-width: thin;
+  font-variant-numeric: tabular-nums; // tabular-nums 可以达到数字等宽的效果
+  box-sizing: border-box;
+  outline: none;
+  // 覆盖 antd+CSS3 样式
+  // 当用户使用鼠标点击焦点元素或使用键盘的 Tab 键（或快捷键）触发焦点元素焦点环的样式
+  &.focus-visible {
+    outline: none;
+  }
+}
+
+// 全局滚动条样式重设
+::-webkit-scrollbar {
+  width: 9px;
+  height: 12px;
+  padding: 2px 0;
+  background-color: #fafafa;
+}
+
+::-webkit-scrollbar-button,
+::-webkit-scrollbar-corner {
+  display: none;
+  width: 0;
+  height: 0;
+}
+
+::-webkit-scrollbar-thumb {
+  width: 6px;
+  height: 8px;
+  background: rgba(0, 0, 0, 0.1);
+  background-clip: padding-box;
+  border: 2px solid transparent;
+  border-radius: 6px;
+}
+
 .qx-common__modal {
 .qx-common__modal {
   .ant-modal-content {
   .ant-modal-content {
     padding: 0;
     padding: 0;
@@ -28,7 +64,7 @@
       align-items: center;
       align-items: center;
       justify-content: center;
       justify-content: center;
       width: 20px;
       width: 20px;
-      height: 24px;
+      height: 20px;
       padding: 0;
       padding: 0;
 
 
       .qx-common__modal--close {
       .qx-common__modal--close {
@@ -36,9 +72,9 @@
         align-items: center;
         align-items: center;
         justify-content: center;
         justify-content: center;
         width: 20px;
         width: 20px;
-        height: 24px;
+        height: 20px;
         color: @N7;
         color: @N7;
-        font-size: 12px !important;
+        font-size: 16px;
 
 
         &:hover {
         &:hover {
           color: @N9;
           color: @N9;