Преглед изворни кода

修复列表fixed元素错位bug

cfort пре 1 година
родитељ
комит
098f7bbbfc

+ 32 - 52
public/config.js

@@ -1,6 +1,6 @@
 (function (global) {
-    const BASE_URL = "http://dev1.local/";
-    const PUBLIC_URL = "http://dev1.local/";
+    const BASE_URL = 'http://dev1.local/'
+    const PUBLIC_URL = 'http://dev1.local/'
     global.__IBPS_CONFIG__ = {
         // 是否启用配置
         ENABLE_CONFIG: true,
@@ -9,90 +9,70 @@
         //公网路径
         PUBLIC_URL,
         //  api
-        BASE_API: `${BASE_URL}ibps`,
+        BASE_API: `${ BASE_URL }ibps`,
         // GATEWAY API
-        BASE_GATEWAY_API: `${BASE_URL}ibps`,
+        BASE_GATEWAY_API: `${ BASE_URL }ibps`,
         // WEBSOCKET api
-        BASE_WEBSOCKET_API: "ws://192.168.2.161:28888",
+        BASE_WEBSOCKET_API: 'ws://192.168.2.161:28888',
         // report api
-        BASE_REPORT_API: `${BASE_URL}raqsoft`,
+        BASE_REPORT_API: `${ BASE_URL }raqsoft`,
         // seal api
-        BASE_SEAL_API: "http://120.77.249.241:9999/",
+        BASE_SEAL_API: 'http://120.77.249.241:9999/',
 
         //是否单体应用
         SINGLE: false,
-        //是否启用多域名
+        //是否启用多域名 
         MULTIPLE_DOMAIN: false,
         // 域名
-        API_DOMAIN_NAMES: [
-            "a1",
-            "a2",
-            "a3",
-            "a4",
-            "a5",
-            "a6",
-            "a7",
-            "a8",
-            "a9",
-            "a10",
-            "a11",
-            "a12",
-            "a13",
-            "a14",
-            "a15",
-            "a16",
-            "a17",
-            "a18",
-            "a19",
-            "a20",
-        ],
+        API_DOMAIN_NAMES: ['a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'a8', 'a9', 'a10', 'a11', 'a12', 'a13', 'a14', 'a15', 'a16', 'a17', 'a18', 'a19', 'a20'],
 
         // 后台配置的Token key
-        HEADER_TOKEN_KEY: "X-Authorization-access_token",
+        HEADER_TOKEN_KEY: 'X-Authorization-access_token',
         // 后台配置的Token key(url使用的key)
-        FORM_TOKEN_KEY: "access_token",
+        FORM_TOKEN_KEY: 'access_token',
         // 系统ID
-        HEADER_SYSTEM_ID: "X-Authorization-systemid",
+        HEADER_SYSTEM_ID: 'X-Authorization-systemid',
         //  租户ID
-        HEADER_TENANT_ID: "X-Authorization-tenantid",
+        HEADER_TENANT_ID: 'X-Authorization-tenantid',
 
         //================认证中心=====================
         //申请应用时分配的AppKey
-        CLIENT_ID: "ibps",
+        CLIENT_ID: 'ibps',
         //申请应用时分配的AppSecret
-        CLIENT_SECRET: "58b65297-3467-0859-8337-8cbaf81ef68a",
+        CLIENT_SECRET: '58b65297-3467-0859-8337-8cbaf81ef68a',
         //授权方式:authorization_code :授权码方式,  password_credentials:密码模式
-        GRANT_TYPE: "authorization_code",
+        GRANT_TYPE: 'authorization_code',
 
         //================Token存储=====================
         //TOKEN存储方式  default:默认,domain:域名限制
-        TOKEN_STORE: "default",
+        TOKEN_STORE: 'default',
         //TOKEN 存储域名限制,TOKEN_STORE为domain有效,
-        TOKEN_DOMAIN: "bpmhome.cn",
+        TOKEN_DOMAIN: 'bpmhome.cn',
         //TOKEN存储的前缀  default:默认,加前缀和版本。 custom:自定义,写的输出什么
-        TOKEN_STORE_PREFIX: "default",
+        TOKEN_STORE_PREFIX: 'default',
         //TOKEN存储方式 key
-        TOKEN_STORE_KEY: "token",
+        TOKEN_STORE_KEY: 'token',
         //刷新TOKEN存储方式 key
-        REFRESH_TOKEN_STORE_KEY: "refresh_token",
+        REFRESH_TOKEN_STORE_KEY: 'refresh_token',
 
         //转换数据
-        TRANSFER_DATA: "transfer",
+        TRANSFER_DATA: 'transfer',
 
         //国际化配置
-        I18N_LOCALE: "zh-CN",
-        I18N_FALLBACK_LOCALE: "zh-CN",
+        I18N_LOCALE: 'zh-CN',
+        I18N_FALLBACK_LOCALE: 'zh-CN',
 
         //================其他配置=====================
         //element 颜色
-        ELEMENT_COLOR: "#409EFF",
+        ELEMENT_COLOR: '#409EFF',
         // 系统版本
-        VERSION: "1.0.0",
+        VERSION: '1.0.0',
         // 系统名称
-        SYSTEM_NAME: "金通医学实验室标准化数智化管理平台",
+        SYSTEM_NAME: '金通医学实验室标准化数智化管理平台',
         // 润乾报表根目录
-        REPORT_PATH: "金通医学实验室管理系统",
+        REPORT_PATH: '金通医学实验室管理系统',
         // 是否显示开启明文SQL
-        SHOW_PLAINTEXT: false,
-    };
-})(window);
+        SHOW_PLAINTEXT: false
+    }
+
+})(window)

+ 18 - 1
src/business/platform/data/templaterender/templates/list.vue

@@ -24,7 +24,7 @@
             :selection-all="selectionAll"
             :default-sort-type="dataTemplate && dataTemplate.datasetType === 'view' ? 'none' : 'underline'"
             @display-field-change="handleDisplayField"
-            @header-dragend="handleHeaderDragend"
+            @header-dragend="handleRefreshTable"
             @selection-change="handleSelectionChange"
             @action-event="handleAction"
             @sort-change="handleSortChange"
@@ -553,7 +553,23 @@ export default {
             JTemplate.cleanEvents()
         }
     },
+    created () {
+        window.onresize = () => {
+            this.handleRefreshTable()
+        }
+    },
+    updated () {
+        this.handleRefreshTable()
+    },
     methods: {
+        handleRefreshTable () {
+            this.$nextTick(() => {
+                const table = this.$refs.crud
+                if (table && table.doLayout) {
+                    table.doLayout()
+                }
+            })
+        },
         getDatabaseType () {
             getDatabaseType().then((response) => {
                 this.databaseType = response.data
@@ -764,6 +780,7 @@ export default {
                         }
                     }, 100)()
                 }
+                this.handleRefreshTable()
             }).catch(() => {
                 this.loading = false
             })

+ 16 - 5
src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -499,14 +499,25 @@ export default {
         // 注销当前表格保存在window[this.mainCode+'TableRefs']的this
         this.destoryTable()
     },
+    created () {
+        window.onresize = () => {
+            this.handleRefreshTable()
+        }
+    },
+    updated () {
+        this.handleRefreshTable()
+    },
     mounted () {
-        this.$nextTick(() => {
-            if (this.$refs.elTable) {
-                this.$refs.elTable.doLayout()
-            }
-        })
+        this.handleRefreshTable()
     },
     methods: {
+        handleRefreshTable () {
+            this.$nextTick(() => {
+                if (this.$refs.elTable) {
+                    this.$refs.elTable.doLayout()
+                }
+            })
+        },
         getShowData,
         indexMethod (index) {
             return (this.currentPage - 1) * this.pageSize + index + 1

+ 1 - 0
src/components/ibps-crud/index.vue

@@ -115,6 +115,7 @@
                 @row-contextmenu="handleRowContextmenu"
                 @row-dblclick="handleRowDblclick"
                 @header-click="handleHeaderClick"
+                @header-dragend="handleHeaderDragend"
                 @header-contextmenu="handleHeaderContextmenu"
             >
                 <template slot="empty">

+ 36 - 57
src/constant.js

@@ -2,84 +2,63 @@
  * 常量配置
  *
  */
-import env from "@/env";
+import env from '@/env'
 /**
  * 读取静态配置
  * @private
  */
-const __IBPS_CONFIG__ = window.__IBPS_CONFIG__ || {};
+const __IBPS_CONFIG__ = window.__IBPS_CONFIG__ || {}
 
-export default __IBPS_CONFIG__;
+export default __IBPS_CONFIG__
 
-const enableConfig = __IBPS_CONFIG__.ENABLE_CONFIG || false;
+const enableConfig = __IBPS_CONFIG__.ENABLE_CONFIG || false
 
 /**
  * 接口服务器
  * @type {*|string}
  */
-export const BASE_URL = enableConfig
-    ? __IBPS_CONFIG__.BASE_URL || env.VUE_APP_BASE_URL
-    : env.VUE_APP_BASE_URL;
-export const PUBLIC_URL = enableConfig
-    ? __IBPS_CONFIG__.PUBLIC_URL || env.PUBLIC_URL
-    : env.PUBLIC_URL;
-export const BASE_API = enableConfig
-    ? __IBPS_CONFIG__.BASE_API || env.VUE_APP_BASE_API
-    : env.VUE_APP_BASE_API;
-export const BASE_GATEWAY_API = enableConfig
-    ? __IBPS_CONFIG__.BASE_GATEWAY_API || env.VUE_APP_BASE_GATEWAY_API
-    : env.VUE_APP_BASE_GATEWAY_API;
-export const BASE_WEBSOCKET = enableConfig
-    ? __IBPS_CONFIG__.BASE_WEBSOCKET_API || env.VUE_APP_BASE_WEBSOCKET
-    : env.VUE_APP_BASE_WEBSOCKET;
-export const BASE_REPORT_API = enableConfig
-    ? __IBPS_CONFIG__.BASE_REPORT_API || env.VUE_APP_BASE_REPORT_API
-    : env.VUE_APP_BASE_REPORT_API;
-export const BASE_SEAL_API = __IBPS_CONFIG__.BASE_SEAL_API || "";
+export const BASE_URL = enableConfig ? (__IBPS_CONFIG__.BASE_URL || env.VUE_APP_BASE_URL) : env.VUE_APP_BASE_URL
+export const PUBLIC_URL = enableConfig ? (__IBPS_CONFIG__.PUBLIC_URL || env.VUE_APP_BASE_URL) : env.VUE_APP_BASE_URL
+export const BASE_API = enableConfig ? (__IBPS_CONFIG__.BASE_API || env.VUE_APP_BASE_API) : env.VUE_APP_BASE_API
+export const BASE_GATEWAY_API = enableConfig ? (__IBPS_CONFIG__.BASE_GATEWAY_API || env.VUE_APP_BASE_GATEWAY_API) : env.VUE_APP_BASE_GATEWAY_API
+export const BASE_WEBSOCKET = enableConfig ? (__IBPS_CONFIG__.BASE_WEBSOCKET_API || env.VUE_APP_BASE_WEBSOCKET) : env.VUE_APP_BASE_WEBSOCKET
+export const BASE_REPORT_API = enableConfig ? (__IBPS_CONFIG__.BASE_REPORT_API || env.VUE_APP_BASE_REPORT_API) : env.VUE_APP_BASE_REPORT_API
+export const BASE_SEAL_API = __IBPS_CONFIG__.BASE_SEAL_API || ''
 
-export const SINGLE = __IBPS_CONFIG__.SINGLE || false;
-export const API_DOMAIN_NAMES = __IBPS_CONFIG__.API_DOMAIN_NAMES || [];
-export const MULTIPLE_DOMAIN = __IBPS_CONFIG__.MULTIPLE_DOMAIN || false;
+export const SINGLE = __IBPS_CONFIG__.SINGLE || false
+export const API_DOMAIN_NAMES = __IBPS_CONFIG__.API_DOMAIN_NAMES || []
+export const MULTIPLE_DOMAIN = __IBPS_CONFIG__.MULTIPLE_DOMAIN || false
 
 // ================认证中心=====================
 
-export const GRANT_TYPE = __IBPS_CONFIG__.GRANT_TYPE || "";
-export const CLIENT_ID = __IBPS_CONFIG__.CLIENT_ID || "";
-export const CLIENT_SECRET = __IBPS_CONFIG__.CLIENT_SECRET || "";
+export const GRANT_TYPE = __IBPS_CONFIG__.GRANT_TYPE || ''
+export const CLIENT_ID = __IBPS_CONFIG__.CLIENT_ID || ''
+export const CLIENT_SECRET = __IBPS_CONFIG__.CLIENT_SECRET || ''
 
 // ================请求头=====================
-export const HEADER_TOKEN_KEY =
-    __IBPS_CONFIG__.HEADER_TOKEN_KEY || "X-Authorization-access_token";
-export const FORM_TOKEN_KEY = __IBPS_CONFIG__.TOKEN_KEY || "access_token";
-export const HEADER_SYSTEM_ID =
-    __IBPS_CONFIG__.HEADER_SYSTEM_ID || "X-Authorization-systemid";
-export const HEADER_TENANT_ID =
-    __IBPS_CONFIG__.HEADER_TENANT_ID || "X-Authorization-tenantid";
-export const TENANT_ID = __IBPS_CONFIG__.TENANT_ID || "tenant_id";
+export const HEADER_TOKEN_KEY = __IBPS_CONFIG__.HEADER_TOKEN_KEY || 'X-Authorization-access_token'
+export const FORM_TOKEN_KEY = __IBPS_CONFIG__.TOKEN_KEY || 'access_token'
+export const HEADER_SYSTEM_ID = __IBPS_CONFIG__.HEADER_SYSTEM_ID || 'X-Authorization-systemid'
+export const HEADER_TENANT_ID = __IBPS_CONFIG__.HEADER_TENANT_ID || 'X-Authorization-tenantid'
+export const TENANT_ID = __IBPS_CONFIG__.TENANT_ID || 'tenant_id'
 
 // ================Cookies 存储=====================
-export const UUID_KEY = __IBPS_CONFIG__.UUID_KEY || "uuid";
-export const LANG_KEY = __IBPS_CONFIG__.LANG_KEY || "lang";
+export const UUID_KEY = __IBPS_CONFIG__.UUID_KEY || 'uuid'
+export const LANG_KEY = __IBPS_CONFIG__.LANG_KEY || 'lang'
 
-export const TOKEN_STORE = __IBPS_CONFIG__.TOKEN_STORE || "default";
-export const TOKEN_DOMAIN = __IBPS_CONFIG__.TOKEN_DOMAIN || "bpmhome.cn";
-export const TOKEN_STORE_PREFIX =
-    __IBPS_CONFIG__.TOKEN_STORE_PREFIX || "default";
-export const TOKEN_STORE_KEY = __IBPS_CONFIG__.TOKEN_STORE_KEY || "token";
-export const REFRESH_TOKEN_STORE_KEY =
-    __IBPS_CONFIG__.REFRESH_TOKEN_STORE_KEY || "refresh_token";
+export const TOKEN_STORE = __IBPS_CONFIG__.TOKEN_STORE || 'default'
+export const TOKEN_DOMAIN = __IBPS_CONFIG__.TOKEN_DOMAIN || 'bpmhome.cn'
+export const TOKEN_STORE_PREFIX = __IBPS_CONFIG__.TOKEN_STORE_PREFIX || 'default'
+export const TOKEN_STORE_KEY = __IBPS_CONFIG__.TOKEN_STORE_KEY || 'token'
+export const REFRESH_TOKEN_STORE_KEY = __IBPS_CONFIG__.REFRESH_TOKEN_STORE_KEY || 'refresh_token'
 
-export const TRANSFER_DATA = __IBPS_CONFIG__.TRANSFER_DATA || "transfer";
+export const TRANSFER_DATA = __IBPS_CONFIG__.TRANSFER_DATA || 'transfer'
 
-export const I18N_LOCALE = __IBPS_CONFIG__.I18N_LOCALE || "zh-CN";
-export const I18N_FALLBACK_LOCALE =
-    __IBPS_CONFIG__.I18N_FALLBACK_LOCALE || "zh-CN";
+export const I18N_LOCALE = __IBPS_CONFIG__.I18N_LOCALE || 'zh-CN'
+export const I18N_FALLBACK_LOCALE = __IBPS_CONFIG__.I18N_FALLBACK_LOCALE || 'zh-CN'
 
-export const ELEMENT_COLOR = __IBPS_CONFIG__.ELEMENT_COLOR || "#409EFF";
-export const SYSTEM_NAME =
-    __IBPS_CONFIG__.SYSTEM_NAME || "金通医学实验室标准化数智化管理平台";
-export const REPORT_PATH =
-    __IBPS_CONFIG__.REPORT_PATH || "金通医学实验室管理系统";
+export const ELEMENT_COLOR = __IBPS_CONFIG__.ELEMENT_COLOR || '#409EFF'
+export const SYSTEM_NAME = __IBPS_CONFIG__.SYSTEM_NAME || '金通医学实验室标准化数智化管理平台'
+export const REPORT_PATH = __IBPS_CONFIG__.REPORT_PATH || '金通医学实验室管理系统'
 // 是否显示明文SQL,开发环境默认显示
-export const SHOW_PLAINTEXT =
-    __IBPS_CONFIG__.SHOW_PLAINTEXT || env.NODE_ENV === "development";
+export const SHOW_PLAINTEXT = __IBPS_CONFIG__.SHOW_PLAINTEXT || env.NODE_ENV === 'development'