feat:conflict

src/services/defaults.ts

@@ -1683,6 +1683,11 @@ export const formComponents = [
                 label: $t('最大展示数'),
                 type: 'number',
               },
+              {
+                key:'mergeCells',
+                label: '合并单元格',
+                type: 'code',
+              },
               {
                 key:'columns',
                 label: $t('列配置'),
@@ -1829,9 +1834,14 @@ export const formComponents = [
                 label: $t('垂直线'),
                 type: 'bool',
               },
+              {
+                key: 'rowHeaders',
+                label: '行头',
+                type: 'bool',
+              },
               {
                 key: 'colHeaders',
-                label: $t('有无表头'),
+                label: $t('表头'),
                 type: 'bool',
               },
               {
@@ -2109,14 +2119,14 @@ export const formComponents = [
                 type: 'number',
               },
               {
-                key: 'colWidth',
-                label: $t('列宽'),
-                type: 'number',
+                key: 'rowHeaders',
+                label: '行头',
+                type: 'bool',
               },
               {
-                key: 'rowHeight',
-                label: $t('行高'),
-                type: 'number',
+                key: 'colHeaders',
+                label: '表头',
+                type: 'bool',
               },
               {
                 key: 'colHeaders',
@@ -2367,6 +2377,16 @@ export const formComponents = [
                 label: $t('行高'),
                 type: 'number',
               },
+              {
+                key: 'rowHeaders',
+                label: '行头',
+                type: 'bool',
+              },
+              {
+                key: 'colHeaders',
+                label: '表头',
+                type: 'bool',
+              },
               {
                 key: 'stripe',
                 label: $t('显示斑马纹'),

src/views/components/PenDatas.vue

@@ -2281,14 +2281,14 @@ const getDataSource = async (e) => {
   if (e === 'excel') {
     let data = await importExcel();
     if (Array.isArray(data) && Array.isArray(data[0])) {
-      meta2d.setValue({ id: props.pen.id, data: data, styles: [], mergeCells: [], colHeaders: false }, { doEvent: false });
+      meta2d.setValue({ id: props.pen.id, data: data, styles: [], mergeCells: [], colHeaders: false ,columns:[]}, { doEvent: false });
     } else {
       MessagePlugin.warning($t("数据格式必需是二维数组"));
     }
   } else if (e === 'csv') {
     let data = await importCSV();
     if (Array.isArray(data) && Array.isArray(data[0])) {
-      meta2d.setValue({ id: props.pen.id, data: data, styles: [], mergeCells: [], colHeaders: false }, { doEvent: false });
+      meta2d.setValue({ id: props.pen.id, data: data, styles: [], mergeCells: [], colHeaders: false  ,columns:[]}, { doEvent: false });
     } else {
       MessagePlugin.warning($t("数据格式必需是二维数组"));
     }