cloud-web-corejs 1.0.54-dev.730 → 1.0.54-dev.732

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.730",
+  "version": "1.0.54-dev.732",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/table/index.js

@@ -371,6 +371,44 @@ function getSelfConfig() {
   return selfConfig;
 }
 
+function applyTableFeatureDisabled(result, that) {
+  let userState = that?.$store?.state?.user || {};
+  let sortDisabled = userState.tableSortDisabled === true;
+  let filterDisabled = userState.tableFilterDisabled === true;
+  if (!sortDisabled && !filterDisabled) return;
+
+  let handleColumns = (columns) => {
+    (columns || []).forEach((column) => {
+      if (sortDisabled) {
+        column.sortable = false;
+      }
+      if (filterDisabled) {
+        column.filterType = false;
+        delete column.filters;
+        delete column.filterRender;
+        delete column.filterMethod;
+      }
+      if (column.children && column.children.length) {
+        handleColumns(column.children);
+      }
+    });
+  };
+
+  handleColumns(result.columns);
+  if (sortDisabled) {
+    if (result.proxyConfig) result.proxyConfig.sort = false;
+    if (result.sortConfig) {
+      result.sortConfig.showIcon = false;
+      delete result.sortConfig.defaultSort;
+      delete result.sortConfig.sortMethod;
+    }
+  }
+  if (filterDisabled) {
+    if (result.proxyConfig) result.proxyConfig.filter = false;
+    if (result.filterConfig) result.filterConfig.showIcon = false;
+  }
+}
+
 function initColumnDefaulAttrs(columns, opts) {
   let tableConfig = configUtil.tableConfig || {};
   let selfConfig = getSelfConfig();
@@ -802,6 +840,7 @@ function initOption(opts) {
   }
 
   result = configUtil.extendDeeply(defaultOptions, config);
+  applyTableFeatureDisabled(result, that);
 
   let pageSize = result.pagerConfig.pageSize;
   let pageSizes = result.pagerConfig.pageSizes;

package/src/store/modules/user.js

@@ -6,6 +6,7 @@ import {
   languageSettingListPage,
   getFileServerInfo,
   getLoginConfig,
+  getLogicParamValue,
 } from "../../api/user";
 import { getToken, setToken, clearToken } from "../../utils/auth";
 import router, { resetRouter } from "@base/router";
@@ -44,6 +45,8 @@ state = {
   userFlag: null,
   fileServerInfo: null,
   loginConfig: null,
+  tableSortDisabled: false,
+  tableFilterDisabled: false,
   utcTransformOffset: 0,// 时区偏移量，单位：小时
 };
 
@@ -96,6 +99,12 @@ mutations = {
   SET_LOGIN_CONFIG: (state, loginConfig) => {
     state.loginConfig = loginConfig;
   },
+  SET_TABLE_SORT_DISABLED: (state, tableSortDisabled) => {
+    state.tableSortDisabled = tableSortDisabled;
+  },
+  SET_TABLE_FILTER_DISABLED: (state, tableFilterDisabled) => {
+    state.tableFilterDisabled = tableFilterDisabled;
+  },
   SET_UTC_TRANSFORM_OFFSET: (state, utcTransformOffset) => {
     state.utcTransformOffset = utcTransformOffset;
   },
@@ -144,7 +153,7 @@ actions = {
   },
 
   // get user info
-  getInfo2({ commit, state }) {
+  getInfo2({ commit, state, dispatch }) {
     return new Promise((resolve, reject) => {
       configUtil
         .getInfo({
@@ -208,6 +217,7 @@ actions = {
                   }).catch((error) => {
                     console.error(error);
                   }),
+                  dispatch("initTableFeatureDisabled"),
                 ];
                 if (settingConfig.utcTransformEnabled) {
                   requests.push(
@@ -310,6 +320,8 @@ actions = {
       commit("SET_LOGIN_ACCOUNT", "");
       commit("SET_COMPANY_CODE", "");
       commit("SET_USER_ID", "");
+      commit("SET_TABLE_SORT_DISABLED", false);
+      commit("SET_TABLE_FILTER_DISABLED", false);
       configUtil.clearToken();
       configUtil.resetRouter();
       sessionStorage.removeItem("easyweb");
@@ -346,6 +358,25 @@ actions = {
   },
   changeCompanyInfo({ commit, dispatch }, row) {
     commit("SET_COMPANY_CODE", row.companyCode);
+    return dispatch("initTableFeatureDisabled");
+  },
+  initTableFeatureDisabled({ commit }) {
+    commit("SET_TABLE_SORT_DISABLED", false);
+    commit("SET_TABLE_FILTER_DISABLED", false);
+    return getLogicParamValue({
+      data: { paramCode: "tableSortFilterDisabled" },
+      failMsg: false,
+      errorMsg: false,
+      success: (res) => {
+        let values = typeof res?.objx === "string" ? res.objx.split(",") : [];
+        let sortValue = values.length > 0 ? values[0].trim() : "";
+        let filterValue = values.length > 1 ? values[1].trim() : "";
+        commit("SET_TABLE_SORT_DISABLED", sortValue === "1");
+        commit("SET_TABLE_FILTER_DISABLED", filterValue === "1");
+      },
+    }).catch((error) => {
+      console.error(error);
+    });
   },
   initLoginConfig({ commit, dispatch }, loginConfig) {
     return new Promise((resolve, reject) => {

package/src/views/user/home/default.vue

@@ -81,7 +81,7 @@
           <div slot="header" class="clearfix">
             <span style="float: left">
               <i class="el-icon-chat-line-round ico"></i>
-              {{ $t1("待办事项") }}
+              {{ $t1("待审批事项") }}
             </span>
             <el-tooltip
               class="item"

package/src/views/user/system_notice/infoDialog.vue

@@ -12,6 +12,7 @@
     @close="dialogClose"
     v-el-drag-dialog
     v-el-dialog-center
+    :fullscreen="true"
   >
     <div class="n-list">
       <div class="item" v-for="(item, index) in page.records" :key="index" :class="{ on: currentIndex == index }"
@@ -140,7 +141,7 @@ export default {
       this.currentRow = item;
       this.handleRead(index)
     },
-    handleRead(index, callback) {
+    handleRead(index, callback) {
       if(this.page.records.length <= index)return
       let row = this.page.records[index];
       if (row.readed !== 1) {