vue2-client 1.12.1 → 1.12.3-9.alpha

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -1,452 +1,78 @@
 <template>
   <a-row id="has_row" type="flex" :gutter="gutter" :style="isWidget ? {margin: '0px'} : {'margin-bottom': '.5rem'}">
-    <!--  预览页展示  -->
-    <template v-if="display">
-      <template v-if="!inputColumns">
-        <a-col
-          name="trGroup"
-          v-for="(cell, cellIndex) in columns"
-          v-if="Array.isArray(cell) || !cell.dontShowRow"
-          :key="cellIndex"
-          :style="isWidget ? {padding: '0px 2px'} : (Array.isArray(cell) ? {} : determineCellStyle(cell))"
-          :span="Array.isArray(cell) ? cell[0][0].colSpan * 2 : (cell.colSpan ? cell.colSpan * 2 : undefined)">
-          <div id="report_widget" v-if="isWidget">
-            <!-- 插槽渲染 -->
-            <template v-if="Array.isArray(cell)">
-              <!-- 处理 cell 是数组的情况 -->
-              <div v-for="(item, index) in cell" :key="index">
-                <x-report-tr-group
-                  @updateImg="updateImg"
-                  :show-img-in-cell="showImgInCell"
-                  :img-prefix="imgPrefix"
-                  :server-name="serverName"
-                  :env="env"
-                  :use-oss-for-img="useOssForImg"
-                  :key="index"
-                  :columns="recalculateItem(item)"
-                  :no-top-border="noTopBorder"
-                  :config-data="configData"
-                  :config="config"
-                  :display="true">
-                </x-report-tr-group>
-              </div>
-            </template>
-            <template v-else-if="cell.type === 'slot'">
-              <template
-                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list'].includes(cell.slotType)">
-                <component
-                  :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
-                  :key="cellIndex"
-                  :ref="`dynamicComponent_${ cell.slotRef || cellIndex}`"
-                  :serviceName="cell.serviceName"
-                  :serverName="cell.serviceName"
-                  v-on="getEventHandlers(cell)"
-                  @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
-                  :queryParamsName="cell.slotConfig"
-                  :configName="cell.slotConfig"
-                  :countVisible="false"
-                  :env="env"
-                />
-              </template>
-            </template>
-          </div>
-          <a-card v-else class="flexItem" :bordered="false" :body-style="flexItemBodyState">
-            <!-- 插槽渲染 -->
-            <template v-if="Array.isArray(cell)">
-              <!-- 处理 cell 是数组的情况 -->
-              <div v-for="(item, index) in cell" :key="index">
-                <x-report-tr-group
-                  @updateImg="updateImg"
-                  :show-img-in-cell="showImgInCell"
-                  :img-prefix="imgPrefix"
-                  :server-name="serverName"
-                  :env="env"
-                  :use-oss-for-img="useOssForImg"
-                  :key="index"
-                  :columns="recalculateItem(item)"
-                  :no-top-border="noTopBorder"
-                  :config-data="configData"
-                  :config="config"
-                  :display="true">
-                </x-report-tr-group>
-              </div>
-            </template>
-            <template v-else-if="cell.type === 'slot'">
-              <template
-                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list'].includes(cell.slotType)">
-                <component
-                  :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
-                  :key="cellIndex"
-                  :ref="`dynamicComponent_${ cell.slotRef || cellIndex}`"
-                  :serviceName="cell.serviceName"
-                  :serverName="cell.serviceName"
-                  v-on="getEventHandlers(cell)"
-                  @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
-                  :queryParamsName="cell.slotConfig"
-                  :configName="cell.slotConfig"
-                  :countVisible="false"
-                  :env="env"
-                />
-              </template>
-            </template>
-            <!-- button 按钮渲染 -->
-            <template v-else-if="cell.type === 'button'">
-              <a-button v-on="getEventHandlers(cell)">
-                {{ cell.buttonName }}
-              </a-button>
-            </template>
-            <template v-else-if="cell.type === 'column'">
-              <template v-if="cell.customFunction">
-                {{ deserializeFunctionAndRun(cell.customFunction, configData[cell.dataIndex], config) }}
-              </template>
-              <template v-else>
-                {{ cell.text }}
-              </template>
-            </template>
-            <!--       占位             -->
-            <template v-else-if="cell.type === 'placeHolderColumn'">
-            </template>
-            <template v-else-if="cell.type === 'value'">
-              <template v-if="cell.customFunction === undefined">
-                {{ cell.value }}
-              </template>
-              <template v-else>
-                {{ deserializeFunctionAndRun(cell.customFunction, cell.value, config) }}
-              </template>
-            </template>
-            <template v-else-if="cell.type === 'input'">
-              <template v-if="cell.customFunction === undefined">
-                {{ getDeepObject(configData, cell.dataIndex) }}
-              </template>
-              <template v-else>
-                {{ deserializeFunctionAndRun(cell.customFunction, configData[cell.dataIndex], config) }}
-              </template>
-            </template>
-            <template v-else-if="cell.type === 'inputs'">
-              <template v-if="cell.customFunction === undefined">
-                {{ showSubRowValue(cell) }}
-              </template>
-              <template v-else>
-                {{ deserializeFunctionAndRun(cell.customFunction, showSubRowValue(cell), config) }}
-              </template>
-            </template>
-            <template v-else-if="cell.type === 'list'">
-              <template v-if="listIndex === 0">
-                <span style="font-weight: bold">{{ cell.listHead }}</span>
-              </template>
-              <template v-else-if="cell.listType === 'input'">
-                {{ getDeepObject(configData, cell.dataIndex)[listIndex] }}
-              </template>
-              <template v-else-if="cell.listType === 'value'">
-                {{ cell.content[listIndex] }}
-              </template>
-              <template v-else-if="cell.listType === 'variable'">
-                {{ configData[cell.dataIndex][listIndex - 1][cell.listDataIndex] }}
-              </template>
-            </template>
-            <template v-else-if="cell.type === 'images'">
-              <template
-                v-if="getDeepObject(configData.images, cell.dataIndex) === undefined || getDeepObject(configData.images, cell.dataIndex).length === 0">
-                <template
-                  v-if="getDeepObject(configData, cell.dataIndex) === undefined || getDeepObject(configData, cell.dataIndex).length === 0">
-                  <span>无</span>
-                </template>
-                <template v-else>
-                  <template v-if="typeof getDeepObject(configData, cell.dataIndex) === 'object'">
-                    <div style="display: flex; align-items: end; justify-content: space-evenly; flex-wrap: wrap">
-                      <template v-for="(img,imgIndex) in getDeepObject(configData, cell.dataIndex)">
-                        <template v-if="showImgInCell">
-                          <div :key="imgIndex">
-                            <img :src="img.url" alt="图片"/>
-                            <p>{{ img.name }}</p>
-                          </div>
-                        </template>
-                        <template v-else>
-                          <span :key="imgIndex" style="margin-right: 5%">{{ img.name }}</span>
-                        </template>
-                      </template>
-                    </div>
-                  </template>
-                  <template v-else>
-                    <img :src="getDeepObject(configData, cell.dataIndex)" alt="图片"/>
-                    <p style="margin-right: 5%">{{ formatImgStr(getDeepObject(configData, cell.dataIndex))[0].name }}</p>
-                  </template>
-                </template>
-              </template>
-              <span v-else v-for="(img,imgIndex) in getDeepObject(configData.images, cell.dataIndex)" :key="imgIndex" style="margin-right: 5%">{{ img.name }}</span>
-            </template>
-          </a-card>
-        </a-col>
-      </template>
-      <template v-else>
-        <a-col
-          v-for="(cell, cellIndex) in columns"
-          :key="cellIndex"
-          :class=" calcTDBorder(cell.noBoarder) "
-          :span="cell.colSpan ? cell.colSpan * 2 : undefined"
-          :style="determineCellStyle(cell)"
-          :rowspan="cell.rowSpan ? cell.rowSpan : undefined">
-          <a-card class="flexItem" :bordered="false" :body-style="flexItemBodyState">
-            <template v-if="cell.type === 'column'">
-              {{ cell.text }}
-            </template>
-            <template v-else-if="cell.type === 'value'">
-              <template v-if="cell.customFunction === undefined">
-                {{ cell.value }}
-              </template>
-              <template v-else>
-                {{ deserializeFunctionAndRun(cell.customFunction, cell.value, config) }}
-              </template>
-            </template>
-            <template v-else-if="cell.type === 'increment'">
-              <template v-if="cell.customFunction === undefined">
-                {{ getDeepObject(configData.arr[inputColumnsDefinitionIndex], cell.dataIndex) }}
-              </template>
-              <template v-else>
-                {{
-                  deserializeFunctionAndRun(cell.customFunction, configData.arr[inputColumnsDefinitionIndex][cell.dataIndex], config)
-                }}
-              </template>
-            </template>
-            <template v-else-if="cell.type === 'input'">
-              <template v-if="cell.customFunction === undefined">
-                {{ getDeepObject(configData.arr[inputColumnsDefinitionIndex], cell.dataIndex) }}
-              </template>
-              <template v-else>
-                {{
-                  deserializeFunctionAndRun(cell.customFunction, configData.arr[inputColumnsDefinitionIndex][cell.dataIndex], config)
-                }}
-              </template>
-            </template>
-            <template v-else-if="cell.type === 'inputs'">
-              <template v-if="cell.customFunction === undefined">
-                {{ getDeepObject(configData.arr[inputColumnsDefinitionIndex], cell.dataIndex) }}
-              </template>
-              <template v-else>
-                {{
-                  deserializeFunctionAndRun(cell.customFunction, configData.arr[inputColumnsDefinitionIndex][cell.dataIndex], config)
-                }}
-              </template>
-            </template>
-          </a-card>
-        </a-col>
-      </template>
-    </template>
-    <!--  不是动态行  -->
-    <template v-else-if="!inputColumns">
+    <template v-for="(cell, cellIndex) in columns">
       <a-col
-        v-for="(cell, cellIndex) in columns"
+        name="trGroup"
+        v-if="Array.isArray(cell) || !cell.dontShowRow"
         :key="cellIndex"
-        :class=" calcTDBorder(cell.noBoarder) "
-        :span="cell.colSpan ? cell.colSpan * 2 : undefined"
-        :style="determineCellStyle(cell)"
-        :rowspan="cell.rowSpan ? cell.rowSpan : undefined">
-        <a-card class="flexItem" :bordered="false" :body-style="flexItemBodyState">
-          <template v-if="cell.type === 'column'">
-            <template v-if="cell.customFunction">
-              {{ deserializeFunctionAndRun(cell.customFunction, configData[cell.dataIndex], config) }}
-            </template>
-            <template v-else>
-              {{ cell.text }}
-            </template>
-          </template>
-          <template v-else-if="cell.type === 'placeHolderColumn'">
-            <!--       占位             -->
-          </template>
-          <template v-else-if="cell.type === 'value'">
-            {{ cell.value }}
-          </template>
-          <template v-else-if="cell.type === 'curDateInput'">
-            <a-button type="dashed" v-if="configData[cell.dataIndex]">
-              {{ configData[cell.dataIndex] }}
-            </a-button>
-            <a-button
-              v-if="!configData[cell.dataIndex]"
-              type="primary"
-              @click="getNowDate(cell.dataIndex)"
-            >{{ cell.text || '确认' }}
-            </a-button>
-          </template>
-          <template v-else-if="cell.type === 'input'">
-            <template v-if="cell.inputReadOnly === true">
-              <template v-if="cell.dataIndex.indexOf('@@@') !== -1">
-                <a-input
-                  @change="handleInputDeepChange($event, cell.dataIndex)"
-                  v-model="config.tempData[cell.dataIndex]"
-                  :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"
-                  :disabled="true"/>
-              </template>
-              <template v-else>
-                <a-input
-                  v-model="configData[cell.dataIndex]"
-                  :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"
-                  :disabled="true"/>
-              </template>
-            </template>
-            <template v-else>
-              <template v-if="cell.dataIndex.indexOf('@@@') !== -1">
-                <a-input
-                  @change="handleInputDeepChange($event, cell.dataIndex)"
-                  v-model="config.tempData[cell.dataIndex]"
-                  :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"/>
-              </template>
-              <template v-else>
-                <a-input
-                  v-model="configData[cell.dataIndex]"
-                  :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"/>
-              </template>
-            </template>
-          </template>
-          <template v-else-if="cell.type === 'inputs'">
-            <template v-if="cell.inputReadOnly === true">
-              <div class="inputsDiv">
-                <div class="inputsDivItem" v-for="(num, index) of calcFormatInputNum(cell.format)" :key="index">
-                  <span class="inputsDivItemLabel">{{ displayFormatStartText(cell.format) }}</span>
-                  <template v-if="cell.dataIndex.indexOf('@@@') !== -1">
-                    <a-input
-                      @change="handleInputDeepChange($event, cell.dataIndex)"
-                      v-model="config.tempData[cell.dataIndex][index]"
-                      :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"
-                      :disabled="true"/>
-                  </template>
-                  <template v-else>
-                    <a-input
-                      v-model="configData[cell.dataIndex][index]"
-                      :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"
-                      :disabled="true"/>
-                  </template>
-                  <span class="inputsDivItemLabel">{{ displayFormatText(cell.format, index) }}</span>
-                </div>
-              </div>
-            </template>
-            <template v-else>
-              <div class="inputsDiv">
-                <div class="inputsDivItem" v-for="(num, index) of calcFormatInputNum(cell.format)" :key="index">
-                  <span class="inputsDivItemLabel">{{ displayFormatStartText(cell.format) }}</span>
-                  <template v-if="cell.dataIndex.indexOf('@@@') !== -1">
-                    <a-input
-                      @change="handleInputDeepChange($event, cell.dataIndex)"
-                      v-model="config.tempData[cell.dataIndex][index]"
-                      :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"/>
-                  </template>
-                  <template v-else>
-                    <a-input
-                      v-model="configData[cell.dataIndex][index]"
-                      :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"/>
-                  </template>
-                  <span class="inputsDivItemLabel">{{ displayFormatText(cell.format, index) }}</span>
-                </div>
-              </div>
-            </template>
+        :style="isWidget ? {padding: '0px 2px'} : (Array.isArray(cell) ? {} : determineCellStyle(cell))"
+        :span="calculateColSpan(cell)">
+        <div id="report_widget" v-if="isWidget">
+          <!-- 插槽渲染 -->
+          <template v-if="Array.isArray(cell)">
+            <!-- 处理 cell 是数组的情况 -->
+            <div v-for="(item, index) in cell" :key="index">
+              <x-report-tr-group
+                :env="env"
+                :key="index"
+                :columns="recalculateItem(item)"
+                :config-data="configData"
+                :config="config"
+                :display="true">
+              </x-report-tr-group>
+            </div>
           </template>
-          <template v-else-if="cell.type === 'list'">
-            <template v-if="cell.listType === 'input'">
-              <a-input
-                v-model="configData[cell.dataIndex][listIndex]"
-                :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"/>
-            </template>
-            <template v-else-if="cell.listType === 'value'">
-              {{ cell.content[listIndex] }}
+          <template v-else-if="cell.type === 'slot'">
+            <template
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions'].includes(cell.slotType)">
+              <component
+                :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
+                :key="cellIndex"
+                :ref="`dynamicComponent_${ cell.slotRef || cellIndex}`"
+                :serviceName="cell.serviceName"
+                :serverName="cell.serviceName"
+                v-on="getEventHandlers(cell)"
+                @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
+                :queryParamsName="cell.slotConfig"
+                :configName="cell.slotConfig"
+                :countVisible="false"
+                :env="env"
+              />
             </template>
           </template>
-          <template v-else-if="cell.type === 'images'">
-            <div>
-              <template v-if="configData.images[cell.dataIndex]?.length > 0">
-                <upload
-                  :model="uploadParams"
-                  :img-prefix="imgPrefix"
-                  :service-name="serverName"
-                  :images="checkImg(cell.dataIndex, 'configData')"
-                  :outer-container-index="cell.dataIndex"
-                  @setFiles="(...args) => {setImages(args, 'configData')}"
-                  :upload-style="'simple'"
-                />
-              </template>
-              <template v-else>
-                <upload
-                  :model="uploadParams"
-                  :img-prefix="imgPrefix"
-                  :service-name="serverName"
-                  :images="checkImg(cell.dataIndex, 'config')"
-                  :outer-container-index="cell.dataIndex"
-                  @setFiles="(...args) => {setImages(args, 'config', cell.dataIndex)}"
-                  :upload-style="'simple'"
-                />
-              </template>
+        </div>
+        <a-card v-else class="flexItem" :bordered="false" :body-style="flexItemBodyState">
+          <!-- 插槽渲染 -->
+          <template v-if="Array.isArray(cell)">
+            <!-- 处理 cell 是数组的情况 -->
+            <div v-for="(item, index) in cell" :key="index">
+              <x-report-tr-group
+                :server-name="serverName"
+                :env="env"
+                :key="index"
+                :columns="recalculateItem(item)"
+                :config-data="configData"
+                :config="config"
+                :display="true">
+              </x-report-tr-group>
             </div>
           </template>
-        </a-card>
-      </a-col>
-    </template>
-    <!--  动态行插入按钮  -->
-    <template v-else-if="inputColumnsButton">
-      <a-col :span="maxColSpan" :class="calcTDBorder()">
-        <a-card class="flexItem" :bordered="false" :body-style="flexItemBodyState">
-          <a-button-group>
-            <a-button @click="addData(columns[0].dataIndex, columns)">
-              <a-icon type="plus"/>
-            </a-button>
-            <a-button @click="removeData(columns[0].dataIndex)">
-              <a-icon type="minus"/>
-            </a-button>
-          </a-button-group>
-        </a-card>
-      </a-col>
-    </template>
-    <!--  其他行  -->
-    <template v-else>
-      <a-col
-        v-for="(cell, cellIndex) in columns"
-        :key="cellIndex"
-        :class=" calcTDBorder(cell.noBoarder) "
-        :span="cell.colSpan ? cell.colSpan * 2 : undefined"
-        :style="determineCellStyle(cell)"
-        :rowspan="cell.rowSpan ? cell.rowSpan : undefined">
-        <a-card class="flexItem" :bordered="false" :body-style="flexItemBodyState">
-          <template v-if="cell.type === 'column'">
-            {{ cell.text }}
-          </template>
-          <template v-else-if="cell.type === 'value'">
-            {{ cell.value }}
-          </template>
-          <template v-else-if="cell.type === 'curDateInput'">
-            <a-button type="dashed" v-if="configData.arr[inputColumnsDefinitionIndex][cell.dataIndex]">
-              {{ configData.arr[inputColumnsDefinitionIndex][cell.dataIndex] }}
-            </a-button>
-            <a-button
-              v-if="!configData.arr[inputColumnsDefinitionIndex][cell.dataIndex]"
-              type="primary"
-              @click="getNowDate(inputColumnsDefinitionIndex,cell.dataIndex)"
-            >{{ cell.text || '确认' }}
-            </a-button>
-          </template>
-          <template v-else-if="cell.type === 'increment'">
-            {{ configData.arr[inputColumnsDefinitionIndex][cell.dataIndex] }}
-          </template>
-          <template v-else-if="cell.type === 'input'">
-            <template v-if="cell.inputReadOnly === true">
-              <a-input
-                v-model="configData.arr[inputColumnsDefinitionIndex][cell.dataIndex]"
-                :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"
-                :disabled="true"/>
-            </template>
-            <template v-else>
-              <a-input
-                v-model="configData.arr[inputColumnsDefinitionIndex][cell.dataIndex]"
-                :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"/>
-            </template>
-          </template>
-          <template v-else-if="cell.type === 'inputs'">
-            <template v-if="cell.inputReadOnly === true">
-              <a-input
-                v-model="configData.arr[inputColumnsDefinitionIndex][cell.dataIndex]"
-                :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"
-                :disabled="true"/>
-            </template>
-            <template v-else>
-              <a-input
-                v-model="configData.arr[inputColumnsDefinitionIndex][cell.dataIndex]"
-                :style="'width:' + (cell.inputWidth ? cell.inputWidth : '100') + '%'"/>
+          <template v-else-if="cell.type === 'slot'">
+            <template
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions'].includes(cell.slotType)">
+              <component
+                :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
+                :key="cellIndex"
+                :ref="`dynamicComponent_${ cell.slotRef || cellIndex}`"
+                :serviceName="cell.serviceName"
+                :serverName="cell.serviceName"
+                v-on="getEventHandlers(cell)"
+                @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
+                :queryParamsName="cell.slotConfig"
+                :configName="cell.slotConfig"
+                :countVisible="false"
+                :env="env"
+              />
             </template>
           </template>
         </a-card>
@@ -457,8 +83,7 @@
 
 <script>
 import Upload from '@vue2-client/base-client/components/common/Upload'
-import { formatDate, getRealKeyData } from '@vue2-client/utils/util'
-import { nanoid } from 'nanoid'
+import { getRealKeyData } from '@vue2-client/utils/util'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
@@ -478,6 +103,9 @@ export default {
     XLabelSelect: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelect.vue'),
     XConversation: () => import('@vue2-client/base-client/components/common/XConversation/XConversation.vue'),
     XCheckList: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
+    XCardSet: () => import('@vue2-client/base-client/components/common/XCardSet/XCardSet.vue'),
+    XCollapse: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
+    XHDescriptions: () => import('@vue2-client/base-client/components/his/XHDescriptions/XHDescriptions.vue'),
   },
   props: {
     // 每一行的配置
@@ -510,46 +138,11 @@ export default {
       type: Object,
       required: true
     },
-    // 是否为动态行
-    inputColumns: {
-      type: Boolean,
-      default: false
-    },
-    // 是否为动态行按钮
-    inputColumnsButton: {
-      type: Boolean,
-      default: false
-    },
-    // 动态行的Index
-    inputColumnsDefinitionIndex: {
-      type: Number,
-      default: undefined
-    },
     // 是否为展示行
     display: {
       type: Boolean,
       default: false
     },
-    // list类型的下标，用于遍历列表时，获取对应的数据
-    listIndex: {
-      type: Number,
-      default: undefined
-    },
-    // 表格没有上边框
-    noTopBorder: {
-      type: Boolean,
-      default: false
-    },
-    // 图片是否使用OSS来保存
-    useOssForImg: {
-      type: Boolean,
-      default: true
-    },
-    // 图片上传后添加前缀
-    imgPrefix: {
-      type: String,
-      default: undefined
-    }
   },
   computed: {
     allSlotSum () {
@@ -588,13 +181,31 @@ export default {
       // tableConfig: {}
     }
   },
-  inject: ['openDialog', 'emitEvent', 'registerComponent', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget'],
+  watch: {
+    columns: {
+      deep: true,
+      immediate: true,
+      handler (newVal) {
+        console.log('columns变化:', JSON.parse(JSON.stringify(newVal)))
+        // 使用nextTick确保DOM更新
+        this.$nextTick(() => {
+          this.$forceUpdate()
+        })
+      }
+    }
+  },
+  inject: ['openDialog', 'emitEvent', 'registerComponent', 'setColSpanByName', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget'],
   methods: {
     getWindow,
     isMicroAppEnv,
     microDispatch,
     getMicroData,
     getRealKeyData,
+    calculateColSpan (cell) {
+      return Array.isArray(cell)
+        ? cell[0][0]?.colSpan * 2
+        : (cell?.colSpan ?? cell?.def?.colSpan ?? 1) * 2
+    },
     onComponentMounted (h, cell, cellIndex) {
       this.slotRendered += 1
       if (this.slotRendered >= this.allSlotSum) {
@@ -697,15 +308,20 @@ export default {
         }, this.env === 'dev')
       }
     },
-
-    // 对于嵌套情况，对colSpan重新分配
     recalculateItem (item) {
-      const totalColSpan = item.reduce((sum, cell) => sum + (cell.colSpan || 1), 0) // 计算总的 colSpan
+      const totalColSpan = item.reduce((sum, cell) => {
+        // 保留手动设置的colSpan
+        return sum + (cell._isManualColSpan ? 0 : (cell.colSpan || 1))
+      }, 0)
       return item.map(cell => {
-        const newColSpan = Math.round((cell.colSpan || 1) / totalColSpan * 12) // 按比例重新分配 colSpan
+        // 跳过已手动设置的单元格
+        if (cell._isManualColSpan) return cell
+        const newColSpan = Math.round((cell.colSpan || 1) / totalColSpan * 12)
         return {
           ...cell,
-          colSpan: newColSpan // 更新 colSpan
+          colSpan: newColSpan,
+          // 标记自动计算的单元格
+          _isAutoCalculated: true
         }
       })
     },
@@ -751,57 +367,8 @@ export default {
       return handlers
     },
     getComponentName (queryParamsName, serviceName, componentName) {
-      // const config = await getConfigByName(queryParamsName, serviceName)
-      // const componentName = config.$globalProp.type
       return componentName
     },
-    updateImg (data) {
-      this.$emit('updateImg', data)
-    },
-    formatImgStr (str) {
-      const result = []
-      if (str !== '') {
-        const arr = str.split('/')
-        result.push({
-          uid: nanoid(6),
-          url: str,
-          name: arr[arr.length - 1],
-          status: 'done'
-        })
-      }
-      this.uploadParams.acceptCount = 1
-      return result
-    },
-    checkImg (index, type) {
-      let target
-      if (type === 'configData') {
-        target = this.configData.images[index]
-      } else {
-        target = this.config.tempData[index]
-      }
-      if (typeof target !== 'object') {
-        return this.formatImgStr(target)
-      }
-      target.forEach(obj => {
-        if (obj.uid === undefined) {
-          obj.uid = obj.id.toString()
-        }
-        if (obj.url === undefined) {
-          if (obj.path) {
-            obj.url = obj.path
-          }
-        }
-        if (obj.name === undefined) {
-          const withOutEndFix = obj.url.split('.')[0]
-          const temp = withOutEndFix.split('/')
-          obj.name = temp[temp.length - 1]
-        }
-        if (obj.status === undefined) {
-          obj.status = 'done'
-        }
-      })
-      return target
-    },
     // 判断单元格样式
     determineCellStyle (cell, color = '#000', borderWidth = '1px') {
       // 如果声明了borderColor
@@ -824,197 +391,6 @@ export default {
       }
       return result
     },
-
-    // 表格中数据key含有@@@，需要手动触发更新
-    handleInputDeepChange () {
-      this.$forceUpdate()
-    },
-    // 路径中含有@@@的key，将其解析，并返回其数据
-    getDeepObject (obj, strPath) {
-      if (!strPath) {
-        return ''
-      }
-      const arr = strPath.split('@@@')
-      let result = obj[arr[0]]
-      arr.shift()
-      try {
-        while (arr.length > 0) {
-          result = result[arr[0]]
-          arr.shift()
-        }
-      } catch (e) {
-        result = undefined
-      }
-      return result
-    },
-    // 获取当前日期
-    getNowDate (index1, index2) {
-      if (index2) {
-        // @click="getNowDate(configData.arr[inputColumnsDefinitionIndex][cell.dataIndex])"
-        this.configData.arr[index1][index2] = formatDate('now')
-      } else {
-        this.configData[index1] = formatDate('now')
-      }
-      this.configData = Object.assign({}, this.configData)
-    },
-    // 反序列化函数并执行
-    deserializeFunctionAndRun (functionStr, value) {
-      // eslint-disable-next-line no-eval
-      const fun = eval('(' + functionStr + ')')
-      return fun(value, this.config)
-    },
-    // 基础上传组件，图片改动后触发
-    setImages (args, type, index = undefined) {
-      // 如果基础上传组件在初始化完成后，就调用emit了setImage，此时图片并没有变化，直接返回
-      if (args[2] === 'created') {
-        return
-      }
-      if (type === 'configData') {
-        this.configData.images[args[1]] = args[0]
-      } else {
-        this.config.tempData[args[1]] = args[0]
-        if (index) {
-          this.$emit('updateImg', this.config.tempData[index])
-        }
-      }
-    },
-    // 动态行删除
-    removeData (index) {
-      if (this.configData[index].length === 0) {
-        this.$message.warn('已经没有更多了')
-        return
-      }
-      this.configData[index].pop()
-    },
-    // 添加一行
-    addData (index, row) {
-      // 获取定义
-      const defs = row[0].definition
-
-      // 获取外层对象名
-      const dataName = row[0].dataIndex
-      const temp = {}
-
-      defs.forEach(def => {
-        // 找到数组中最后一个数据的值
-        let lastDataNo = 0
-        if (this.configData[dataName][this.configData[dataName].length - 1]) {
-          lastDataNo = this.configData[dataName][this.configData[dataName].length - 1][def.dataIndex]
-        }
-
-        // 如果没有值，检查是否声明了初始值
-        if (lastDataNo === 0 && def.initialValue) {
-          lastDataNo = def.initialValue
-        }
-
-        // 检查是否有步长
-        let step = 1
-        if (def.step) {
-          step = def.step
-        }
-
-        // 如果单元格类型为increment，则进行自增
-        if (def.type === 'increment') {
-          temp[def.dataIndex] = lastDataNo + step
-        }
-      })
-      this.configData[index].push(temp)
-    },
-    // 根据format计算需要多少个输入框
-    calcFormatInputNum (formatStr) {
-      let count = 0
-      for (let i = 0; i < formatStr.length; i++) {
-        if (formatStr[i] === '{') {
-          count++
-        }
-      }
-      return count
-    },
-    // 根据format计算输入框之后的文字显示
-    displayFormatText (formatStr, num) {
-      let start = 0
-      let count = 0
-      num++
-      for (let i = 0; i < formatStr.length; i++) {
-        if (formatStr[i] === '}') {
-          start = i
-          count++
-        }
-        if (count === num) {
-          for (let j = start + 1; j < formatStr.length; j++) {
-            if (formatStr[j] === '{') {
-              return formatStr.slice(start + 1, j)
-            }
-            if (j === formatStr.length - 1 && formatStr[j] !== '}') {
-              return formatStr[j]
-            }
-          }
-        }
-      }
-    },
-    calcTDBorder (cellNoBorder = false) {
-      if (cellNoBorder) {
-        return 'tdNoBorder'
-      } else {
-        if (this.noTopBorder) {
-          return 'tdWithNoTopBorder'
-        } else {
-          return 'tdWithBorder'
-        }
-      }
-    },
-    // 根据format计算输入框之前的文字显示
-    displayFormatStartText (formatStr) {
-      let count = 0
-      for (let i = 0; i < formatStr.length; i++) {
-        if (formatStr[i] === '{') {
-          break
-        } else {
-          count++
-        }
-      }
-      return formatStr.slice(0, count)
-    },
-    // 拼接被自动拆分的单元格内容
-    showSubRowValue (cell) {
-      const dataName = cell.dataIndex
-      const formatArr = []
-      const dataArr = []
-
-      // 从config中取出所有数据，根据dataIndex的开头内容进行拼接
-      this.config.columns.forEach(row => row.forEach(cell => {
-        if (cell.dataIndex && cell.dataIndex.startsWith(dataName)) {
-          formatArr.push(cell.format)
-          dataArr.push(this.configData[cell.dataIndex])
-        }
-      }))
-
-      const text = []
-      const data = []
-
-      formatArr.forEach(word => {
-        const temp = word.split('{}')
-        temp.forEach(char => {
-          if (char !== '') {
-            text.push(char)
-          }
-        })
-      })
-
-      dataArr.forEach(item => {
-        item.forEach(num => {
-          data.push(num)
-        })
-      })
-
-      let result = ''
-      for (let i = 0; i < data.length; i++) {
-        result += data[i]
-        result += text[i]
-      }
-
-      return result
-    },
     // 把用户定义的组件，传递到整个杉格中，方便调用
     passComponentNamesToAncestor (refs) {
       console.log('组件的keys', Object.entries(refs), refs)
@@ -1097,6 +473,7 @@ export default {
 .bg-purple-light {
   background: #b37feb;
 }
+
 .flexItem {
   border-radius: 8px;
   height: 100%;