bkui-vue 0.0.1-beta.122 → 0.0.1-beta.125

package/lib/table/plugins/settings.less

@@ -1,4 +1,4 @@
-@import '../styles/themes/themes.less';
+@import '../../styles/themes/themes.less';
 
 .@{bk-prefix}-table-settings {
   &[data-bk-table-settings-theme='true'] {
@@ -26,6 +26,15 @@
           right: 15px;
           cursor: pointer;
         }
+
+        .head-title {
+          display: inline-block;
+          height: 26px;
+          margin: 24px 0;
+          font-size: 20px;
+          line-height: 26px;
+          color: #313238;
+        }
       }
 
       .setting-body {
@@ -38,6 +47,14 @@
           color: #63656e;
           justify-content: space-between;
 
+          .field-setting-label {
+            height: 22px;
+            font-size: 14px;
+            line-height: 22px;
+            color: #313238;
+            text-align: left;
+          }
+
           .limit {
             color: #c4c6cc;
           }
@@ -56,8 +73,9 @@
 
           .field-item {
             width: 150px;
-            height: 42px;
-            line-height: 42px;
+            height: 16px;
+            margin-top: 16px;
+            line-height: 16px;
 
             > label {
               overflow: hidden;
@@ -125,9 +143,11 @@
 
       .setting-footer {
         display: flex;
-        height: 56px;
+        height: 50px;
         padding: 0 24px;
-        background-color: #fafbfd;
+        background: #fafbfd;
+        border: 1px solid #dcdee5;
+        border-radius: 0px 0px 2px 2px;
         justify-content: flex-end;
         align-items: center;
       }

package/lib/table/plugins/settings.variable.css

@@ -19,7 +19,7 @@
   --line-height-large: 18px;
   --component-size-small: 26px;
   --component-size-base: 32px;
-  --component-size-large: 38px;
+  --component-size-large: 40px;
   --border-width-base: 1px;
   --border-style-base: solid;
   --border-radius-base: 2px;
@@ -34,7 +34,7 @@
   --input-horizontal-padding: 10px;
   --input-block-color: #f5f7fa;
   --input-block-hover-color: #eaebf0;
-  --input-icon-size: var(--font-size-large);
+  --input-icon-size: var(--font-size-medium);
   --input-maxlength-color: #979ba5;
   --button-primary-hover-color: #5594fa;
   --button-danger-hover-color: #ff5656;
@@ -125,6 +125,14 @@
   right: 15px;
   cursor: pointer;
 }
+.bk-table-settings[data-bk-table-settings-theme='true'] .setting-content .setting-head .head-title {
+  display: inline-block;
+  height: 26px;
+  margin: 24px 0;
+  font-size: 20px;
+  line-height: 26px;
+  color: #313238;
+}
 .bk-table-settings[data-bk-table-settings-theme='true'] .setting-content .setting-body {
   padding: 0 24px;
 }
@@ -135,6 +143,13 @@
   color: #63656e;
   justify-content: space-between;
 }
+.bk-table-settings[data-bk-table-settings-theme='true'] .setting-content .setting-body .setting-body-title .field-setting-label {
+  height: 22px;
+  font-size: 14px;
+  line-height: 22px;
+  color: #313238;
+  text-align: left;
+}
 .bk-table-settings[data-bk-table-settings-theme='true'] .setting-content .setting-body .setting-body-title .limit {
   color: #c4c6cc;
 }
@@ -150,8 +165,9 @@
 }
 .bk-table-settings[data-bk-table-settings-theme='true'] .setting-content .setting-body .setting-body-fields .field-item {
   width: 150px;
-  height: 42px;
-  line-height: 42px;
+  height: 16px;
+  margin-top: 16px;
+  line-height: 16px;
 }
 .bk-table-settings[data-bk-table-settings-theme='true'] .setting-content .setting-body .setting-body-fields .field-item > label {
   overflow: hidden;
@@ -204,9 +220,11 @@
 }
 .bk-table-settings[data-bk-table-settings-theme='true'] .setting-content .setting-footer {
   display: flex;
-  height: 56px;
+  height: 50px;
   padding: 0 24px;
-  background-color: #fafbfd;
+  background: #fafbfd;
+  border: 1px solid #dcdee5;
+  border-radius: 0px 0px 2px 2px;
   justify-content: flex-end;
   align-items: center;
 }

package/lib/table/props.d.ts

@@ -129,9 +129,7 @@ export declare const tableProps: {
     /**
      * bk-table-setting-content
      */
-    settings: import("vue-types").VueTypeDef<boolean | Settings> & {
-        default: boolean | (() => Settings);
-    };
+    settings: import("vue-types").VueTypeValidableDef<any>;
     /**
      * 行的 class 的回调方法，也可以使用一个固定的 Object 为所有行设置一样的 Style
      */
@@ -202,6 +200,7 @@ export declare type Settings = {
 export declare type Field = {
     label: string;
     field?: string;
+    disabled?: boolean;
 };
 export declare type Column = {
     label: Function | string;
@@ -241,3 +240,8 @@ export declare type IColumnActive = {
 export declare type IReactiveProp = {
     activeColumns: IColumnActive[];
 };
+export declare type Colgroups = Column & {
+    calcWidth: number;
+    resizeWidth: number;
+    listeners: Map<string, Function>;
+};