vue2-client 1.8.422 → 1.8.424

package/package.json

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

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

@@ -1,19 +1,18 @@
 <template>
   <div id="test">
-    <!--    <XReport-->
-    <!--      @updateImg="updateImg"-->
-    <!--      ref="main"-->
-    <!--      :use-oss-for-img="false"-->
-    <!--      config-name="skinTestExecuActionCover"-->
-    <!--      server-name="af-his"-->
-    <!--      :show-img-in-cell="true"-->
-    <!--      :display-only="displayOnly"-->
-    <!--      :edit-mode="false"-->
-    <!--      :show-save-button="false"-->
-    <!--      :dont-format="true"/>-->
-    <x-add-report
-      ref="xAddReport"
-    />
+    <XReport
+      ref="main"
+      :use-oss-for-img="false"
+      config-name="ces"
+      server-name="af-his"
+      :show-img-in-cell="true"
+      :display-only="true"
+      :edit-mode="false"
+      :show-save-button="false"
+      :dont-format="true"/>
+    <!--    <x-add-report-->
+    <!--      ref="xAddReport"-->
+    <!--    />-->
   </div>
 </template>
 
@@ -29,11 +28,11 @@ export default {
     XReport, XAddReport
   },
   mounted () {
-    this.$refs.xAddReport.init({
-      configName: 'skinTestExecuActionCover',
-      selectedId: '11111',
-      mixinData: {}
-    })
+    // this.$refs.xAddReport.init({
+    //   configName: 'skinTestExecuActionCover',
+    //   selectedId: '11111',
+    //   mixinData: {}
+    // })
   },
   data () {
     return {

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

@@ -20,10 +20,17 @@
               @click="edit()">
               <a-icon :style="iconStyle" type="edit"/>修改
             </a-button>
-            <a-button v-if="!buttonState || buttonState.delete && buttonRendering('delete')" :disabled="!isDelete" type="danger" @click="deleteItem">
+            <a-button
+              v-if="!buttonState || buttonState.delete && buttonRendering('delete')"
+              :disabled="!isDelete"
+              type="danger"
+              @click="deleteItem">
               <a-icon :style="iconStyle" type="delete"/>删除
             </a-button>
-            <a-button v-if="!buttonState || buttonState.import && buttonRendering('import')" type="dashed" @click="importData">
+            <a-button
+              v-if="!buttonState || buttonState.import && buttonRendering('import')"
+              type="dashed"
+              @click="importData">
               <a-icon :style="iconStyle" type="import"/>导入
             </a-button>
             <a-dropdown v-if="!buttonState || buttonState.export && buttonRendering('export')">
@@ -132,15 +139,15 @@
           </span>
           <!-- 两位小数 -->
           <span v-else-if="item.slotType === 'towDecimal'" :key="'towDecimal-' + c_index">
-            {{ numberFormat(text,2) }}
+            {{ numberFormat(text, 2) }}
           </span>
           <!-- 四位小数 -->
           <span v-else-if="item.slotType === 'fourDecimal'" :key="'fourDecimal-' + c_index">
-            {{ numberFormat(text,4) }}
+            {{ numberFormat(text, 4) }}
           </span>
           <!-- 整数 -->
           <span v-else-if="item.slotType === 'int'" :key="'int-' + c_index">
-            {{ numberFormat(text,0) }}
+            {{ numberFormat(text, 0) }}
           </span>
           <!-- 操作列(action) -->
           <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
@@ -455,12 +462,7 @@ export default {
         tableColumns,
         buttonState,
         buttonPermissions,
-        editButtonStateData = [
-            {
-              buttonName: '测试',
-              functionName: '测试函数'
-            }
-          ],
+        editButtonStateData = [],
         title,
         form,
         serviceName,
@@ -608,6 +610,7 @@ export default {
       this.$nextTick(() => {
         setTimeout(() => {
           const curDocument = window?.rawDocument || document
+          const innerHeight = window?.rawWindow?.innerHeight || window.innerHeight || 0
           if (typeof extraHeight == 'undefined') {
             //  默认底部分页32 + 边距48
             extraHeight = 48 + 32
@@ -642,10 +645,13 @@ export default {
             if (modalElement) {
               const modalRect = modalElement.getBoundingClientRect()
               // 48 是 modal 通常的边距 32 是分页
-              const innerHeight = window?.rawWindow?.innerHeight || window.innerHeight || 0
               extraHeight = innerHeight - modalRect.bottom + 32 + 48
             }
           }
+          if (innerHeight - (tHeaderBottom + extraHeight) < 0) {
+            this.scrollYHeight = 'calc(100vh - 31rem)'
+            return
+          }
           // 窗体高度-表格内容顶部的高度-表格内容底部的高度
           // this.scrollYHeight = document.body.clientHeight - tHeaderBottom - extraHeight
           this.scrollYHeight = `calc(100vh - ${tHeaderBottom + extraHeight}px)`

package/src/router/async/router.map.js

@@ -78,7 +78,7 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          component: () => import('@vue2-client/base-client/components/common/XLicensePlate/XLicensePlateDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           meta: {
               // 菜单中不显示
               invisible: true,