Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/components/TableDetail/src/TableDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <!-- 详情 -->
     <div class="expandTable" :style="{width:width}" style="padding:10px">          <!-- 列表头部 -->
-      <Table  style="width:100%;border:1px solid red"
+      <Table  style="width:100%;"
         :columns="detailAllSchemasRef.tableColumns"
         :data="tableObjectRef.tableList"
         :loading="tableObjectRef.loading"

src/components/XButton/src/ButtonBase.vue

@@ -11,7 +11,7 @@
       @click="buttonBaseClick(item.name, item, $event)"
     >
       <Icon v-if="item.icon" :icon="item.icon" class="mr-1px" />
-      {{ item.label }}
+      <span :style="{width:item.width+'px'||'auto'}" :class="[item.width?'ellipsis':'']">{{ item.label }}</span>
     </el-button>
     <!-- 设置按钮 -->
     <el-popover

src/layout/components/Menu/src/components/useRenderMenuTitle.tsx

@@ -9,7 +9,7 @@ export const useRenderMenuTitle = () => {
     return icon ? (
       <>
         <Icon icon={meta.icon}></Icon>
-        <span class="v-menu__title">{t(`ts.${title}` as string).replace('ts.','')}</span>
+        <span class="v-menu__title ellipsis">{t(`ts.${title}` as string).replace('ts.','')}</span>
       </>
     ) : (
       <span class="v-menu__title">{t(`ts.${title}` as string).replace('ts.','')}</span>

src/styles/index.scss

@@ -33,3 +33,11 @@
     border-left-color: var(--el-color-primary);
   }
 }
+
+.ellipsis{
+  overflow: hidden;
+  text-overflow: ellipsis;
+  overflow: hidden; 
+  white-space: nowrap;
+  word-break: break-all;
+}

src/utils/disposition/defaultButtons.ts

@@ -552,6 +552,7 @@ export function mainListPlanUploadQualityReportBtn(option:any) {
     name: 'mainPlanUploadQualityReport',
     hide: false,
     type: 'primary',
+    width:86,
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
@@ -1013,6 +1014,7 @@ function __defaultBtnOption(option:any,specific:any){
       hide:option && option.hide ? option.hide : specific.hide,
       link:option && option.link ? option.link : specific.link,
       hasPermi:option && option.hasPermi ? option.hasPermi : specific.hasPermi,
+      width:option && option.width ? option.width : specific.width,
       ...option
   }
 }