From 4889d28c362c1ba2612091f3e5d8f3b98ac7028a Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 14 Nov 2023 10:49:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5-=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=B1=9E=E6=80=A7=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E7=9F=A9=E9=98=B5=EF=BC=8C=E5=B1=9E=E6=80=A7=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]#[1021768452505600]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5-=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=B1=9E=E6=80=A7=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E7=9F=A9=E9=98=B5=EF=BC=8C=E5=B1=9E=E6=80=A7=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93905094754?=
 =?UTF-8?q?3057/1021768452505600?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/component/formtableinputer/index.vue | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
index e09bc065..cccc12a3 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
@@ -16,7 +16,15 @@
         ></Icon>
         {{ $t('term.pbc.exporttemplate') }}
       </span>
-      <span v-if="isShowExportExcel" class="action-item tsfont-export" @click="exportExcel">{{ $t('term.framework.exporttable') }}</span>
+      <Tooltip
+        v-if="isShowExportExcel"
+        placement="top"
+        content="表格输入控件：下拉框/单选框/复选框<br />
+            字段映射：值和显示文字必须一致，否则导入后，数据回显不出来"
+        :transfer="true"
+      >
+        <span class="action-item tsfont-export" @click="exportExcel">{{ $t('term.framework.exporttable') }}</span>
+      </Tooltip>
       <span v-else class="action-item">
         <Icon
           type="ios-loading"
@@ -401,9 +409,9 @@ export default {
               let {dataSource = '', isMultiple = false} = config;
               if (handler == 'formtable') {
                 this.$set(item, [key], null);
-              } else if (dataSource == 'matrix' && (isMultiple || handler == 'formradio')) {
-                // 矩阵数据源并且是多选，需要处理值去掉&=&
-                this.$set(item, [key], this.handleSpecialValue(item[key]));
+              } else if (dataSource == 'matrix' && (isMultiple || handler == 'formradio' || handler == 'formcheckbox')) {
+                // 矩阵数据源并且是多选
+                this.$set(item, [key], item[key] instanceof Array ? item[key]?.join(',') : item[key]);
               } else if (dataSource == 'static' && (isMultiple || handler == 'formcheckbox')) {
                 // 静态数据源并且是多选
                 this.$set(item, [key], item[key]?.join(','));
@@ -438,7 +446,6 @@ export default {
         let _file = new Blob([buffer], {
           type: 'application/octet-stream'
         });
-       
         new Promise((resolve, reject) => {
           try {
             FileSaver.saveAs(_file, `${this.formItem?.label || ''}_${this.$utils.getCurrenttime('yyyyMMddHHmmss')}.xlsx`);
@@ -558,7 +565,7 @@ export default {
       let {config = {}, handler = ''} = selectedItem || {};
       if (!this.$utils.isEmpty(value)) {
         let {dataSource = '', isMultiple = false} = config || {};
-        if (dataSource === 'matrix' && (isMultiple || handler == 'formradio')) {
+        if (dataSource === 'matrix' && (isMultiple || handler == 'formradio' || handler == 'formcheckbox')) {
         // 矩阵
           resultValue = [];
           let valueList = [];
@@ -566,11 +573,11 @@ export default {
             valueList = value.split(',');
             valueList.forEach((valueItem) => {
               if (valueItem) {
-                resultValue.push(`${valueItem}&=&${valueItem}`);
+                resultValue.push(valueItem.indexOf('&=&') != -1 ? valueItem : `${valueItem}&=&${valueItem}`);
               }
             });
           } else {
-            resultValue.push(`${value}&=&${value}`);
+            resultValue.push(valueItem.indexOf('&=&') != -1 ? valueItem : `${value}&=&${value}`);
           }
         } else if (dataSource == 'static' && (isMultiple || (handler == 'formcheckbox'))) {
           resultValue = [];
-- 
Gitee


From 203d0943c8e38f3c7c99e6c78ec8efdb2c4a5d71 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 14 Nov 2023 18:37:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86-=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9C=AA=E5=90=AF=E7=94=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=AF=BC=E5=85=A5=E8=A1=A8=E6=A0=BC=E6=9D=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=20=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1024632071618560]=E5=B7=A5=E5=8D=95=E5=A4=84?=
 =?UTF-8?q?=E7=90=86-=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=AA=E5=90=AF=E7=94=A8=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=AF=E4=BB=A5=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=AF=BC=E5=85=A5=E8=A1=A8=E6=A0=BC=E6=9D=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1024632071618?=
 =?UTF-8?q?560?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/component/formtableinputer/index.vue | 100 +++++++++---------
 1 file changed, 48 insertions(+), 52 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
index cccc12a3..8265d473 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
@@ -1,55 +1,48 @@
 <template>
   <div>
     <div v-if="!disabled && !readonly" class="mb-sm action-group">
-      <div v-if="!config.hasOwnProperty('isCanAdd') || config.isCanAdd" class="action-item">
+      <div v-if="canAdd" class="action-item">
         <Button @click="addData()">{{ $t('dialog.title.addtarget',{'target':$t('page.data')}) }}</Button>
       </div>
       <div v-if="selectedIndexList && selectedIndexList.length > 0 && !$utils.isEmpty(tableData.tbodyList)" class="action-item">
         <Button @click="removeSelectedItem">{{ $t('dialog.title.deletetarget',{'target':$t('page.data')}) }}</Button>
       </div>
-      <span v-if="isShowExportExcelTemplate" class="action-item tsfont-export" @click="exportExcelTemplate">{{ $t('term.pbc.exporttemplate') }}</span>
-      <span v-else class="action-item">
-        <Icon
-          type="ios-loading"
-          size="18"
-          class="loading"
-        ></Icon>
-        {{ $t('term.pbc.exporttemplate') }}
-      </span>
-      <Tooltip
-        v-if="isShowExportExcel"
-        placement="top"
-        content="表格输入控件：下拉框/单选框/复选框<br />
-            字段映射：值和显示文字必须一致，否则导入后，数据回显不出来"
-        :transfer="true"
-      >
-        <span class="action-item tsfont-export" @click="exportExcel">{{ $t('term.framework.exporttable') }}</span>
-      </Tooltip>
-      <span v-else class="action-item">
-        <Icon
-          type="ios-loading"
-          size="18"
-          class="loading"
-        ></Icon>
-        {{ $t('term.framework.exporttable') }}
-      </span>
-
-      <Upload
-        ref="upload"
-        :show-upload-list="false"
-        :default-file-list="[]"
-        :format="['xlsx']"
-        :max-size="maxSize"
-        :on-format-error="handleFormatError"
-        :on-exceeded-size="handleMaxSize"
-        :before-upload="handleBeforeUpload"
-        type="drag"
-        action=""
-        class="forminputtable-upload ml-sm"
-        style="display: inline-block;"
-      >
-        <span class="tsfont-import">{{ $t('term.framework.importtable') }}</span>
-      </Upload>
+      <template v-if="canAdd">
+        <span v-if="isShowExportExcelTemplate" class="action-item tsfont-export" @click="exportExcelTemplate">{{ $t('term.pbc.exporttemplate') }}</span>
+        <span v-else class="action-item">
+          <Icon
+            type="ios-loading"
+            size="18"
+            class="loading"
+          ></Icon>
+          {{ $t('term.pbc.exporttemplate') }}
+        </span>
+        <span v-if="isShowExportExcel" class="action-item tsfont-export" @click="exportExcel">{{ $t('term.framework.exporttable') }}</span>
+        <span v-else class="action-item">
+          <Icon
+            type="ios-loading"
+            size="18"
+            class="loading"
+          ></Icon>
+          {{ $t('term.framework.exporttable') }}
+        </span>
+        <Upload
+          ref="upload"
+          :show-upload-list="false"
+          :default-file-list="[]"
+          :format="['xlsx']"
+          :max-size="maxSize"
+          :on-format-error="handleFormatError"
+          :on-exceeded-size="handleMaxSize"
+          :before-upload="handleBeforeUpload"
+          type="drag"
+          action=""
+          class="forminputtable-upload ml-sm"
+          style="display: inline-block;"
+        >
+          <span class="tsfont-import">{{ $t('term.framework.importtable') }}</span>
+        </Upload>
+      </template>
     </div>
     <TsTable
       v-if="hasColumn"
@@ -410,8 +403,8 @@ export default {
               if (handler == 'formtable') {
                 this.$set(item, [key], null);
               } else if (dataSource == 'matrix' && (isMultiple || handler == 'formradio' || handler == 'formcheckbox')) {
-                // 矩阵数据源并且是多选
-                this.$set(item, [key], item[key] instanceof Array ? item[key]?.join(',') : item[key]);
+                // 矩阵数据源并且是多选，需要处理值去掉&=&
+                this.$set(item, [key], this.handleSpecialValue(item[key]));
               } else if (dataSource == 'static' && (isMultiple || handler == 'formcheckbox')) {
                 // 静态数据源并且是多选
                 this.$set(item, [key], item[key]?.join(','));
@@ -496,14 +489,14 @@ export default {
         };
         return await this.$api.framework.matrix.getMatrixDataForSelect(param).then(res => {
           if (res.Status == 'OK') {
-            return [`"${res.Return?.dataList?.filter((item) => this.handleSpecialValue(item.value)).map((item) => this.handleSpecialValue(item.value)).join(',')}"`];
+            return [`"${res.Return?.dataList?.filter((item) => this.handleSpecialValue(item.text)).map((item) => this.handleSpecialValue(item.text)).join(',')}"`];
           }
         });
       } else {
         const resultArray = [
           `"${dataList
-            .filter(item => item?.value)
-            .map(item => item.value)
+            .filter(item => item?.text)
+            .map(item => item.text)
             .join(',')}"`
         ];
         return resultArray;
@@ -512,9 +505,9 @@ export default {
     handleSpecialValue(value) {
       let valueList = [];
       if (typeof value == 'string') {
-        return value?.split('&=&')?.[0] || value;
+        return value?.split('&=&')?.[1] || value;
       } else if (Array.isArray(value)) {
-        valueList = value.map((item) => item?.split('&=&')?.[0] || item).filter(Boolean);
+        valueList = value.map((item) => item?.split('&=&')?.[1] || item).filter(Boolean);
       }
       return valueList.join(',');
     },
@@ -550,7 +543,7 @@ export default {
                 this.tableData.tbodyList.splice(rowIndex - 2, 1, item);
               } else {
                 // 空数组时，新增一条新的数据
-                this.tableData.tbodyList.push(item);
+                this.tableData.tbodyList.push({...item, uuid: this.$utils.setUuid() });
               }
             }
           });
@@ -630,6 +623,9 @@ export default {
         }
         return null;
       };
+    },
+    canAdd() {
+      return !this.config.hasOwnProperty('isCanAdd') || this.config.isCanAdd;
     }
   },
   watch: {
-- 
Gitee


From 3b7d32bc903de3c9680c6cc02bdbb15104b1179a Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 14 Nov 2023 18:43:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86-=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9C=AA=E5=90=AF=E7=94=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=AF=BC=E5=85=A5=E8=A1=A8=E6=A0=BC=E6=9D=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=20=20=20-=20[=E5=85=B3?=
 =?UTF-8?q?=E8=81=94]#[1024632071618560]=E5=B7=A5=E5=8D=95=E5=A4=84?=
 =?UTF-8?q?=E7=90=86-=E8=A1=A8=E6=A0=BC=E8=BE=93=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=AA=E5=90=AF=E7=94=A8=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=AF=E4=BB=A5=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=AF=BC=E5=85=A5=E8=A1=A8=E6=A0=BC=E6=9D=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1024632071618?=
 =?UTF-8?q?560?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/component/formtableinputer/index.vue | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
index 8265d473..59e857c2 100644
--- a/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
+++ b/src/resources/plugins/TsSheet/form/component/formtableinputer/index.vue
@@ -7,25 +7,26 @@
       <div v-if="selectedIndexList && selectedIndexList.length > 0 && !$utils.isEmpty(tableData.tbodyList)" class="action-item">
         <Button @click="removeSelectedItem">{{ $t('dialog.title.deletetarget',{'target':$t('page.data')}) }}</Button>
       </div>
+     
+      <span v-if="isShowExportExcelTemplate" class="action-item tsfont-export" @click="exportExcelTemplate">{{ $t('term.pbc.exporttemplate') }}</span>
+      <span v-else class="action-item">
+        <Icon
+          type="ios-loading"
+          size="18"
+          class="loading"
+        ></Icon>
+        {{ $t('term.pbc.exporttemplate') }}
+      </span>
+      <span v-if="isShowExportExcel" class="action-item tsfont-export" @click="exportExcel">{{ $t('term.framework.exporttable') }}</span>
+      <span v-else class="action-item">
+        <Icon
+          type="ios-loading"
+          size="18"
+          class="loading"
+        ></Icon>
+        {{ $t('term.framework.exporttable') }}
+      </span>
       <template v-if="canAdd">
-        <span v-if="isShowExportExcelTemplate" class="action-item tsfont-export" @click="exportExcelTemplate">{{ $t('term.pbc.exporttemplate') }}</span>
-        <span v-else class="action-item">
-          <Icon
-            type="ios-loading"
-            size="18"
-            class="loading"
-          ></Icon>
-          {{ $t('term.pbc.exporttemplate') }}
-        </span>
-        <span v-if="isShowExportExcel" class="action-item tsfont-export" @click="exportExcel">{{ $t('term.framework.exporttable') }}</span>
-        <span v-else class="action-item">
-          <Icon
-            type="ios-loading"
-            size="18"
-            class="loading"
-          ></Icon>
-          {{ $t('term.framework.exporttable') }}
-        </span>
         <Upload
           ref="upload"
           :show-upload-list="false"
-- 
Gitee