sone-ui-component-3.2.4 2.1.36 → 2.1.37

package/package.json

@@ -1,6 +1,6 @@
   {
   "name": "sone-ui-component-3.2.4",
-  "version": "2.1.36",
+  "version": "2.1.37",
   "private": false,
   "main": "lib/sone-ui.common.js",
   "files": [

package/packages/normalTable/src/mainNew.vue

@@ -56,7 +56,8 @@
 			@row-click="rowClick"
 			@header-dragend="onHeaderDragend"
 			@select="selectChange"
-			@select-all="selectAll">
+			@select-all="selectAll"
+			@sort-change="sortChange">
 			<el-table-column
 				v-if="operation"
 				fixed
@@ -171,6 +172,7 @@
 					:align="column.hasOwnProperty('align') ? column.align : 'left'"
 					:show-overflow-tooltip="column.hasOwnProperty('showOverflowTooltip') ? column.showOverflowTooltip : false"
 					filter-placement="bottom-end"
+					:sortable="column.sortable"
 					:header-align="column.hasOwnProperty('headerAlign') ? column.headerAlign : 'left'"
 					:column-key="column.hasOwnProperty('elementId')? column.elementId:column.prop"
 					:resizable="column.hasOwnProperty('resizable') ? column.resizable : true">
@@ -279,6 +281,11 @@
 				type: Boolean,
 				default: true,
 			},
+			sortable: {
+				type: [Boolean, String],
+				default: false,
+
+			},
 			option: {
 				type: Object,
 				default: () => {
@@ -491,6 +498,9 @@
 				this.$refs[this.tabelRef] && this.$refs[this.tabelRef].setCurrentRow(row);
 				this.$emit('setCurrentRow', row);
 			},
+			sortChange(val){
+				if(val.column.sortable === 'custom') this.$emit('sortChange', val);
+			},
 		},
 	}
 </script>

package/src/index.js

@@ -57,7 +57,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.1.36',
+  version: '2.1.37',
   locale: locale.use,
   i18n: locale.i18n,
   install,

package/src/styles/table.scss

@@ -25,6 +25,9 @@
   }
   .el-table th{
     position:relative;
+    .slot_header_class{
+      display: inline-block;
+    }
   }
   .el-table .sort-caret.descending{
     bottom: -1px!important;