sone-ui-component-3.2.4 2.1.58 → 2.1.59

package/package.json

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

package/packages/table/index.js

@@ -2,11 +2,11 @@
  * @Description: 
  * @Author: songlin
  * @Date: 2021-08-26 16:39:21
- * @LastEditTime: 2021-08-27 16:11:37
- * @LastEditors: songlin
+ * @LastEditTime: 2025-07-10 11:33:01
+ * @LastEditors: Please set LastEditors
  */
-// import Table from './src/main';
-import Table from './src/mainNew';
+// import Table from './src/main'; //dev分支使用（列显隐里 不带保存按钮）
+import Table from './src/mainNew'; //0903分支及newgl分支使用（列显隐里 带保存按钮）
 
 Table.install = function(Vue) {
   Vue.component(Table.name, Table);

package/packages/table/src/mainNew.vue

@@ -306,6 +306,7 @@
 									:key="i"
 								>
 									<el-button
+										v-if="buttonDisplay=='separate'"
 										:icon="item.icon"
 										:style="{color:item.color}"
 										:title="item.label"
@@ -314,6 +315,16 @@
 									>
 										{{item.label}}
 									</el-button>
+									<el-button
+										v-else
+										:icon="['icon','iconName'].includes(buttonDisplay)?item.icon:''"
+										:style="{color:item.color}"
+										:title="item.label"
+										type="text"
+										@click.native.stop="handButton(item.function, scope, item.id)"
+									>
+										{{['name','iconName'].includes(buttonDisplay)?item.label:''}}
+									</el-button>
 								</el-dropdown-item>
 							</el-dropdown-menu>
 						</el-dropdown>
@@ -786,10 +797,15 @@ import IconButton from "sone-ui-component/packages/IconButton/index.vue";
 			indexMethod: Function,
 			load: Function,
 				// 默认显示按钮图标加提示，
-		tooltipDisabled: {
-      type: Boolean,
-      default: false,
-    },
+			tooltipDisabled: {
+				type: Boolean,
+				default: false,
+			},
+			buttonDisplay:{
+				type:String,
+				default:"separate",
+				remark:"按钮显示方式：按照按钮设置-separate; 图标-icon; 名称-name; 图标+名称-iconName"
+			}
 		},
 		data() {
 			return {

package/src/index.js

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