sone-ui-component-3.2.4 2.1.18 → 2.1.20

package/package.json

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

package/packages/normalTable/src/main.vue

@@ -11,21 +11,19 @@
 		<div class="table-menu-right"	v-if="showMenuRight">
 			<slot name="menuRight"></slot>
 			<el-dropdown :hide-on-click="false"	v-if="showColumnHandleBtn" @visible-change="onColumnVisibleMenu">
-				<icon-button
+				<IconButton
 					:iconfont="false"
 				  :tooltipDisabled="tooltipDisabled"
 					class="sort-btn"
 					content="列展示"
-					icon="el-icon-s-operation"
-				></icon-button>
+					icon="el-icon-s-operation" />
 				<ColumnTransfer
 					ref="column-transfer"
 					:columns.sync="internalColumns"
 					@dropdownList="dropdownList"
 					@handleCheckedColumnChange="handleCheckedColumnChange"
 					@selectFixed="selectFixed"
-					@resetColumnTransfer="$emit('resetColumnTransfer')"
-				></ColumnTransfer>
+					@resetColumnTransfer="$emit('resetColumnTransfer')" />
 			</el-dropdown>
 			<slot name="transferRight"></slot>
 		</div>
@@ -112,16 +110,16 @@
 				</template>
 			</el-table-column>
 			<el-table-column
-				:width="option.indexWidth||50"
+				v-if="option.index"
 				fixed
-				:label="option.indexLabel ? option.indexLabel : '序号'"
 				type="index"
+				:width="option.indexWidth||50"
+				:label="option.indexLabel ? option.indexLabel : '序号'"
 				:index="indexMethod"
-				:resizable="option.hasOwnProperty('indexResizable') ? option.indexResizable : true"
-				v-if="option.index"
 			></el-table-column>
 			<el-table-column
-				v-if="option.hasOwnProperty('selection') ? option.selection : false"
+				v-if="option.selection"
+				fixed
 				type="selection"
 				:width="option.selectionWidth || 45">
 			</el-table-column>
@@ -212,9 +210,10 @@
 <script>
 	import { deepClone } from 'sone-ui-component/src/utils/util'
 	import ColumnTransfer from './columnTransfer.vue'
+	import IconButton from "sone-ui-component/packages/IconButton/index.vue";
 	export default {
 		name: "SoneNormalTable",
-		components: { ColumnTransfer },
+		components: { ColumnTransfer, IconButton },
 		props: {
 			showMenuLeft: {
 				type: Boolean,
@@ -260,7 +259,7 @@
 						indexWidth: 70,
 						height: 'auto',
 						maxHeight: 'auto',
-
+						showSummary: false,
 					}
 				}
 			},
@@ -437,8 +436,8 @@
 				let _columns = deepClone(this.internalColumns);
 				const sums = [];
 				// 固定列会导致窜行 待改
-				if ( !!this.operation ) sums.push(this.option.sumText || '合计')
-				if ( this.option.indexCheck || this.option.index ) {
+				if (!!this.operation ) sums.push(this.option.sumText || '合计')
+				if (this.option.selection) {
 					!!this.operation ? sums.push('') : sums.push('合计')
 				} 
 				_columns.forEach((column, index) => {
@@ -476,14 +475,9 @@
 
 			// class
 			tableRowClassName({ row, rowIndex }) {
-				let rowClass = ''
 				if (this.option.rowClassName) {
-					rowClass = this.option.rowClassName({ row, rowIndex })
-				}
-				if(this.option.indexCheck === true && row.checked === true && !this.option['clickRowNoCheck']){
-					return `current-row ${rowClass}`;
-				}
-				return rowClass;
+					return this.option.rowClassName({ row, rowIndex })
+				}else return ''
 			},
 			handButton(functionName, scope, id) {
 				this.$emit(functionName, scope, id)

package/src/index.js

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

package/src/styles/table.scss

@@ -26,12 +26,6 @@
   .el-table th{
     position:relative;
   }
-  .el-table th > .cell{
-    // border-right: 1px solid #D9D9D9!important;
-  }
-  .el-table__header-wrapper tr th:nth-last-of-type(2) .cell{
-    // border-right: none !important;
-  }
   .el-table .sort-caret.descending{
     bottom: -1px!important;
   }
@@ -49,9 +43,9 @@
   }
   .el-table-column--selection{
     .cell{
-      display: flex;
-      justify-content: center;
-      align-items: center;
+      display: flex !important;
+      justify-content: center !important;
+      align-items: center !important;
     }
   }
 
@@ -76,7 +70,6 @@
   }
   .table-menu-left {
     width:50%;
-    // height: 48px;
     float: left;
   }
   .table-menu-right {
@@ -125,9 +118,7 @@
         position: absolute;
         left: -7px;
         font-size: 14px;
-        /*color: #CCCCCC;*/
         &:hover {
-          /*font-weight: bold;*/
           opacity: 0.8;
         }
         &.el-icon-caret-top {
@@ -322,14 +313,12 @@
   }
 }
 
-
 // 调整表格超出样式
 .over_title{
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
-
 .over_popper{
   max-width:150px;
 }