feat: bump to 2.4.3 (#205)

TencentBlueKing · Jan 5, 2022 · 9f837af · 9f837af
1 parent 5111115
commit 9f837af
Show file tree

Hide file tree

Showing 87 changed files with 1,242 additions and 1,223 deletions.
diff --git a/example/components/changelog/readme.md b/example/components/changelog/readme.md
@@ -4,6 +4,15 @@
 
 <div class="changelog-wrapper">
 
+### 2.4.3 {page=#/changelog}
+###### 2022.01.05
+
+* **[fix]**:
+    - [Table 表格](#/table) 添加 tippy-options 属性，对翻页下拉的自定义配置 [#188](https://github.com/TencentBlueKing/bkui-vue2/issues/188)
+    - 去掉代码中无用的日志
+
+---
+
 ### 2.4.2 {page=#/changelog}
 ###### 2021.12.31
 

diff --git a/example/components/pagination/readme.md b/example/components/pagination/readme.md
@@ -264,6 +264,7 @@
 | size | 页码尺寸大小 | String | `default` `small` | default |
 | small | 小型分页 | Boolean | `false` `true` | false |
 | show-total-count | 总计 | Boolean | `false` `true` | false |
+| popover-options | 透传至翻页下拉列表所在的popover组件的tippyOptions选项 | Object | —— | —— |
 | ext-cls | 配置自定义样式类名，传入的类会被加在组件最外层的 DOM `.bk-page` 上 | String | —— | —— |
 
 ### 事件 {page=#/pagination}

diff --git a/example/components/table/readme.md b/example/components/table/readme.md
@@ -1257,6 +1257,7 @@ export default {
 | span-method | 合并行或列的计算方法 | `Function({ row, column, rowIndex, columnIndex })` | —— | —— |
 | select-on-indeterminate | 在多选表格中，当仅有部分行被选中时，点击表头的多选框时的行为。若为 true，则选中所有行；若为 false，则取消选择所有行 | Boolean | —— | true |
 | pagination | Table 的分页。`current` 属性表示当前页码,`count` 属性表示数据总量 | Object | —— | —— |
+| popover-options | 透传至翻页下拉列表所在的popover组件的tippyOptions选项 | Object | —— | —— |
 | auto-scroll-to-top | Table 分页变化时，表格是否自动滚动到顶部 | Boolean | —— | false |
 | scroll-loading | 表格底部loading加载效果，可以配合表格scroll-end事件使用，isLoading属性控制底部加载显隐。其余属性可参考spin组件 | Object | —— | `{ isLoading: false, size: 'mini', theme: 'info', icon: 'circle-2-1', placement: 'right' }` |
 | ext-cls | 配置自定义样式类名，传入的类会被加在组件最外层的 DOM `.bk-table` 上 | String | —— | —— |

diff --git a/gulpfile.component.js b/gulpfile.component.js
@@ -26,7 +26,7 @@
 
 /**
  * @file gulp 编译单个组件，这里不会编译样式
- *       npm run build:component
+ *    npm run build:component
  *
  * Copyright © 2012-2019 Tencent BlueKing. All Rights Reserved. 蓝鲸智云 版权所有
  */
@@ -75,18 +75,18 @@ const componentFileList = []
 })(join(__dirname, 'src/components'))
 
 // componentFileList.push(
-//     {
-//         name: 'locale',
-//         path: './src/locale/index.js'
-//     },
-//     {
-//         name: 'localeMixin',
-//         path: './src/mixins/locale.js'
-//     },
-//     {
-//         name: 'lang',
-//         path: './src/locale/lang/index.js'
-//     }
+//   {
+//     name: 'locale',
+//     path: './src/locale/index.js'
+//   },
+//   {
+//     name: 'localeMixin',
+//     path: './src/mixins/locale.js'
+//   },
+//   {
+//     name: 'lang',
+//     path: './src/locale/lang/index.js'
+//   }
 // )
 
 const utilFileList = [
@@ -338,72 +338,72 @@ async function sourceComponent () {
 
 // eslint-disable-next-line no-unused-vars
 /* async function minComponent () {
-    const config = {
-        external,
-        plugins: plugins.concat(
-            terser()
-        ),
-        onwarn (warning) {
-            if (warning.code === 'UNUSED_EXTERNAL_IMPORT') {
-                return false
-            }
-        }
+  const config = {
+    external,
+    plugins: plugins.concat(
+      terser()
+    ),
+    onwarn (warning) {
+      if (warning.code === 'UNUSED_EXTERNAL_IMPORT') {
+        return false
+      }
+    }
+  }
+
+  const componentPromises = []
+  const componentEntryNames = []
+  componentFileList.forEach(entry => {
+    if (entry.name !== 'js') {
+      config.input = entry.path
+      componentPromises.push(rollup(config))
+      componentEntryNames.push(entry.name)
     }
+  })
 
-    const componentPromises = []
-    const componentEntryNames = []
-    componentFileList.forEach(entry => {
-        if (entry.name !== 'js') {
-            config.input = entry.path
-            componentPromises.push(rollup(config))
-            componentEntryNames.push(entry.name)
+  try {
+    const componentRet = await Promise.all(componentPromises)
+    componentRet.forEach((b, index) => {
+      b.write({
+        file: `./lib/${componentEntryNames[index]}.js`,
+        format: 'umd',
+        name: 'library',
+        sourcemap: false,
+        exports: 'named',
+        globals: {
+          vue: 'Vue'
         }
+      })
     })
+  } catch (e) {
+    console.log(chalk(`compile-component-source error in compile component: ${e}`))
+  }
 
-    try {
-        const componentRet = await Promise.all(componentPromises)
-        componentRet.forEach((b, index) => {
-            b.write({
-                file: `./lib/${componentEntryNames[index]}.js`,
-                format: 'umd',
-                name: 'library',
-                sourcemap: false,
-                exports: 'named',
-                globals: {
-                    vue: 'Vue'
-                }
-            })
-        })
-    } catch (e) {
-        console.log(chalk(`compile-component-source error in compile component: ${e}`))
+  const directivePromises = []
+  const directiveEntryNames = []
+  directiveFileList.forEach(entry => {
+    if (entry.name !== 'js') {
+      config.input = entry.path
+      directivePromises.push(rollup(config))
+      directiveEntryNames.push(entry.name)
     }
-
-    const directivePromises = []
-    const directiveEntryNames = []
-    directiveFileList.forEach(entry => {
-        if (entry.name !== 'js') {
-            config.input = entry.path
-            directivePromises.push(rollup(config))
-            directiveEntryNames.push(entry.name)
+  })
+  try {
+    const directiveRet = await Promise.all(directivePromises)
+    directiveRet.forEach((b, index) => {
+      b.write({
+        file: `./lib/directives/${directiveEntryNames[index]}.js`,
+        format: 'umd',
+        name: 'library',
+        sourcemap: false,
+        exports: 'named',
+        globals: {
+          vue: 'Vue'
         }
+      })
     })
-    try {
-        const directiveRet = await Promise.all(directivePromises)
-        directiveRet.forEach((b, index) => {
-            b.write({
-                file: `./lib/directives/${directiveEntryNames[index]}.js`,
-                format: 'umd',
-                name: 'library',
-                sourcemap: false,
-                exports: 'named',
-                globals: {
-                    vue: 'Vue'
-                }
-            })
-        })
-    } catch (e) {
-        console.log(chalk(`compile-component-source error in compile directive: ${e}`))
-    }
+  } catch (e) {
+    console.log(chalk(`compile-component-source error in compile directive: ${e}`))
+  }
 } */
 
 // 不打 component 的 min，按需引入时，由项目的打包处理

diff --git a/gulpfile.library.js b/gulpfile.library.js
@@ -26,9 +26,9 @@
 
 /**
  * @file gulp 编译 library
- *       npm run build:library
- *       npm run build:source
- *       npm run build:min
+ *    npm run build:library
+ *    npm run build:source
+ *    npm run build:min
  *
  * Copyright © 2012-2019 Tencent BlueKing. All Rights Reserved. 蓝鲸智云 版权所有
  */
@@ -123,20 +123,20 @@ if (idx === 'source') {
 }
 
 // gulp.task('dist', gulp.series(
-//     gulp.parallel(
+//   gulp.parallel(
+//     gulp.series(
+//       cleanDev,
+//       gulp.parallel(
 //         gulp.series(
-//             cleanDev,
-//             gulp.parallel(
-//                 gulp.series(
-//                     sprite,
-//                     compileCss
-//                 ),
-//                 compileJs,
-//                 copyHtml
-//             )
+//           sprite,
+//           compileCss
 //         ),
-//         cleanDist
+//         compileJs,
+//         copyHtml
+//       )
 //     ),
-//     reversion,
-//     replace
+//     cleanDist
+//   ),
+//   reversion,
+//   replace
 // ))
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bk-magic-vue",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "基于蓝鲸 Magicbox 和 Vue 的前端组件库",
   "main": "dist/bk-magic-vue.min.js",
   "files": [

diff --git a/src/components/date-picker/panel/date-range.vue b/src/components/date-picker/panel/date-range.vue
@@ -420,5 +420,5 @@ export default {
 }
 </script>
 <style>
-    @import '../../../ui/date-picker.css';
+  @import '../../../ui/date-picker.css';
 </style>
diff --git a/src/components/date-picker/panel/date.vue b/src/components/date-picker/panel/date.vue
@@ -244,5 +244,5 @@ export default {
 }
 </script>
 <style>
-    @import '../../../ui/date-picker.css';
+  @import '../../../ui/date-picker.css';
 </style>
diff --git a/src/components/date-picker/panel/time-range.vue b/src/components/date-picker/panel/time-range.vue
@@ -171,5 +171,5 @@ export default {
 }
 </script>
 <style>
-    @import '../../../ui/time-picker.css';
+  @import '../../../ui/time-picker.css';
 </style>
diff --git a/src/components/date-picker/panel/time.vue b/src/components/date-picker/panel/time.vue
@@ -156,5 +156,5 @@ export default {
 }
 </script>
 <style>
-    @import '../../../ui/time-picker.css';
+  @import '../../../ui/time-picker.css';
 </style>
diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue
@@ -37,18 +37,18 @@
           <svg class="picker-icon" v-if="type === 'time' || type === 'timerange'" x="0px" y="0px" viewBox="0 0 1024 1024">
             <g id="time">
               <path fill="#c4c6cc" d="M512,128c51.9,0,102.2,10.1,149.5,30.2c45.7,19.3,86.8,47,122.1,82.3s63,76.4,82.3,122.1
-                                c20,47.3,30.2,97.6,30.2,149.5S886,614.3,865.9,661.6c-19.3,45.7-47,86.8-82.3,122.1s-76.4,63-122.1,82.3
-                                c-47.3,20-97.6,30.2-149.5,30.2S409.8,886.1,362.5,866c-45.7-19.3-86.8-47-122.1-82.3s-63-76.4-82.3-122.1
-                                c-20-47.3-30.2-97.6-30.2-149.5s10.1-102.2,30.2-149.5c19.3-45.7,47-86.8,82.3-122.1s76.4-63,122.1-82.3
-                                C409.8,138.1,460.1,128,512,128 M512,64C264.6,64,64,264.6,64,512s200.6,448,448,448s448-200.6,448-448S759.4,64,512,64L512,64z"
+                c20,47.3,30.2,97.6,30.2,149.5S886,614.3,865.9,661.6c-19.3,45.7-47,86.8-82.3,122.1s-76.4,63-122.1,82.3
+                c-47.3,20-97.6,30.2-149.5,30.2S409.8,886.1,362.5,866c-45.7-19.3-86.8-47-122.1-82.3s-63-76.4-82.3-122.1
+                c-20-47.3-30.2-97.6-30.2-149.5s10.1-102.2,30.2-149.5c19.3-45.7,47-86.8,82.3-122.1s76.4-63,122.1-82.3
+                C409.8,138.1,460.1,128,512,128 M512,64C264.6,64,64,264.6,64,512s200.6,448,448,448s448-200.6,448-448S759.4,64,512,64L512,64z"
               />
               <polygon fill="#c4c6cc" points="512,512 512,256 448,256 448,512 448,576 512,576 768,576 768,512" />
             </g>
           </svg>
           <svg v-else class="picker-icon" x="0px" y="0px" viewBox="0 0 1024 1024">
             <g id="date">
               <path fill="#c4c6cc" d="M896,128h-96v64h64v112H160V192h64v-64h-96c-17.7,0-32,14.3-32,32v736c0,17.7,14.3,32,32,32h768
-                                c17.7,0,32-14.3,32-32V160C928,142.3,913.7,128,896,128z M160,864V368h704v496H160z" />
+                c17.7,0,32-14.3,32-32V160C928,142.3,913.7,128,896,128z M160,864V368h704v496H160z" />
               <rect x="416" y="128" fill="#c4c6cc" width="192" height="64" />
               <rect x="288" y="96" fill="#c4c6cc" width="64" height="128" />
               <rect x="672" y="96" fill="#c4c6cc" width="64" height="128" />
@@ -929,5 +929,5 @@ export default {
 }
 </script>
 <style>
-    @import '../../ui/date-picker.base.css';
+  @import '../../ui/date-picker.base.css';
 </style>
diff --git a/src/components/date-picker/time-mixins.js b/src/components/date-picker/time-mixins.js
@@ -70,12 +70,12 @@ export default {
   },
   methods: {
     /**
-         * firstUpperCase
-         *
-         * @param {string} str str
-         *
-         * @return {string} str
-         */
+     * firstUpperCase
+     *
+     * @param {string} str str
+     *
+     * @return {string} str
+     */
     firstUpperCase (str) {
       return str.toString()[0].toUpperCase() + str.toString().slice(1)
     }