vue2-client 1.8.150 → 1.8.152

package/package.json

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

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

@@ -563,6 +563,15 @@ export default {
           }
           this.activeConfig = this.config
           this.showSkeleton = false
+          this.activeConfig.columns.forEach(row => {
+            row.forEach(cell => {
+              if (cell.dynamicDataIndex === true) {
+                // eslint-disable-next-line no-eval
+                const func = eval('(' + cell.customFunctionForDynamicDataIndex + ')')
+                cell.dataIndex = func(this.config)
+              }
+            })
+          })
           this.activeConfig.tempData = {}
           this.activeConfig.columns.forEach(row => {
             row.forEach(cell => {

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

@@ -48,20 +48,20 @@
             <tr :key="rowIndex + '' + jsonArrayItemIndex" v-for="(item, jsonArrayItemIndex) in config.data[row.jsonArrayDataIndex]">
               <!--      表头        -->
               <td class="tdWithBorder" colspan="6">
-                <template v-if="receivedFunction[rowIndex].labelFunction(config).type === 'key'">
-                  {{ item[receivedFunction[rowIndex].labelFunction(config).content] }}
+                <template v-if="receivedFunction[rowIndex].labelFunction(config, item).type === 'key'">
+                  {{ item[receivedFunction[rowIndex].labelFunction(config, item).content] }}
                 </template>
-                <template v-if="receivedFunction[rowIndex].labelFunction(config).type === 'value'">
-                  {{ receivedFunction[rowIndex].labelFunction(config).content }}
+                <template v-if="receivedFunction[rowIndex].labelFunction(config, item).type === 'value'">
+                  {{ receivedFunction[rowIndex].labelFunction(config, item).content }}
                 </template>
               </td>
               <!--      内容        -->
               <td class="tdWithBorder" colspan="6">
-                <template v-if="receivedFunction[rowIndex].valueFunction(config).type === 'key'">
-                  {{ item[receivedFunction[rowIndex].valueFunction(config).content] }}
+                <template v-if="receivedFunction[rowIndex].valueFunction(config, item).type === 'key'">
+                  {{ item[receivedFunction[rowIndex].valueFunction(config, item).content] }}
                 </template>
-                <template v-if="receivedFunction[rowIndex].valueFunction(config).type === 'value'">
-                  {{ receivedFunction[rowIndex].valueFunction(config).content }}
+                <template v-if="receivedFunction[rowIndex].valueFunction(config, item).type === 'value'">
+                  {{ receivedFunction[rowIndex].valueFunction(config, item).content }}
                 </template>
               </td>
             </tr>

package/src/pages/Example/index.vue

@@ -2,8 +2,9 @@
   <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_deepKey_dynamicLabel" :config-data="test_deepKey_dynamicLabel_data" :dont-format="true"/>
-<!--        <XReport :config-name="'test_table_config_forEditor'" :dont-format="true"/>-->
+<!--        <XReport :config-name="'test_tableConfig'" :local-config="test_yangchun_json" :config-data="test_yangchun_data" :dont-format="true"/>-->
+    <XReport :config-name="'test_tableConfig'" :local-config="test_yangchun_json" :config-data="test_yangchun_jsonData" :dont-format="true"/>
+    <!--            <XReport :config-name="'test_table_config_forEditor'" :dont-format="true"/>-->
     <!--    <XReport config-name="test_tableConfig" :local-config="test_config_json" :config-data="test_config_json_data"/>-->
   </div>
 </template>
@@ -1092,6 +1093,157 @@ export default {
           }
         },
         f_label: '123'
+      },
+      test_yangchun: {
+        slotsDefine: {},
+        subTitle: [],
+        slotsDeclare: [],
+        data: {
+          'serviceall@@@baseuserinfo@@@f_user_name': '',
+          images: {},
+          'serviceall@@@f_new_failure': '',
+          'usermeter@@@f_meternumber': '',
+          'usermeter@@@f_meter_style': '',
+          'usermeter@@@f_meter_brand': '',
+          'serviceall@@@f_date_leave': '',
+          'serviceall@@@f_remarks': '',
+          'serviceall@@@baseuserinfo@@@f_userinfo_code': '',
+          'serviceall@@@f_date_come': '',
+          'serviceall@@@baseuserinfo@@@f_address': '',
+          f_total_feeORf_total_gas: '',
+          'usermeter@@@f_aroundmeter': ''
+        },
+        columns: [
+          [
+            {
+              rowSpan: 1,
+              customFunction: "function (val, config) {\n  return config.data.usermeter.f_collection_type === '按金额' ? '累购金额' : '累购气量'\n}",
+              colSpan: 2,
+              text: '累购金额or累购气量',
+              originalRowIndex: 3,
+              type: 'column',
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              dynamicDataIndex: true,
+              colSpan: 4,
+              dataIndex: 'f_total_feeORf_total_gas',
+              customFunctionForDynamicDataIndex: "function (config) {\n  if(config.data.usermeter.f_collection_type === '按金额') {\n    return 'usermeter@@@f_total_fee'\n  }else {\n    return 'usermeter@@@f_total_gas'\n  }\n}",
+              originalRowIndex: 3,
+              type: 'input',
+              originalCellIndex: 2
+            },
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '左右表',
+              originalRowIndex: 3,
+              type: 'column',
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 4,
+              dataIndex: 'usermeter@@@f_aroundmeter',
+              originalRowIndex: 3,
+              type: 'input',
+              originalCellIndex: 8
+            }
+          ]
+        ],
+        width: 'auto',
+        style: {},
+        title: '客户工单信息',
+        designMode: 'VisualTable'
+      },
+      test_yangchun_data: {
+        usermeter: {
+          // f_collection_type: '按金额',
+          f_collection_type: '按气量',
+          f_total_fee: '总金额',
+          f_total_gas: '总气量'
+        }
+      },
+      test_yangchun_json: {
+        title: {
+          type: 'titleKey',
+          value: 'f_type'
+        },
+        content: [
+          {
+            customFunctionForLabel: "function (config,item) {\n\treturn { type: 'key', content: 'f_project' }\n}",
+            customFunctionForValue: "function (config,item) {\n  if (item.f_content === null) {\n    return { type: 'value', content: '无' }\n  }else {\n    return { type: 'key', content: 'f_content'}\n  }\n}",
+            jsonArrayDataIndex: 'details',
+            type: 'jsonArray'
+          }
+        ],
+        designMode: 'json'
+      },
+      test_yangchun_jsonData: {
+        imgs: [],
+        details: [
+          {
+            f_project: '旧表表号',
+            f_service_id: 35917,
+            f_is_must: 'false',
+            id: 224392,
+            type: 'string'
+          },
+          {
+            f_project: '新表表号',
+            f_service_id: 35917,
+            f_is_must: 'false',
+            id: 224393,
+            type: 'string'
+          },
+          {
+            f_project: '引入方式',
+            f_service_id: 35917,
+            f_is_must: 'false',
+            id: 224394,
+            type: 'selector'
+          },
+          {
+            f_project: '是否高空作业',
+            f_service_id: 35917,
+            f_is_must: 'false',
+            id: 224395,
+            type: 'selector'
+          },
+          {
+            f_project: '处理结果',
+            f_service_id: 35917,
+            f_is_must: 'false',
+            id: 224396,
+            type: 'selector'
+          },
+          {
+            f_project: '位置',
+            f_service_id: 35917,
+            f_is_must: 'false',
+            id: 224397,
+            type: 'selector'
+          },
+          {
+            f_project: '补装管卡',
+            f_service_id: 35917,
+            f_is_must: 'false',
+            id: 224398,
+            type: 'selector'
+          },
+          {
+            f_project: '备注',
+            f_service_id: 35917,
+            f_is_must: 'false',
+            id: 224399,
+            type: 'string'
+          }
+        ],
+        id: 35917,
+        f_type: '改管维修'
       }
     }
   },