@vtx/components 4.0.0-beta.9 → 4.0.0-beta.90

package/es/vtx-datagrid/style/index.js

@@ -8,37 +8,85 @@ import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxStyle = function genVtxStyle(token) {
   var componentCls = token.componentCls,
     antCls = token.antCls;
-  return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty({
     position: 'relative',
-    overflow: 'hidden'
-  }, "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty({}, '.ant-table', _defineProperty(_defineProperty(_defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
+    // overflow: 'hidden',
+    display: 'flex',
+    flexDirection: 'column'
+  }, "".concat(antCls, "-table-cell-ellipsis"), {
+    whiteSpace: 'normal'
+  }), "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "table", {
+    // minWidth: "calc(100% - 2px) !important"
+  }), '.ant-spin, .ant-spin-nested-loading', _defineProperty({
+    height: '100%'
+  }, '.ant-spin-container', _defineProperty({
+    height: '100%',
+    display: 'flex',
+    flexDirection: 'column'
+  }, '.ant-table', _defineProperty({
+    // height: '100%',
+    flex: 1
+  }, '.ant-table-container', _defineProperty(_defineProperty({
+    height: '100%',
+    borderInlineStart: 'none'
+  }, '.ant-table-body', {
+    scrollbarWidth: 'thin'
+  }), '.ant-table-content', _defineProperty({
+    height: '100%',
+    scrollbarWidth: 'thin'
+  }, 'table', {
+    // height: '100%',
+    minWidth: 'calc(100% - 1px) !important'
+  })))))), '.ant-table', _defineProperty(_defineProperty(_defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
     '>tr>th': {
-      background: token.colorBgContainer
+      background: token.colorBgContainer,
+      '&:first-child': {
+        borderInlineStart: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)'
+      }
     }
   })), '.ant-table-cell', {
-    minWidth: 20
-  }), '.ant-table-body', _defineProperty({}, '.ant-table-tbody', {
+    // minWidth: 10,
+  }), '.ant-table-tbody', {
+    '>tr>td': {
+      '&:first-child': {
+        borderInlineStart: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)'
+      }
+    },
     '>tr.ant-table-placeholder': {
       position: 'absolute',
-      top: '25%',
+      top: 'auto',
+      bottom: 'auto',
       right: 0,
       left: 0,
       backgroundColor: 'transparent',
       borderTop: 'none',
+      // borderInlineEnd: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
+      // borderBottom: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
       '>td.ant-table-cell': {
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
+        padding: 0,
         width: '100%',
         height: '100%',
-        border: 'none'
+        border: 'none',
+        '>.ant-table-expanded-row-fixed': {
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          height: '100%',
+          width: '100%',
+          '&::after': {
+            border: 'none'
+          }
+        }
       }
     }
-  }))), '.ant-pagination', _defineProperty({}, '.ant-pagination-item', {
+  })), '.ant-pagination', _defineProperty({
+    margin: 'var(--ant-margin) 0 0 0'
+  }, '.ant-pagination-item', {
     borderRadius: token.borderRadiusSM
-  }))), "&-fit", {
-    height: '100%'
-  }), "&-noFit", {}), "&-no-border", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty(_defineProperty({
+  })))), "".concat(componentCls, "-fit"), {
+    height: '100%',
+    minHeight: 200
+  }), "".concat(componentCls, "-noFit"), {}), "".concat(componentCls, "-no-border"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty(_defineProperty(_defineProperty({
     borderColor: 'transparent'
   }, '.ant-table-thead', {
     '>tr>th': {
@@ -47,8 +95,20 @@ var genVtxStyle = function genVtxStyle(token) {
   }), '.ant-table-body', {
     '>table >tbody>tr>td': {
       borderInlineColor: 'transparent !important'
+    },
+    '>table >tbody>tr.ant-table-placeholder': {
+      borderInlineColor: 'transparent !important',
+      borderBottomColor: 'transparent !important'
     }
-  }))))), "&.vtx-datagrid-striped", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty({}, '.ant-table-body', {
+  }), '.ant-table-content', {
+    '>table >tbody>tr>td': {
+      borderInlineColor: 'transparent !important'
+    },
+    '>table >tbody>tr.ant-table-placeholder': {
+      borderInlineColor: 'transparent !important',
+      borderBottomColor: 'transparent !important'
+    }
+  }))))), "".concat(componentCls, "-striped"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty(_defineProperty({}, '.ant-table-body', {
     '>table >tbody>tr:nth-child(odd)>td': {
       backgroundColor: token.colorBgLayoutTable,
       '&.ant-table-cell-row-hover': {
@@ -64,11 +124,41 @@ var genVtxStyle = function genVtxStyle(token) {
         backgroundColor: token.controlItemBgActiveHover
       }
     }
-  }))))), "&.vtx-datagrid-header-background", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
+  }), '.ant-table-tbody', {
+    '>tr:nth-child(odd)>td': {
+      backgroundColor: token.colorBgLayoutTable,
+      '&.ant-table-cell-row-hover': {
+        backgroundColor: token.colorFillAlterSolid
+      }
+    },
+    '>tr:nth-child(odd)>td.ant-table-column-sort': {
+      backgroundColor: token.colorFillAlterSolid
+    },
+    '>tr.ant-table-row-selected:nth-child(odd)>td': {
+      backgroundColor: token.controlItemBgActive,
+      '&.ant-table-cell-row-hover': {
+        backgroundColor: token.controlItemBgActiveHover
+      }
+    }
+  }))))), "".concat(componentCls, "-header-background"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
     '>tr>th': {
       background: token.colorBgLayoutTable
     }
-  }))))));
+  }))))), "".concat(componentCls, "-no-header-background"), _defineProperty({}, "".concat(antCls, "-table-wrapper "), _defineProperty({}, '.ant-table-thead', {
+    '>tr>th': {
+      background: token.colorBgContainer
+    }
+  }))), "".concat(componentCls, "-no-data"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-spin', _defineProperty({}, '.ant-spin-container', _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-container', _defineProperty({
+    borderInlineStart: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)'
+  }, '.ant-table-content', _defineProperty({
+    borderRight: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)',
+    borderBottom: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)'
+  }, 'table', {})))))))), "".concat(componentCls, "-no-data").concat(componentCls, "-no-border"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-spin', _defineProperty({}, '.ant-spin-container', _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-container', _defineProperty({
+    borderInlineStart: 'none'
+  }, '.ant-table-content', {
+    borderRight: 'none',
+    borderBottom: 'none'
+  })))))));
 };
 export function useStyle(prefix) {
   return useAntdStyle(prefix, function (token) {

package/es/vtx-datagrid/style/index.less

@@ -1,242 +1,242 @@
-
-
-@prefix-cls: vtx-datagrid;
-
-.@{prefix-cls} {
-    position: relative;
-    width: 100%;
-    overflow: hidden;
-
-    &-fit {
-        height: 100%;
-        .ant-table-container {
-            border-left: none !important;
-            table > thead > tr th:first-child {
-                border-left: 1px solid @table-border-color;
-            }
-        }
-        .ant-table-body {
-            // overflow-y: auto !important;
-        }
-        .ant-table-header,
-        .ant-table-body {
-            &::-webkit-scrollbar {
-                width: @webkit-scrollbar-width;
-                height: @webkit-scrollbar-height;
-                background-color: @webkit-scrollbar-color;
-            }
-
-            &::-webkit-scrollbar-thumb {
-                background-color: @webkit-scrollbar-thumb-color;
-                border-radius: @webkit-scrollbar-thumb-radius;
-            }
-            > table {
-                min-height: 1px;
-            }
-        }
-        .ant-table-tbody > tr {
-            &:nth-child(odd) {
-                background: @table-row-odd;
-                > td {
-                    background: @table-row-odd !important;
-                }
-            }
-            > td:first-child {
-                border-left: 1px solid @table-border-color;
-            }
-        }
-        .ant-table-fixed-header .ant-table-scroll .ant-table-header {
-            min-width: 5px !important;
-        }
-        .ant-table-pagination {
-            position: absolute;
-            right: 0;
-            bottom: 0;
-        }
-        .ant-spin-nested-loading {
-            height: 100%;
-            .ant-spin-container {
-                position: relative;
-                height: 100%;
-                .ant-table {
-                    height: 100%;
-                }
-            }
-        }
-    }
-    &-noFit {
-        .ant-table-tbody > tr {
-            &:nth-child(even) when(@theme=default) {
-                background: #f6f6f6;
-                > td {
-                    background: #f6f6f6 !important;
-                }
-            }
-        }
-    }
-    .ant-table-container {
-        position: relative;
-        height: 100%;
-    }
-    .ant-table-middle {
-        .ant-table-thead > tr > th {
-            padding-left: 12px !important;
-            padding-right: 12px !important;
-        }
-        .ant-table-tbody > tr > td {
-            padding-left: 12px !important;
-            padding-right: 12px !important;
-        }
-    }
-    .ant-table-tbody > tr.ant-table-row-selected > td {
-        // background: transparent !important;
-        border-color: @table-border-color !important;
-    }
-
-    .ant-table-thead > tr > th when(@theme=default) {
-        // antd4.0 半透明会重叠
-        // background-color: fade(#1890ff, 8);
-        font-weight: bold;
-        background-color: rgba(237, 246, 255, 1);
-    }
-    .ant-table-tbody > tr {
-        // &:nth-child(even) when(@theme=default) {
-        // background: #f6f6f6;
-        // }
-        & > .ant-table-cell {
-            color: @text-color;
-        }
-        
-        &.ant-table-placeholder {
-            position: absolute;
-            top: 25%;
-            // top: auto;
-            right: 0;
-            // bottom: auto;
-            left: 0;
-            background-color: transparent;
-            border-top: none;
-            // height: 100%;
-            & > td.ant-table-cell {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                width: 100%;
-                height: 100%;
-                // border-right: @border-width-base @border-style-base @table-border-color;
-                // border-left: @border-width-base @border-style-base @table-border-color;
-                border: none;
-            }
-        }
-    }
-    // fix: checkbox 选中时 固定列 最上面一层透明会 和下面重叠
-    // .ant-table-tbody > tr.ant-table-row-selected td {
-    //     background: transparent;
-    // }
-    &-alert {
-        margin-bottom: 8px;
-        &-message when(@theme=default) {
-            color: fade(@black, 65%);
-        }
-        &-message when(@theme=dark) {
-            color: @text-color;
-        }
-        &-info-content > strong {
-            margin: 0 4px;
-            color: #13c2c2;
-        }
-        &-info-option {
-            margin-left: 10px;
-        }
-    }
-    &-nodata {
-        .ant-table-scroll {
-            overflow-y: hidden;
-        }
-    }
-    &-toolbar {
-        display: table;
-        width: 100%;
-        margin: 16px 0;
-        color: @text-color;
-    }
-    &-toolbar-left,
-    &-toolbar-right {
-        display: inline-block;
-        display: table-cell;
-        vertical-align: middle;
-    }
-    &-toolbar-left {
-        color: @text-color;
-        font-size: 16px;
-    }
-    &-toolbar-right {
-        float: right;
-    }
-    // &-toolbar-line {
-    //     width: 1px;
-    //     height: 14px;
-    //     display: inline-block;
-    //     vertical-align: middle;
-    //     background: #e8e8e8;
-    //     margin: 0 -2px 0 12px;
-    // }
-    &-toolbar-setting-item {
-        display: inline-block;
-        margin-left: 16px;
-        color: @icon-color;
-        font-size: 16px;
-        vertical-align: middle;
-        cursor: pointer;
-        color: #707070;
-        &:hover {
-            color: @icon-color-hover;
-        }
-    }
- 
-    &-space-item {
-        display: inline-block;
-        vertical-align: middle;
-    }
-    .react-resizable {
-        position: relative;
-        background-clip: padding-box;
-    }
-    .react-resizable-handle {
-        position: absolute;
-        right: -5px;
-        bottom: 0;
-        z-index: 1;
-        width: 10px;
-        height: 100%;
-        cursor: col-resize;
-    }
-
-    &-column-setting {
-        &-title {
-            height: 32px;
-            line-height: 32px;
-
-            a {
-                display: inline-block;
-                float: right;
-                vertical-align: middle;
-            }
-        }
-
-        &-checkbox-wrapper {
-            color: @text-color;
-            vertical-align: middle;
-        }
-
-        &-list {
-            &-list-item {
-                display: flex;
-
-                &-title {
-                    flex: 1;
-                }
-            }
-        }
-    }
-}
+
+
+@prefix-cls: vtx-datagrid;
+
+.@{prefix-cls} {
+    position: relative;
+    width: 100%;
+    overflow: hidden;
+
+    &-fit {
+        height: 100%;
+        .ant-table-container {
+            border-left: none !important;
+            table > thead > tr th:first-child {
+                border-left: 1px solid @table-border-color;
+            }
+        }
+        .ant-table-body {
+            // overflow-y: auto !important;
+        }
+        .ant-table-header,
+        .ant-table-body {
+            &::-webkit-scrollbar {
+                width: @webkit-scrollbar-width;
+                height: @webkit-scrollbar-height;
+                background-color: @webkit-scrollbar-color;
+            }
+
+            &::-webkit-scrollbar-thumb {
+                background-color: @webkit-scrollbar-thumb-color;
+                border-radius: @webkit-scrollbar-thumb-radius;
+            }
+            > table {
+                min-height: 1px;
+            }
+        }
+        .ant-table-tbody > tr {
+            &:nth-child(odd) {
+                background: @table-row-odd;
+                > td {
+                    background: @table-row-odd !important;
+                }
+            }
+            > td:first-child {
+                border-left: 1px solid @table-border-color;
+            }
+        }
+        .ant-table-fixed-header .ant-table-scroll .ant-table-header {
+            min-width: 5px !important;
+        }
+        .ant-table-pagination {
+            position: absolute;
+            right: 0;
+            bottom: 0;
+        }
+        .ant-spin-nested-loading {
+            height: 100%;
+            .ant-spin-container {
+                position: relative;
+                height: 100%;
+                .ant-table {
+                    height: 100%;
+                }
+            }
+        }
+    }
+    &-noFit {
+        .ant-table-tbody > tr {
+            &:nth-child(even) when(@theme=default) {
+                background: #f6f6f6;
+                > td {
+                    background: #f6f6f6 !important;
+                }
+            }
+        }
+    }
+    .ant-table-container {
+        position: relative;
+        height: 100%;
+    }
+    .ant-table-middle {
+        .ant-table-thead > tr > th {
+            padding-left: 12px !important;
+            padding-right: 12px !important;
+        }
+        .ant-table-tbody > tr > td {
+            padding-left: 12px !important;
+            padding-right: 12px !important;
+        }
+    }
+    .ant-table-tbody > tr.ant-table-row-selected > td {
+        // background: transparent !important;
+        border-color: @table-border-color !important;
+    }
+
+    .ant-table-thead > tr > th when(@theme=default) {
+        // antd4.0 半透明会重叠
+        // background-color: fade(#1890ff, 8);
+        font-weight: bold;
+        background-color: rgba(237, 246, 255, 1);
+    }
+    .ant-table-tbody > tr {
+        // &:nth-child(even) when(@theme=default) {
+        // background: #f6f6f6;
+        // }
+        & > .ant-table-cell {
+            color: @text-color;
+        }
+        
+        &.ant-table-placeholder {
+            position: absolute;
+            top: 25%;
+            // top: auto;
+            right: 0;
+            // bottom: auto;
+            left: 0;
+            background-color: transparent;
+            border-top: none;
+            // height: 100%;
+            & > td.ant-table-cell {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+                // border-right: @border-width-base @border-style-base @table-border-color;
+                // border-left: @border-width-base @border-style-base @table-border-color;
+                border: none;
+            }
+        }
+    }
+    // fix: checkbox 选中时 固定列 最上面一层透明会 和下面重叠
+    // .ant-table-tbody > tr.ant-table-row-selected td {
+    //     background: transparent;
+    // }
+    &-alert {
+        margin-bottom: 8px;
+        &-message when(@theme=default) {
+            color: fade(@black, 65%);
+        }
+        &-message when(@theme=dark) {
+            color: @text-color;
+        }
+        &-info-content > strong {
+            margin: 0 4px;
+            color: #13c2c2;
+        }
+        &-info-option {
+            margin-left: 10px;
+        }
+    }
+    &-nodata {
+        .ant-table-scroll {
+            overflow-y: hidden;
+        }
+    }
+    &-toolbar {
+        display: table;
+        width: 100%;
+        margin: 16px 0;
+        color: @text-color;
+    }
+    &-toolbar-left,
+    &-toolbar-right {
+        display: inline-block;
+        display: table-cell;
+        vertical-align: middle;
+    }
+    &-toolbar-left {
+        color: @text-color;
+        font-size: 16px;
+    }
+    &-toolbar-right {
+        float: right;
+    }
+    // &-toolbar-line {
+    //     width: 1px;
+    //     height: 14px;
+    //     display: inline-block;
+    //     vertical-align: middle;
+    //     background: #e8e8e8;
+    //     margin: 0 -2px 0 12px;
+    // }
+    &-toolbar-setting-item {
+        display: inline-block;
+        margin-left: 16px;
+        color: @icon-color;
+        font-size: 16px;
+        vertical-align: middle;
+        cursor: pointer;
+        color: #707070;
+        &:hover {
+            color: @icon-color-hover;
+        }
+    }
+ 
+    &-space-item {
+        display: inline-block;
+        vertical-align: middle;
+    }
+    .react-resizable {
+        position: relative;
+        background-clip: padding-box;
+    }
+    .react-resizable-handle {
+        position: absolute;
+        right: -5px;
+        bottom: 0;
+        z-index: 1;
+        width: 10px;
+        height: 100%;
+        cursor: col-resize;
+    }
+
+    &-column-setting {
+        &-title {
+            height: 32px;
+            line-height: 32px;
+
+            a {
+                display: inline-block;
+                float: right;
+                vertical-align: middle;
+            }
+        }
+
+        &-checkbox-wrapper {
+            color: @text-color;
+            vertical-align: middle;
+        }
+
+        &-list {
+            &-list-item {
+                display: flex;
+
+                &-title {
+                    flex: 1;
+                }
+            }
+        }
+    }
+}

package/es/vtx-date-picker/QdatePicker.js

@@ -26,7 +26,7 @@ export default function VtxQtimePicker(props) {
   var _format$split;
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('', 'vtx-color-picker');
+  var prefixCls = getPrefixCls('', 'vtx-date-picker');
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;