vue2-client 1.8.146 → 1.8.147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.146",
+  "version": "1.8.147",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XReport/XReportDesign.vue

@@ -38,7 +38,7 @@
           <!--          <XReportSlot :config="activatedConfig" v-if="render" :slot-config-name="row[0].slotConfig" :key="rowIndex" :for-display="forDisplay"></XReportSlot>-->
           <!--        </template>-->
           <!--  普通行  -->
-          <template v-if="row[0].type !== 'inputColumns'">
+          <template v-if="row[0].type !== 'inputColumns' && row[0].type !== 'list'">
             <template v-if="!forDisplay">
               <x-report-tr-group :key="rowIndex" :columns="row" :config-data="activatedConfig.data"></x-report-tr-group>
             </template>
@@ -46,6 +46,27 @@
               <x-report-tr-group :config="activatedConfig" :key="rowIndex" :columns="row" :config-data="activatedConfig.data" :display="true"></x-report-tr-group>
             </template>
           </template>
+          <!--  列表  -->
+          <template v-else-if="row[0].type === 'list'" v-for="(num, listIndex) in row[0].listLength">
+            <template v-if="!forDisplay">
+              <x-report-tr-group
+                :key="rowIndex + listIndex"
+                :columns="row"
+                :config-data="activatedConfig.data"
+                :list-index="listIndex">
+              </x-report-tr-group>
+            </template>
+            <template v-else>
+              <x-report-tr-group
+                :config="activatedConfig"
+                :key="rowIndex + listIndex"
+                :columns="row"
+                :config-data="activatedConfig.data"
+                :list-index="listIndex"
+                :display="true">
+              </x-report-tr-group>
+            </template>
+          </template>
           <!--  动态行  -->
           <template v-else>
             <template v-if="forDisplay">

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

@@ -40,6 +40,14 @@
               {{ deserializeFunctionAndRun(cell.customFunction, showSubRowValue(cell)) }}
             </template>
           </template>
+          <template v-else-if="cell.type === 'list'">
+            <template v-if="cell.listType === 'input'">
+              {{ configData[cell.dataIndex][listIndex] }}
+            </template>
+            <template v-else-if="cell.listType === 'value'">
+              {{ cell.content[listIndex] }}
+            </template>
+          </template>
           <template v-else-if="cell.type === 'images'">
             <template v-for="(img,imgIndex) in configData.images[cell.dataIndex]">
               <span :key="imgIndex" style="margin-right: 5%">{{ img.name }}</span>
@@ -166,6 +174,16 @@
             </div>
           </template>
         </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>
+        </template>
         <template v-else-if="cell.type === 'images'">
           <div>
             <upload
@@ -298,6 +316,11 @@ export default {
     display: {
       type: Boolean,
       default: false
+    },
+    // listIndex
+    listIndex: {
+      type: Number,
+      default: undefined
     }
   },
   data () {

package/src/pages/Example/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <!--    <XReport :config-name="'test_tableConfig'" :activated-slot-name="'test_tableConfig_slot'"/>-->
-    <XReport :config-name="'test_tableConfig'" :local-config="test_config_withoutSlot" :config-data="test_config_data"/>
-<!--    <XReport :config-name="'test_tableConfig'" :local-config="test_config_withoutSlot"/>-->
-<!--    <XReport :config-name="'test_tableConfig'" />-->
+    <!--    <XReport :config-name="'test_tableConfig'" :local-config="test_config_withoutSlot" :config-data="test_config_data"/>-->
+    <XReport :config-name="'test_tableConfig'" :local-config="test_config_list" :dont-format="true"/>
+    <!--    <XReport :config-name="'test_tableConfig'" />-->
   </div>
 </template>
 
@@ -494,6 +494,136 @@ export default {
           ]
         }
       },
+      test_config_list: {
+        slotsDefine: {},
+        subTitle: [],
+        slotsDeclare: [],
+        data: {
+          workOrder: [],
+          images: {},
+          workNum: [],
+          workContent: [],
+          workTime: []
+        },
+        columns: [
+          [
+            {
+              rowSpan: 1,
+              listHead: '编号',
+              dataIndexType: 'Array',
+              colSpan: 3,
+              dataIndex: 'workNum',
+              originalRowIndex: 0,
+              type: 'list',
+              listType: 'input',
+              originalCellIndex: 0,
+              listLength: 3
+            },
+            {
+              rowSpan: 1,
+              listHead: '顺序',
+              dataIndexType: 'Array',
+              colSpan: 3,
+              dataIndex: 'workOrder',
+              originalRowIndex: 0,
+              type: 'list',
+              listType: 'input',
+              originalCellIndex: 3,
+              listLength: 3
+            },
+            {
+              rowSpan: 1,
+              listHead: '工作内容',
+              dataIndexType: 'Array',
+              colSpan: 3,
+              dataIndex: 'workContent',
+              originalRowIndex: 0,
+              type: 'list',
+              listType: 'value',
+              originalCellIndex: 6,
+              content: [
+                '1. 检查阀门',
+                ' 2. 检查管道',
+                ' 3. 检查燃气表'
+              ],
+              listLength: 3
+            },
+            {
+              rowSpan: 1,
+              listHead: '完成时间',
+              dataIndexType: 'Array',
+              colSpan: 3,
+              dataIndex: 'workTime',
+              originalRowIndex: 0,
+              type: 'list',
+              listType: 'input',
+              originalCellIndex: 9,
+              listLength: 3
+            }
+          ]
+        ],
+        width: 'auto',
+        style: {},
+        title: '测试卡片插槽',
+        table: [
+          [
+            {
+              rowSpan: 1,
+              def: {
+                listHead: '编号',
+                dataIndexType: 'Array',
+                dataIndex: 'workNum',
+                type: 'list',
+                listType: 'input'
+              },
+              colSpan: 3,
+              originalRowIndex: 0,
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              def: {
+                listHead: '顺序',
+                dataIndexType: 'Array',
+                dataIndex: 'workOrder',
+                type: 'list',
+                listType: 'input'
+              },
+              colSpan: 3,
+              originalRowIndex: 0,
+              originalCellIndex: 3
+            },
+            {
+              rowSpan: 1,
+              def: {
+                listHead: '工作内容',
+                dataIndexType: 'Array',
+                dataIndex: 'workContent',
+                type: 'list',
+                listType: 'value',
+                content: '1. 检查阀门, 2. 检查管道, 3. 检查燃气表'
+              },
+              colSpan: 3,
+              originalRowIndex: 0,
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              def: {
+                listHead: '完成时间',
+                dataIndexType: 'Array',
+                dataIndex: 'workTime',
+                type: 'list',
+                listType: 'input'
+              },
+              colSpan: 3,
+              originalRowIndex: 0,
+              originalCellIndex: 9
+            }
+          ]
+        ],
+        cardMode: false
+      }
     }
   },
 }