vue2-client 1.12.26 → 1.12.28

package/package.json

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

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

@@ -43,42 +43,44 @@
                 <span class="text-ellipsis">{{ card[config.text] }}</span>
               </a-tooltip>
             </div>
-            <template v-for="(item, bodyIndex) in config.content" v-if="bodyIndex < 6">
-              <div :key="'body' + bodyIndex" class="body-item">
-                <span class="body-item-label">{{ item.label }}：</span>
-                <template v-if="item.type === 'progress'">
-                  <div class="progress">
-                    <div class="progress-bar">
-                      <div class="progress-done" :style="'width:' + card[item.key] * 100 + '%;backgroundColor: ' + determineRatioColor(card[item.key] * 100)"></div>
+            <template v-if="config.content && config.content.length > 0">
+              <template v-for="(item, bodyIndex) in config.content" v-if="bodyIndex < 6">
+                <div :key="'body' + bodyIndex" class="body-item">
+                  <span class="body-item-label">{{ item.label }}：</span>
+                  <template v-if="item.type === 'progress'">
+                    <div class="progress">
+                      <div class="progress-bar">
+                        <div class="progress-done" :style="'width:' + card[item.key] * 100 + '%;backgroundColor: ' + determineRatioColor(card[item.key] * 100)"></div>
+                      </div>
                     </div>
-                  </div>
-                  <div class="progress-num">{{ card[item.key] * 100 }}%</div>
-                </template>
-                <template v-else-if="item.type === 'custom' && tableColumns">
-                  <!-- 根据 tableColumns 显示自定义内容 -->
-                  <span v-for="column in tableColumns" v-if="column.dataIndex === item.key" :key="column.dataIndex">
-                    <template v-if="column.slotType === 'badge'">
-                      <x-badge
-                        :service-name="serviceName"
-                        :env="env"
-                        :dataCard="true"
-                        :badge-key="column.slotKeyMap"
-                        :value="card[item.key]" />
-                    </template>
-                    <template v-else>
-                      <slot :name="column.slots.customRender">{{ card[item.key] }}</slot>
-                    </template>
-                  </span>
-                </template>
-                <template v-else>
-                  <span class="body-item-value">{{ card[item.key] }}</span>
-                </template>
-              </div>
-              <a-divider
-                v-if="bodyIndex !== config.content.length - 1"
-                dashed
-                :key="'body' + bodyIndex + 'after'"
-                class="body-split" />
+                    <div class="progress-num">{{ card[item.key] * 100 }}%</div>
+                  </template>
+                  <template v-else-if="item.type === 'custom' && tableColumns">
+                    <!-- 根据 tableColumns 显示自定义内容 -->
+                    <span v-for="column in tableColumns" v-if="column.dataIndex === item.key" :key="column.dataIndex">
+                      <template v-if="column.slotType === 'badge'">
+                        <x-badge
+                          :service-name="serviceName"
+                          :env="env"
+                          :dataCard="true"
+                          :badge-key="column.slotKeyMap"
+                          :value="card[item.key]" />
+                      </template>
+                      <template v-else>
+                        <slot :name="column.slots.customRender">{{ card[item.key] }}</slot>
+                      </template>
+                    </span>
+                  </template>
+                  <template v-else>
+                    <span class="body-item-value">{{ card[item.key] }}</span>
+                  </template>
+                </div>
+                <a-divider
+                  v-if="bodyIndex !== config.content.length - 1"
+                  dashed
+                  :key="'body' + bodyIndex + 'after'"
+                  class="body-split" />
+              </template>
             </template>
           </div>
           <!-- 下方按钮 -->

package/src/base-client/components/common/XPrint/Demo.vue

@@ -17,7 +17,7 @@ export default {
       console.log('打印成功')
     },
     test1 () {
-      this.$printB('DiagnosisCertificate', { title: '测试浏览器打印' })
+      this.$printB('iot_bill_template', { condition: '21971601' })
     },
     test2 () {
       this.$printC('DiagnosisCertificate', { title: 'DiagnosisCertificate' })

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

@@ -4,83 +4,38 @@
     <a-card v-if="showSkeleton">
       <a-skeleton active/>
     </a-card>
-    <template v-if="noPadding">
-      <!--   主体表格   -->
-      <XReportDesign
-        @updateImg="updateImg"
-        @selectRow="selectRow"
-        @slotRendered="slotRendered"
-        v-if="scanFinish"
-        :show-img-in-cell="showImgInCell"
-        :img-prefix="imgPrefix"
-        :use-oss-for-img="useOssForImg"
-        :display-only="displayOnly"
-        :config="type === 'display' ? originalConfig : activeConfig"
-        :slot-config-name="type === 'display' ? undefined : activatedSlotName"
-        :for-display="type === 'display'"
-        ref="XReportDesign"
-        :server-name="serverName"
-        :env="env"
-        :show-title="showTitle"
-        :no-padding="noPadding"
-        :no-top-border="noTopBorder"
-        :show-images="hasImages"
-        :image-list="imageList">
-      </XReportDesign>
-
-      <a-row type="flex" justify="end" v-if="showSaveButton">
-        <a-space>
-          <a-button @click="saveConfig">
-            提交
-          </a-button>
-          <a-button @click="cancelConfig">
-            取消
-          </a-button>
-        </a-space>
-      </a-row>
-
-    </template>
-    <template v-else>
-      <!--  用以包裹整个页面  -->
-      <div v-if="!showSkeleton">
-        <!--   切换菜单   -->
-        <a-radio-group
-          v-model="type"
-          default-value="a"
-          button-style="solid"
-          @change="tabChanged"
-          v-show="!onlyDisplay && editMode">
-          <a-radio-button value="design" v-if="!onlyDisplay">
-            设计
-          </a-radio-button>
-          <a-radio-button value="display" style="border-radius: 0">
-            预览
-          </a-radio-button>
-        </a-radio-group>
-        <!--   主体表格   -->
-        <XReportDesign
-          v-if="scanFinish"
-          @updateImg="updateImg"
-          @selectRow="selectRow"
-          @slotRendered="slotRendered"
-          :show-img-in-cell="showImgInCell"
-          :img-prefix="imgPrefix"
-          :use-oss-for-img="useOssForImg"
-          :display-only="displayOnly"
-          :config="type === 'display' ? originalConfig : activeConfig"
-          :slot-config-name="type === 'display' ? undefined : activatedSlotName"
-          :for-display="type === 'display'"
-          :no-padding="noPadding"
-          :no-top-border="noTopBorder"
-          :show-title="showTitle"
-          ref="XReportDesign"
-          :server-name="serverName"
-          :env="env"
-          :show-images="hasImages"
-          :image-list="imageList">
-        </XReportDesign>
-      </div>
-    </template>
+    <!--   主体表格   -->
+    <XReportDesign
+      @updateImg="updateImg"
+      @selectRow="selectRow"
+      @slotRendered="slotRendered"
+      v-if="scanFinish"
+      :show-img-in-cell="showImgInCell"
+      :img-prefix="imgPrefix"
+      :use-oss-for-img="useOssForImg"
+      :display-only="displayOnly"
+      :config="type === 'display' ? originalConfig : activeConfig"
+      :slot-config-name="type === 'display' ? undefined : activatedSlotName"
+      :for-display="type === 'display'"
+      ref="XReportDesign"
+      :server-name="serverName"
+      :env="env"
+      :show-title="showTitle"
+      :no-padding="noPadding"
+      :no-top-border="noTopBorder"
+      :show-images="hasImages"
+      :image-list="imageList">
+    </XReportDesign>
+    <a-row type="flex" justify="end" v-if="showSaveButton">
+      <a-space>
+        <a-button @click="saveConfig">
+          提交
+        </a-button>
+        <a-button @click="cancelConfig">
+          取消
+        </a-button>
+      </a-space>
+    </a-row>
     <!-- 弹出框 -->
     <x-add-report
       :env="env"
@@ -96,11 +51,9 @@
 
 <script>
 // 转PDF用
-import HtmlToPdf from '@vue2-client/utils/htmlToPDF'
 import { mapState } from 'vuex'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import XReportDesign from './XReportDesign.vue'
-import { printElement } from './print'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 
 // import XAddReport from '@vue2-client/base-client/components/common/XAddReport'
@@ -277,6 +230,7 @@ export default {
     return {
       runLogic: runLogic,
       openDialog: this.openDialog,
+      openDrawer: this.openDrawer,
       registerComponent: this.registerComponent,
       getComponentByName: this.getComponentByName,
       getParentComponentByName: this.getComponentByName,
@@ -532,60 +486,6 @@ export default {
 
       return count === total
     },
-    // 切换了标签页
-    tabChanged (key) {
-      this.scanFinish = false
-      this.originalConfig.data = { ...this.originalConfig.data, ...this.config.data }
-      this.config.data = this.originalConfig.data
-      if (this.type === 'display') {
-        const tempDataKeys = Object.keys(this.activeConfig.tempData)
-        tempDataKeys.forEach(key => {
-          this.changeDeepObject(this.activeConfig.data, key, this.activeConfig.tempData[key])
-        })
-        let count = 0
-        this.imageList = []
-        const keys = Object.keys(this.config.data.images)
-        keys.forEach(key => {
-          if (this.config.data.images[key].length > 0) {
-            this.imageList = [...this.imageList, ...this.config.data.images[key]]
-            count++
-          }
-        })
-        this.hasImages = count > 0
-      } else {
-        this.hasImages = false
-      }
-      this.$nextTick(() => {
-        this.scanFinish = true
-      })
-    },
-    // 获取当前日期，为保存文件命名用
-    getDate () {
-      const currentDate = new Date()
-
-      const year = currentDate.getFullYear()
-      const month = String(currentDate.getMonth() + 1).padStart(2, '0')
-      const day = String(currentDate.getDate()).padStart(2, '0')
-
-      const formattedDate = `${year}_${month}_${day}`
-
-      return formattedDate
-    },
-    // 打印
-    printDocument () {
-      // x-report
-      const printContent = window.rawDocument.getElementById('printReady')
-      printElement(printContent)
-      this.$message.success('操作成功！')
-    },
-    // 导出PDF
-    exportPDF () {
-      const date = this.getDate()
-      let title = this.config.title
-      title = title.replace(/<[^>]+>/g, '')
-      const fileName = date + '' + title
-      HtmlToPdf.getPdf(fileName, '#printReady')
-    },
     // 用于分割配置中的colums，将需要处理的数组提取出来
     formatConfigRow () {
       for (let i = 0; i < this.config.columns.length; i++) {
@@ -992,10 +892,6 @@ export default {
         })
       }
     },
-    onSubmit () {
-      console.log('this.table_selectedRowKeys', this.table_selectedRowKeys)
-      console.log('this.table_selectedRows', this.table_selectedRows)
-    },
   },
   beforeMount () {
     // 如果只是展示
@@ -1005,16 +901,19 @@ export default {
     }
     // 如果有本地配置，优先使用本地配置
     if (this.localConfig) {
-      // 如果配置是json渲染器
-      if (this.localConfig.designMode === 'json') {
-        this.config = this.localConfig
-        if (this.configData !== undefined) {
-          this.config.data = this.configData
-        }
-        this.jsonConfigInit()
-      } else {
-        // 如果配置是普通渲染器
-        this.config = this.localConfig
+      // 如果配置是普通渲染器
+      this.config = this.localConfig
+      if (this.configData !== undefined) {
+        this.config.data = this.configData
+      }
+      if (this.config.data.images === undefined) {
+        this.config.data.images = {}
+      }
+      this.configInit()
+    } else {
+      // 如果本地配置没有值，则从琉璃中获取
+      getConfigByName(this.configName, this.serverName, res => {
+        this.config = JSON.parse(JSON.stringify(res))
         if (this.configData !== undefined) {
           this.config.data = this.configData
         }
@@ -1022,25 +921,6 @@ export default {
           this.config.data.images = {}
         }
         this.configInit()
-      }
-    } else {
-      // 如果本地配置没有值，则从琉璃中获取
-      getConfigByName(this.configName, this.serverName, res => {
-        this.config = JSON.parse(JSON.stringify(res))
-        if (this.config.designMode === 'json') {
-          if (this.configData !== undefined) {
-            this.config.data = this.configData
-          }
-          this.jsonConfigInit()
-        } else {
-          if (this.configData !== undefined) {
-            this.config.data = this.configData
-          }
-          if (this.config.data.images === undefined) {
-            this.config.data.images = {}
-          }
-          this.configInit()
-        }
       }, this.env === 'dev')
     }
   },

package/src/base-client/components/common/XReportGrid/XReportDemo.vue

@@ -9,8 +9,6 @@
         :show-img-in-cell="true"
         :display-only="true"
         :edit-mode="false"
-        :show-save-button="false"
-        :no-padding="true"
         :dont-format="true"/>
     </a-card>
   </div>