vue2-client 1.6.11 → 1.6.13

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.6.13 -2023-02-13 @苗艳强**
+- 调整页面样式
+
+**1.6.12 -2023-01-16 @江超**
+- 修复v4环境下新增和修改异常的问题
+
 **1.6.11 -2023-01-12 @苗艳强**
 - 修复树形选择框值为数字类型时无法选中问题
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.6.11",
+  "version": "1.6.13",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -266,6 +266,7 @@ export default {
           // 交由父级处理
           this.$emit('onSubmit', {
             businessType: this.businessType,
+            serviceName: this.serviceName,
             realForm: realForm,
             currUserName: this.currUser.name
           }, () => {

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

@@ -241,7 +241,7 @@ export default {
         businessType: res.businessType,
         operator: res.currUserName
       }
-      addOrModify(requestParameters, this.serviceName).then(data => {
+      addOrModify(requestParameters, res.serviceName).then(data => {
         this.$message.success(res.businessType + '成功！')
         this.refreshTable(res.businessType === '新增')
         // commit

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

@@ -251,13 +251,12 @@ export default {
           totalWidth = totalWidth + 180
         }
       }
-      const width = document.documentElement.clientWidth
-      if (width >= 1600) {
-        this.scrollYHeight = 429
-      } else if (width >= 1200) {
-        this.scrollYHeight = 390
+      // 设置表格高度
+      const height = document.documentElement.clientHeight
+      if (height >= 1070) {
+        this.scrollYHeight = 'calc(100vh - 526px)'
       } else {
-        this.scrollYHeight = 343
+        this.scrollYHeight = 'calc(100vh - 398px)'
       }
       // 横向滚动长度大于所有宽度，才能实现固定表头
       this.scrollXWidth = totalWidth

package/src/layouts/AdminLayout.vue

@@ -20,7 +20,7 @@
     <a-layout class="admin-layout-main beauty-scroll">
       <admin-header :class="[{'fixed-tabs': fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" :style="headerStyle" :menuData="headMenuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
       <a-layout-header :class="['virtual-header', {'fixed-tabs' : fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" v-show="fixedHeader"></a-layout-header>
-      <a-layout-content class="admin-layout-content" :style="`min-height: ${minHeight}px;`">
+      <a-layout-content class="admin-layout-content">
         <div style="position: relative">
           <slot></slot>
         </div>
@@ -158,7 +158,7 @@ export default {
     .admin-layout-content{
       padding: 24px;
       /*overflow-x: hidden;*/
-      /*min-height: calc(100vh - 64px - 122px);*/
+      min-height: calc(100vh - 64px - 1px);
     }
     .setting{
       background-color: @primary-color;