vue2-client 1.8.143 → 1.8.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.143",
+  "version": "1.8.145",
   "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

@@ -397,7 +397,7 @@ export default {
             // 替换columns，合并data
             config.columns[i] = []
             const before = config.columns.slice(0, i)
-            const after = config.columns.slice(i + 1, config.columns.length)
+            let after = config.columns.slice(i + 1, config.columns.length)
 
             const addArr = []
             for (let k = 0; k < this.configFromWeb[targetName].columns.length; k++) {
@@ -425,6 +425,11 @@ export default {
             })
 
             // 拼接之后的数组
+            if (after.length === 1) {
+              if (after[0].type === 'slot' || after[0][0].type === 'slot') {
+                after = []
+              }
+            }
             if (after.length > 0) {
               if (after.length >= 1) {
                 after.forEach(item => {
@@ -443,7 +448,6 @@ export default {
             }
 
             config.data = { ...config.data, ...this.configFromWeb[targetName].data }
-            this.configFromWeb = {}
           }
         }
       }

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

@@ -13,7 +13,12 @@
             <div class="inputsDivItem" v-for="(num, index) of calcFormatInputNum(item.format)" :key="index">
               <span class="inputsDivItemLabel">{{ displayFormatStartText(item.format) }}</span>
               <template v-if="!forDisplay">
-                <a-input v-model="data[item.dataIndex][index]" :style="'width:' + (item.inputWidth ? item.inputWidth : '100') + '%'"/>
+                <template v-if="item.inputReadOnly === true">
+                  <a-input v-model="data[item.dataIndex][index]" :style="'width:' + (item.inputWidth ? item.inputWidth : '100') + '%'" :disabled="true"/>
+                </template>
+                <template v-else>
+                  <a-input v-model="data[item.dataIndex][index]" :style="'width:' + (item.inputWidth ? item.inputWidth : '100') + '%'"/>
+                </template>
               </template>
               <template v-else>
                 {{ activatedConfig.data[item.dataIndex][index] }}

package/src/pages/Example/index.vue

@@ -246,7 +246,8 @@ export default {
           {
             dataIndex: 'subTitleDate',
             format: '{}年{}月{}日',
-            type: 'inputs'
+            type: 'inputs',
+            inputReadOnly: true
           },
           {
             dataIndex: 'subTitleCompany',