sone-ui-component-3.2.4 2.0.273 → 2.0.275

package/package.json

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

package/packages/table/src/main.vue

@@ -365,7 +365,7 @@
 			</el-table-column>
 			<!-- 序号+复选 -->
 			<el-table-column
-				:width="option.indexCheckWidth"
+				:width="option.indexCheckWidth||70"
 				fixed
 				:label="option.indexLabel ? option.indexLabel : '序号'"
 				type="index"
@@ -467,7 +467,6 @@
 					:align="column.hasOwnProperty('align') ? column.align : 'left'"
 					filter-placement="bottom-end"
 					:header-align="column.hasOwnProperty('headerAlign') ? column.headerAlign : 'left'"
-					:show-overflow-tooltip="column.hasOwnProperty('showOverflowTooltip') ? column.showOverflowTooltip : false"
 					v-else-if="column.hasOwnProperty('istrue')?column.istrue:true"
 					:column-key="column.hasOwnProperty('elementId')? column.elementId:column.prop"
 					:resizable="column.hasOwnProperty('resizable') ? column.resizable : true"
@@ -486,7 +485,6 @@
 								:align="childColumn.hasOwnProperty('align') ? childColumn.align : 'left'"
 								filter-placement="bottom-end"
 								:header-align="childColumn.hasOwnProperty('headerAlign') ? childColumn.headerAlign : 'left'"
-								:show-overflow-tooltip="childColumn.hasOwnProperty('showOverflowTooltip') ? childColumn.showOverflowTooltip : false"
 								v-if="childColumn.hasOwnProperty('istrue')?childColumn.istrue:true"
 								:column-key="childColumn.prop"
 								:resizable="childColumn.hasOwnProperty('resizable') ? childColumn.resizable : true"
@@ -545,7 +543,11 @@
 										:row="scope.row"
 										v-if="childColumn.slotCell"
 									></slot>
-									<template v-else>{{ scope.row[childColumn.prop] }}</template>
+									<template v-else>
+										<el-tooltip :content="scope.row[childColumn.prop]" placement="top" effect="light" popper-class="over_popper">
+												<span class="over_title">{{ scope.row[childColumn.prop] }}</span>
+										</el-tooltip>
+									</template>
 								</template>
 							</el-table-column>
 						</template>
@@ -608,7 +610,11 @@
 							:row="scope.row"
 							v-if="column.slotCell"
 						></slot>
-						<template v-else>{{ scope.row[column.prop] }}</template>
+						<template v-else>
+							<el-tooltip :content="scope.row[column.prop]" placement="top" effect="light" popper-class="over_popper">
+												<span class="over_title">{{ scope.row[column.prop] }}</span>
+										</el-tooltip>
+										</template>
 					</template>
 				</el-table-column>
 			</template>
@@ -693,7 +699,7 @@ import IconButton from "sone-ui-component/packages/IconButton/index.vue";
 				default: () => {
 					return {
 						index: true,
-						indexWidth: 50,
+						indexWidth: 70,
 						height: 'auto',
 						maxHeight: 'auto',
 

package/packages/watermark/src/main.js

@@ -2,8 +2,8 @@
  * @Description: 
  * @Author: songlin
  * @Date: 2021-09-14 14:33:47
- * @LastEditTime: 2023-03-30 09:37:43
- * @LastEditors: renhai🤣🤣
+ * @LastEditTime: 2024-06-04 18:01:41
+ * @LastEditors: lw
  */
 import Vue from 'vue';
 
@@ -23,7 +23,7 @@ function createSVG(text = "", singal) {
     max-width: 160px;
     padding: 6px;
     border: 3px solid #FF6B61;
-    opacity: .2;
+    opacity: 0.5;
     border-radius: 10px;
     color: #FF6B61;
     font-size: ${sFontsize};

package/src/index.js

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

package/src/styles/table.scss

@@ -314,3 +314,15 @@
     height:auto;
   }
 }
+
+
+// 调整表格超出样式
+.over_title{
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.over_popper{
+  max-width:150px;
+}

package/src/styles/tree.scss

@@ -61,7 +61,7 @@
         background: #ffffff;
         position: absolute;
         right: 10px;top:20px;
-        z-index: 2001;
+        z-index: 120;
         div{
             min-height: 30px;
             line-height:30px;
@@ -182,10 +182,10 @@
     height: 26px;
     position: absolute;
     left: 0;
-    z-index: 1999;
+    z-index: 100;
 }
 .sone-tree-wrap .el-tree-node__content > .el-tree-node__expand-icon {
-    z-index: 2000;
+    z-index: 101;
 }
 
 .sone-components-tree-more-btn-color{