Merge branch 'master' into li_s1

src/components/DesignForm/app/index.vue

@@ -2711,7 +2711,7 @@ const getNonValue = () => {
         
 
         <SeeContChart
-          :echats-views="[echatsViewsdf]"
+          :echats-views="echatsViews"
           :table-key="formBasicConfig.name"
           :types="1"
         />

src/components/DesignForm/public/form/childTable.vue

@@ -103,7 +103,7 @@ onMounted(()=>{
     setTimeout(()=>{
       if(preFillFlag.value==1&&props.data.control.preFill&&props.data.control.preFill.ids){
         let i = 0;
-        props.data.control.preFill.ids.forEach((element:any) => {
+        props.data.control.preFill?.ids.forEach((element:any) => {
             addColumn()
             //console.log(element)
             
@@ -380,6 +380,25 @@ function optionsValue3Get1(data: any, fieldName: string) {
 	console.log(props.data.name) */
   emits("optionsValue3GetTable", data, fieldName);
 }
+/**
+@ 作者: 秦东
+@ 时间: 2026-02-11 15:52:08
+@ 功能: 计算宽度
+*/
+const jisuanTableWidth = (data: any) => {
+  let width = 0;
+  console.log("jisuanTableWidth--->计算宽度",data.item.label.length,"---------->",data)
+  // data.item.label.forEach((item: any) => {
+  //   // width += item.item.span?item.item.span:120;
+  // });
+  if (data.item.label && data.item.label.length > 0) {
+    width = data.item.label.length * 20;
+  }
+  if (width < 100) {
+    width = 120;
+  }
+  return width;
+}
 </script>
 
 
@@ -394,9 +413,10 @@ function optionsValue3Get1(data: any, fieldName: string) {
         :key="index"
         :prop="item.name"
         :label="item.item.label"
-        :width="item.item.span"
+        :width="jisuanTableWidth(item)"
       >
         <template #default="scope">
+          
           <span v-if="item.type === 'index'">{{ scope.$index + 1 }}</span>
           <div v-if="type === 4 || editDisabled">
             <LokOrgCentent

src/components/DesignForm/public/form/formGroup.vue

@@ -1156,5 +1156,9 @@ const judgaButClass = (btnClass:string):string => {
     transform: translateY(-2px);
     box-shadow: 0 5px 15px rgba(0, 32, 194, 0.15);
 }
-        
+.group{
+  :deep .el-input-group__append{
+    padding: 0 10px;
+  }
+}    
 </style>

src/styles/index.scss

@@ -118,3 +118,6 @@
 .glm-btn-box {
   padding: 20px 20px 0 20px;
 }
+.el-input-group__append{
+  padding: 0 10px;
+}