vue2-client 1.8.170 → 1.8.171

package/package.json

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

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

@@ -8,7 +8,7 @@
       layout="inline">
       <a-row :gutter="24">
         <x-form-item
-          v-for="(item, index) in realJsonData.slice(0,3)"
+          v-for="(item, index) in realJsonData.slice(0,7)"
           :key="index"
           :attr="item"
           :form="form"
@@ -29,7 +29,7 @@
         </div>
         <div v-show="advanced">
           <x-form-item
-            v-for="(item, index) in realJsonData.slice(3)"
+            v-for="(item, index) in realJsonData.slice(7)"
             :key="'advanced'+index"
             :attr="item"
             :form="form"
@@ -42,7 +42,7 @@
           <span
             :style="advanced && { float: 'right', overflow: 'hidden' } || {} "
             class="table-page-search-submitButtons">
-            <template v-if="realJsonData.length > 3">
+            <template v-if="realJsonData.length >7">
               <a @click="toggleAdvanced">
                 <span v-show="!advanced"><a-icon type="eye" :style="iconStyle"/>&nbsp;更多条件</span>
                 <span v-show="advanced"><a-icon type="eye-invisible" :style="iconStyle"/>&nbsp;收起更多</span>

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

@@ -5,7 +5,7 @@
     :md="flex.md"
     :lg="flex.lg"
     :xl="flex.xl"
-    :xxl="flex.xxl" >
+    :xxl="flex.xxl">
     <slot></slot>
   </a-col>
 </template>
@@ -21,18 +21,16 @@ export default {
         return {
           xs: 24,
           sm: 24,
-          md: 24,
-          lg: 12,
-          xl: 8,
+          md: 12,
+          lg: 8,
+          xl: 6,
           xxl: 6
         }
       }
     }
   },
   data () {
-    return {
-
-    }
+    return {}
   }
 }
 </script>

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

@@ -310,7 +310,7 @@ export default {
      * @param id 数据标识
      * @param actionType 操作类型
      */
-    action (record, id, actionType,  fun = 'action') {
+    action (record, id, actionType, fun = 'action') {
       this.$emit(fun, record, id, actionType)
     },
     /**

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

@@ -12,6 +12,7 @@
         :for-display="type === 'display'"
         ref="XReportDesign"
         id="printReady"
+        :show-title="showTitle"
         :no-padding="noPadding"
         :no-top-border="noTopBorder"
         :show-images="hasImages"
@@ -41,6 +42,7 @@
           :for-display="type === 'display'"
           :no-padding="noPadding"
           :no-top-border="noTopBorder"
+          :show-title="showTitle"
           ref="XReportDesign"
           id="printReady"
           :show-images="hasImages"
@@ -115,7 +117,11 @@ export default {
     noTopBorder: {
       type: Boolean,
       default: false
-    }
+    },
+    showTitle: {
+      type: Boolean,
+      default: true
+    },
   },
   components: {
     XReportDesign
@@ -167,6 +173,9 @@ export default {
     },
     changeDeepObject (obj, strPath, newVal) {
       const arr = strPath.split('@@@')
+      if (obj[arr[0]] === undefined) {
+        obj = obj.images
+      }
       if (arr.length === 1) {
         obj[arr[0]] = newVal
       } else {

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

@@ -2,6 +2,7 @@
   <div>
     <template v-if="this.activatedConfig.designMode === 'json'">
       <XReportJsonRender
+        :show-title="showTitle"
         :no-padding="noPadding"
         :no-top-border="noTopBorder"
         :config="activatedConfig"/>
@@ -9,7 +10,7 @@
     <template v-else>
       <div :class=" noPadding ? 'reportMainNoPadding' : 'reportMain'" :style="activatedConfig.width > 0 ? ('width:' + activatedConfig.width + 'px') : undefined">
         <!--      大标题      -->
-        <h2 class="reportTitle" v-if="activatedConfig.title" v-html="activatedConfig.title"></h2>
+        <h2 class="reportTitle" v-if="showTitle && activatedConfig.title" v-html="activatedConfig.title"></h2>
         <!--      小标题 / 介乎于标题与表格之间的内容      -->
         <div class="subTitle" v-if="activatedConfig.subTitle">
           <div class="subTitleItems" v-for="(item, itemIndex) in activatedConfig.subTitle" :key="itemIndex">
@@ -182,6 +183,10 @@ export default {
     noTopBorder: {
       type: Boolean,
     default: false
+    },
+    showTitle: {
+      type: Boolean,
+      default: true
     }
   },
   components: {

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

@@ -1,184 +1,188 @@
-<template>
-  <div :class="noPadding ? 'reportMainNoPadding' : 'reportMain'">
-    <table class="reportTable">
-      <tbody class="reportTable">
-        <tr v-if="config.title.type && config.title.type !== ''">
-          <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="12">
-            <template v-if="config.title.type === 'titleKey'">
-              {{ config.data[config.title.value] }}
-            </template>
-            <template v-else-if="config.title.type === 'titleValue'">
-              {{ config.title.value }}
-            </template>
-          </td>
-        </tr>
-        <template v-for="(row, rowIndex) in config.content">
-          <template v-if="row.type === 'jsonKey'">
-            <tr :key="rowIndex">
-              <!--      表头        -->
-              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
-                <template v-if="receivedFunction[rowIndex].labelFunction(config).type === 'key'">
-                  {{ config.data[receivedFunction[rowIndex].labelFunction(config).content] }}
-                </template>
-                <template v-else-if="receivedFunction[rowIndex].labelFunction(config).type === 'value'">
-                  {{ receivedFunction[rowIndex].labelFunction(config).content }}
-                </template>
-              </td>
-              <!--      内容        -->
-              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
-                <template v-if="receivedFunction[rowIndex].valueFunction(config).type === 'key'">
-                  {{ config.data[receivedFunction[rowIndex].valueFunction(config).content] }}
-                </template>
-                <template v-else-if="receivedFunction[rowIndex].valueFunction(config).type === 'value'">
-                  {{ receivedFunction[rowIndex].valueFunction(config).content }}
-                </template>
-                <template v-else-if="receivedFunction[rowIndex].valueFunction(config).type === 'img'">
-                  <template v-for="(img, imgIndex) in receivedFunction[rowIndex].valueFunction(config).content">
-                    <span :key="imgIndex" class="imgText">
-                      <a-icon type="link"/>
-                      <span @click="openImgModal(img)">{{ formatImgName(img) }}</span>
-                      <br/>
-                    </span>
-                  </template>
-                </template>
-              </td>
-            </tr>
-          </template>
-          <template v-else-if="row.type === 'jsonArray'">
-            <tr :key="rowIndex + '' + jsonArrayItemIndex" v-for="(item, jsonArrayItemIndex) in config.data[row.jsonArrayDataIndex]">
-              <!--      表头        -->
-              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
-                <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, item).type === 'value'">
-                  {{ receivedFunction[rowIndex].labelFunction(config, item).content }}
-                </template>
-              </td>
-              <!--      内容        -->
-              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
-                <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, item).type === 'value'">
-                  {{ receivedFunction[rowIndex].valueFunction(config, item).content }}
-                </template>
-              </td>
-            </tr>
-          </template>
-        </template>
-      </tbody>
-    </table>
-    <a-modal
-      title="图片"
-      width="80%"
-      :visible="showImgModal"
-      @ok="handleShowImgOk"
-      @cancel="handleShowImgCancel"
-      :z-index="1001"
-      :destroyOnClose="true">
-      <div style="width: 100%;display: flex;justify-content: center;align-items: center">
-        <img :src="showImageSrc" alt="图片"/>
-      </div>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: 'XReportJsonRender',
-  props: {
-    config: {
-      type: Object,
-      required: true
-    },
-    noPadding: {
-      type: Boolean,
-      default: false
-    },
-    noTopBorder: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      receivedFunction: [],
-      showImgModal: false,
-      showImageSrc: undefined
-    }
-  },
-  methods: {
-    handleShowImgOk () {
-      this.showImgModal = false
-      this.showImageSrc = undefined
-    },
-    handleShowImgCancel () {
-      this.showImgModal = false
-      this.showImageSrc = undefined
-    },
-    openImgModal (img) {
-      this.showImageSrc = img
-      this.showImgModal = true
-    },
-    formatImgName (imgSrc) {
-      return imgSrc.split('/').pop()
-    }
-  },
-  beforeMount () {
-    for (let i = 0; i < this.config.content.length; i++) {
-      this.receivedFunction.push({
-        // eslint-disable-next-line no-eval
-        labelFunction: eval('(' + this.config.content[i].customFunctionForLabel + ')'),
-        // eslint-disable-next-line no-eval
-        valueFunction: eval('(' + this.config.content[i].customFunctionForValue + ')')
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.reportMain {
-  text-align: center;
-  margin: 0 auto;
-  font-size: 16px;
-  color: #000;
-  background-color: #fff;
-  padding: 15px;
-  border-radius: 8px;
-}
-.reportMainNoPadding {
-  text-align: center;
-  margin: 0 auto;
-  font-size: 16px;
-  color: #000;
-  background-color: #fff;
-  border-radius: 8px;
-}
-.reportTitle {
-  font-weight: bold;
-}
-.reportTable {
-  width: 100%;
-  border-collapse: collapse;
-  table-layout:fixed;
-  word-break:break-all;
-}
-.tdWithBorder {
-  border: 1px solid #000;
-  padding: 8px;
-}
-.imgText:hover {
-  color: rgb( 24,144,255);
-  cursor: pointer;
-}
-.tdWithNoTopBorder {
-  border-top-style: none;
-  border-left: 1px solid #000;
-  border-right: 1px solid #000;
-  border-bottom: 1px solid #000;
-  padding: 8px;
-}
-</style>
+<template>
+  <div :class="noPadding ? 'reportMainNoPadding' : 'reportMain'">
+    <table class="reportTable">
+      <tbody class="reportTable">
+        <tr v-if="showTitle && config.title.type && config.title.type !== ''">
+          <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="12">
+            <template v-if="config.title.type === 'titleKey'">
+              {{ config.data[config.title.value] }}
+            </template>
+            <template v-else-if="config.title.type === 'titleValue'">
+              {{ config.title.value }}
+            </template>
+          </td>
+        </tr>
+        <template v-for="(row, rowIndex) in config.content">
+          <template v-if="row.type === 'jsonKey'">
+            <tr :key="rowIndex">
+              <!--      表头        -->
+              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
+                <template v-if="receivedFunction[rowIndex].labelFunction(config).type === 'key'">
+                  {{ config.data[receivedFunction[rowIndex].labelFunction(config).content] }}
+                </template>
+                <template v-else-if="receivedFunction[rowIndex].labelFunction(config).type === 'value'">
+                  {{ receivedFunction[rowIndex].labelFunction(config).content }}
+                </template>
+              </td>
+              <!--      内容        -->
+              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
+                <template v-if="receivedFunction[rowIndex].valueFunction(config).type === 'key'">
+                  {{ config.data[receivedFunction[rowIndex].valueFunction(config).content] }}
+                </template>
+                <template v-else-if="receivedFunction[rowIndex].valueFunction(config).type === 'value'">
+                  {{ receivedFunction[rowIndex].valueFunction(config).content }}
+                </template>
+                <template v-else-if="receivedFunction[rowIndex].valueFunction(config).type === 'img'">
+                  <template v-for="(img, imgIndex) in receivedFunction[rowIndex].valueFunction(config).content">
+                    <span :key="imgIndex" class="imgText">
+                      <a-icon type="link"/>
+                      <span @click="openImgModal(img)">{{ formatImgName(img) }}</span>
+                      <br/>
+                    </span>
+                  </template>
+                </template>
+              </td>
+            </tr>
+          </template>
+          <template v-else-if="row.type === 'jsonArray'">
+            <tr :key="rowIndex + '' + jsonArrayItemIndex" v-for="(item, jsonArrayItemIndex) in config.data[row.jsonArrayDataIndex]">
+              <!--      表头        -->
+              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
+                <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, item).type === 'value'">
+                  {{ receivedFunction[rowIndex].labelFunction(config, item).content }}
+                </template>
+              </td>
+              <!--      内容        -->
+              <td :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'" colspan="6">
+                <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, item).type === 'value'">
+                  {{ receivedFunction[rowIndex].valueFunction(config, item).content }}
+                </template>
+              </td>
+            </tr>
+          </template>
+        </template>
+      </tbody>
+    </table>
+    <a-modal
+      title="图片"
+      width="80%"
+      :visible="showImgModal"
+      @ok="handleShowImgOk"
+      @cancel="handleShowImgCancel"
+      :z-index="1001"
+      :destroyOnClose="true">
+      <div style="width: 100%;display: flex;justify-content: center;align-items: center">
+        <img :src="showImageSrc" alt="图片"/>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'XReportJsonRender',
+  props: {
+    config: {
+      type: Object,
+      required: true
+    },
+    noPadding: {
+      type: Boolean,
+      default: false
+    },
+    noTopBorder: {
+      type: Boolean,
+      default: false
+    },
+    showTitle: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      receivedFunction: [],
+      showImgModal: false,
+      showImageSrc: undefined
+    }
+  },
+  methods: {
+    handleShowImgOk () {
+      this.showImgModal = false
+      this.showImageSrc = undefined
+    },
+    handleShowImgCancel () {
+      this.showImgModal = false
+      this.showImageSrc = undefined
+    },
+    openImgModal (img) {
+      this.showImageSrc = img
+      this.showImgModal = true
+    },
+    formatImgName (imgSrc) {
+      return imgSrc.split('/').pop()
+    }
+  },
+  beforeMount () {
+    for (let i = 0; i < this.config.content.length; i++) {
+      this.receivedFunction.push({
+        // eslint-disable-next-line no-eval
+        labelFunction: eval('(' + this.config.content[i].customFunctionForLabel + ')'),
+        // eslint-disable-next-line no-eval
+        valueFunction: eval('(' + this.config.content[i].customFunctionForValue + ')')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.reportMain {
+  text-align: center;
+  margin: 0 auto;
+  font-size: 16px;
+  color: #000;
+  background-color: #fff;
+  padding: 15px;
+  border-radius: 8px;
+}
+.reportMainNoPadding {
+  text-align: center;
+  margin: 0 auto;
+  font-size: 16px;
+  color: #000;
+  background-color: #fff;
+  border-radius: 8px;
+}
+.reportTitle {
+  font-weight: bold;
+}
+.reportTable {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout:fixed;
+  word-break:break-all;
+}
+.tdWithBorder {
+  border: 1px solid #000;
+  padding: 8px;
+}
+.imgText:hover {
+  color: rgb( 24,144,255);
+  cursor: pointer;
+}
+.tdWithNoTopBorder {
+  border-top-style: none;
+  border-left: 1px solid #000;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  padding: 8px;
+}
+</style>

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

@@ -18,8 +18,8 @@
               {{ cell.text }}
             </template>
           </template>
+          <!--       占位             -->
           <template v-else-if="cell.type === 'placeHolderColumn'">
-            <!--       占位             -->
           </template>
           <template v-else-if="cell.type === 'value'">
             <template v-if="cell.customFunction === undefined">
@@ -60,12 +60,12 @@
             </template>
           </template>
           <template v-else-if="cell.type === 'images'">
-            <template v-for="(img,imgIndex) in getDeepObject(configData.images, cell.dataIndex)">
-              <span :key="imgIndex" style="margin-right: 5%">{{ img.name }}</span>
-            </template>
-            <template v-if="getDeepObject(configData.images, cell.dataIndex).length === 0">
+            <template v-if="getDeepObject(configData.images, cell.dataIndex) === undefined || getDeepObject(configData.images, cell.dataIndex).length === 0">
               <span>无</span>
             </template>
+            <template v-else v-for="(img,imgIndex) in getDeepObject(configData.images, cell.dataIndex)">
+              <span :key="imgIndex" style="margin-right: 5%">{{ img.name }}</span>
+            </template>
           </template>
         </td>
       </template>

package/src/base-client/components/common/XReportSlot/index.md

@@ -1,48 +1,48 @@
-# XReportSlot 暂时废弃
-
-
-动态报表的插槽组件，可以递归使用
-
-
-## 何时使用
-
-> 当需要一个动态生成的报表时
-
-> 一般由XReportDesign嵌套使用，在XReportDesign中判断当前行如果类型是slot，
-> 则递归此组件
-
-引用方式：
-
-```javascript
-import XReportSlot from '@vue2-client/base-client/components/XReportSlot/XReportSlot'
-
-export default {
-    components: {
-      XReportSlot
-    }
-}
-```
-
-
-## API
-
-| 参数              | 说明                       | 类型     | 默认值  |
-|-----------------|--------------------------|--------|------|
-| config | 表格完整配置 | Object | 无（必填） |
-| forDisplay | 是否为展示页 | Boolean | false |
-| slotConfigName | 插槽名 | String | undefined |
-
-## 例子1
-----
-```vue
-<XReportSlot
-  :config="activatedConfig"
-  :slot-config-name="slotConfig"
-  :for-display="forDisplay">
-</XReportSlot>
-```
-## 注意事项
-> slotConfigName如果不填，则展示整个表格。
-> 如果填写，则仅展示插槽中的内容
-
-> 该组件可以递归调用
+# XReportSlot 暂时废弃
+
+
+动态报表的插槽组件，可以递归使用
+
+
+## 何时使用
+
+> 当需要一个动态生成的报表时
+
+> 一般由XReportDesign嵌套使用，在XReportDesign中判断当前行如果类型是slot，
+> 则递归此组件
+
+引用方式：
+
+```javascript
+import XReportSlot from '@vue2-client/base-client/components/XReportSlot/XReportSlot'
+
+export default {
+    components: {
+      XReportSlot
+    }
+}
+```
+
+
+## API
+
+| 参数              | 说明                       | 类型     | 默认值  |
+|-----------------|--------------------------|--------|------|
+| config | 表格完整配置 | Object | 无（必填） |
+| forDisplay | 是否为展示页 | Boolean | false |
+| slotConfigName | 插槽名 | String | undefined |
+
+## 例子1
+----
+```vue
+<XReportSlot
+  :config="activatedConfig"
+  :slot-config-name="slotConfig"
+  :for-display="forDisplay">
+</XReportSlot>
+```
+## 注意事项
+> slotConfigName如果不填，则展示整个表格。
+> 如果填写，则仅展示插槽中的内容
+
+> 该组件可以递归调用