chore: solve merge confilct

package.json

@@ -1,6 +1,6 @@
 {
   "name": "naive-ui",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "",
   "main": "index.js",
   "scripts": {

packages/common/AdvanceTable/searchInput/index.vue

@@ -42,7 +42,7 @@ export default {
   methods: {
     clearSearch () {
       this.value = ''
-      this.selectedValue = this.options.columns[0].value
+      this.selectedValue = this.options.columns ? this.options.columns[0].value : ''
       this.handleInputChange()
     },
     setSearch ({ key, value }) {

packages/common/AdvanceTable/src/main.vue

@@ -29,7 +29,7 @@
     </div>
     <n-table
       ref="header"
-      style="padding:0;border-bottom-left-radius:0;border-bottom-right-radius:0;"
+      style="padding:0;border-bottom-left-radius:0;border-bottom-right-radius:0;background-color: #2b3147;"
       :style="colGroup"
     >
       <colgroup>
@@ -71,7 +71,7 @@
             {{ column.filterDropdown && column.filterDropdown() }}
             <!-- 否则默认渲染 -->
             <PopFilter
-              v-if="column.filterItems || column.asynsFilterItems"
+              v-if="column.onFilter && (column.filterItems || column.asynsFilterItems)"
               v-model="selectedFilter[column.key]"
               :column="column"
               :items="column.filterItems || column.asynsFilterItems"
@@ -453,6 +453,8 @@ export default {
     this.wrapperWidth = this.$refs.tableWrapper.offsetWidth
     this.tbodyWidth = this.relTable.offsetWidth
     this.scrollBarWidth = this.wrapperWidth - this.tbodyWidth
+    this.headerRealEl = this.$refs.header.$el.querySelector('thead')
+
     // console.log(this.wrapperWidth, this.tbodyWidth)
 
     this.init()
@@ -568,7 +570,9 @@ export default {
       this.currentSortColumn = null
     },
     onBodyScrolll (event) {
-      this.$refs.header.$el.scrollLeft = event.target.scrollLeft
+      this.headerRealEl.style.transform = `translate3d(-${event.target.scrollLeft}px,0,0)`
+
+      // this.$refs.header.$el.scrollLeft = event.target.scrollLeft
 
       event.stopPropagation()
     },
@@ -651,23 +655,8 @@ export default {
       if (!this.currentSortColumn) {
         return null
       }
-      let currentSortColumn = null
+      const isCustom = this.currentSortColumn.sortable === 'custom'
-      let keys = Object.keys(this.currentSortColumn)
+      return isCustom ? this.currentSortColumn : null
-      currentSortColumn = {}
-
-      keys.forEach((key) => {
-        let val = this.currentSortColumn[key].value
-        let sortable = this.currentSortColumn[key].sortable
-        if (sortable === 'custom') {
-          currentSortColumn[key] = {
-            value: val
-          }
-        }
-      })
-      if (Object.keys(currentSortColumn).length === 0) {
-        currentSortColumn = null
-      }
-      return currentSortColumn
     },
     useRemoteChange () {
       clearTimeout(this.remoteTimter)
@@ -766,6 +755,7 @@ export default {
       this.$emit('on-filter-change', this.currentFilterColumn)
     },
     onSortTypeChange ({ i, sortable, key, type, column }) {
+      console.log('TCL: onSortTypeChange -> { i, sortable, key, type, column }', { i, sortable, key, type, column })
       this.currentSortColumn = {
         sortable,
         key,

packages/common/InputKeyValuePairs/src/main.vue

@@ -117,9 +117,11 @@ export default {
   },
   methods: {
     add () {
+      this.$emit('on-add')
       this.value.push({})
     },
     remove (index) {
+      this.$emit('on-remove', index)
       if (index === 0 && this.value.length <= 1) {
         Object.keys(this.value[0]).forEach((key) => {
           let type = typeof (this.value[0][key])

styles/Confirm.scss

@@ -2,7 +2,8 @@
 @import './theme/default.scss';
 
 @include b(confirm) {
-  width: 446px;
+  width: 80vw;
+  max-width: 446px;
   margin: auto;
   border-radius: 9px;
   padding: 28px;