eoss-ui 0.5.81-beta10 → 0.5.81-beta12

package/packages/data-table/src/main.vue

@@ -12,6 +12,9 @@
     <es-toolbar
       v-if="showToolbar"
       ref="toolbar"
+      :class="{
+        'es-table-toolbar-plus': mode == 'plus'
+      }"
       v-bind="{
         contents: toolbars,
         showLabel: showLabel,
@@ -35,7 +38,10 @@
     <div
       style="styles"
       class="es-data-table-content"
-      :class="border == 'none' ? 'es-table-border-none' : ''"
+      :class="{
+        'es-table-border-none': border == 'none',
+        'es-table-plus': mode == 'plus'
+      }"
       ref="esTableContent"
       v-if="show"
     >
@@ -153,9 +159,11 @@
       </div>
       <es-pagination
         v-else-if="page"
+        ref="pagination"
         v-bind="config"
         class="es-table-page"
-        :style="{ 'text-align': page.position || 'center' }"
+        :position="page.position"
+        :style="{ 'text-align': page.position }"
         v-on="{
           change: sizeChange,
           current: currentChange,
@@ -166,7 +174,7 @@
       <slot name="dialog"></slot>
       <slot name="other"></slot>
     </div>
-    <sizer ref="sizer" :data="theads"></sizer>
+    <sizer ref="sizer" :data="theads" :mode="mode"></sizer>
   </component>
 </template>
 <script>
@@ -177,6 +185,8 @@ import sizer from './sizer.vue';
 import util from 'eoss-ui/src/utils/util';
 import bus from 'eoss-ui/src/utils/bus';
 import qs from 'qs';
+const dataTableMode =
+  util.win.top.dataTableMode || util.win.dataTableMode || 'default';
 export default {
   name: 'EsDataTable',
   inheritAttrs: false,
@@ -202,6 +212,10 @@ export default {
     }
   },
   props: {
+    mode: {
+      type: String,
+      default: dataTableMode
+    },
     service: String,
     loading: {
       type: Boolean,
@@ -449,7 +463,11 @@ export default {
       config: {
         pageNum: 1,
         pageSize: 20,
-        totalCount: 0
+        totalCount: 0,
+        layout:
+          this.mode == 'plus'
+            ? 'total, sizes, prev, pager, next, jumper'
+            : undefined
       },
       searchWhere: {},
       advanceWhere: {},
@@ -675,7 +693,7 @@ export default {
       }
     },
     zoom: {
-      handler(val) {
+      handler() {
         if (
           this.tableHeight != 'auto' &&
           this.tableHeight !== false &&
@@ -707,7 +725,7 @@ export default {
     },
     param: {
       deep: true,
-      handler(val) {
+      handler() {
         this.getTableData();
       }
     },
@@ -717,12 +735,6 @@ export default {
       handler(val) {
         if (typeof val === 'object') {
           this.config = util.extend({}, this.config, val);
-        } else {
-          this.config = {
-            pageNum: 1,
-            pageSize: 20,
-            totalCount: 0
-          };
         }
       }
     },
@@ -1008,6 +1020,7 @@ export default {
               this.list = results.data || results.records || [];
               this.config.totalCount =
                 results.count || results.total || results.totalCount;
+              this.config.pageCount = results.pageCount;
               this.getOptions(this.theadData);
             }
           } else {
@@ -1096,6 +1109,7 @@ export default {
             }
             this.config.totalCount =
               results.count || results.total || results.totalCount;
+            this.config.pageCount = results.pageCount;
             this.checked &&
               this.$nextTick(() => {
                 this.checkSelect(this.checked);
@@ -1539,8 +1553,11 @@ export default {
                   parseInt(util.getStyle(ele, 'margin-bottom'), 10);
               }
             }
-            height -= this.showToolbar ? 45 : 0;
-            height -= this.page === false ? 0 : 46;
+            height -= this.showToolbar
+              ? this.$refs.toolbar.$el.offsetHeight
+              : 0;
+            height -=
+              this.page === false ? 0 : this.$refs.pagination.$el.offsetHeight;
             height -= this.title ? this.$refs.title.offsetHeight : 0;
             height -= parseInt(
               util.getStyle(this.$refs.esTableContent, 'padding-top'),

package/packages/data-table/src/sizer.vue

@@ -7,6 +7,7 @@
       row-key="id"
       default-expand-all
       height="500px"
+      :mode="mode"
       :data="theads"
       :thead="thead"
       :tree-props="{ children: 'childHead' }"
@@ -26,6 +27,7 @@ import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'Sizer',
   props: {
+    mode: String,
     data: Array
   },
   computed: {
@@ -89,6 +91,7 @@ export default {
   },
   mounted() {
     this.newThead = util.extend(true, [], this.data);
+    console.log(this.mode, 90909);
   },
   methods: {
     show() {

package/packages/dialog/src/main.vue

@@ -363,9 +363,10 @@ export default {
       full: false,
       method: 'router',
       sizes: {
-        sm: { width: '900px', height: '400px' },
-        md: { width: '900px', height: '600px' },
-        lg: { width: '900px', height: '800px' },
+        mini: { width: '800px', height: '400px' },
+        sm: { width: '960px', height: '500px' },
+        md: { width: '1060px', height: '600px' },
+        lg: { width: '1200px', height: '800px' },
         full: { width: '100%', height: '100%' }
       },
       show: this.visible,

package/packages/flow-group/src/main.vue

@@ -11,7 +11,7 @@
         <template v-for="(items, indexs) in tabs">
           <el-tab-pane
             v-if="handleHide(items.hide)"
-            :key="indexs"
+            :key="items.id || indexs"
             :immediate="items.label === '流程图' ? false : items.immediate"
             :name="String(indexs)"
             :class="{ 'es-flex-vertical': items.average }"

package/packages/form/src/main.vue

@@ -4223,7 +4223,8 @@ export default {
         return {};
       }
     },
-    active: Array
+    active: Array,
+    resetActive: Boolean
   },
   data() {
     return {
@@ -4448,7 +4449,11 @@ export default {
               }
             });
             if (!this.active || (this.active && !this.active.length)) {
-              this.activeNames = names;
+              if (this.resetActive) {
+                this.activeNames = names;
+              } else if (this.activeNames.length == 0) {
+                this.activeNames = names;
+              }
             }
             this.content = contents;
             if (this.content.length === 1) {

package/packages/handler/src/main.vue

@@ -22,7 +22,7 @@
             >当前<span
               class="es-online-num"
               :class="{ 'es-pointer': onlineList }"
-              @click="onlineList ? handleClick({ type: 'online' }) : ''"
+              @click.stop="onlineList ? handleClick({ type: 'online' }) : ''"
               >{{ online }}</span
             >人在线</span
           >
@@ -92,7 +92,7 @@
           class="es-handler-icon"
           :title="item.title"
           :class="item.icon"
-          @click="handleClick(item)"
+          @click.stop="handleClick(item)"
         ></div>
       </el-badge>
       <div
@@ -100,7 +100,7 @@
         class="es-handler-icon"
         :title="item.title"
         :class="item.icon"
-        @click="handleClick(item)"
+        @click.stop="handleClick(item)"
       ></div>
     </li>
   </ul>

package/packages/main/src/default/index.vue

@@ -192,8 +192,11 @@
     </es-dialog>
     <notice :data="sysMsg" :winopen="winopen" @opened="handleOpened"></notice>
     <es-dialog :title="dialog.title" :visible.sync="dialog.show" size="md">
+      <template v-if="dialog.title == '查看在线人员' && !dialog.src">
+        <online></online>
+      </template>
       <iframe
-        v-if="dialog.show"
+        v-else-if="dialog.show"
         width="100%"
         height="100%"
         frameborder="0"
@@ -207,6 +210,7 @@ import userinfo from './userinfo.vue';
 import settings from './settings.vue';
 import message from './message.vue';
 import notice from './notice.vue';
+import online from '../public/online.vue';
 import {
   //authCenter,
   wss,
@@ -233,7 +237,8 @@ export default {
     userinfo,
     settings,
     message,
-    notice
+    notice,
+    online
   },
   props: {
     jobScrollbar: Boolean,
@@ -534,9 +539,7 @@ export default {
     },
     onlineUrl() {
       if (this.onlineView) {
-        return typeof this.onlineView == 'string'
-          ? this.onlineView
-          : '/main/sysuseronline/list.dhtml';
+        return typeof this.onlineView == 'string' ? this.onlineView : '';
       }
       return false;
     }
@@ -1659,13 +1662,11 @@ export default {
           this.showUserInfo = true;
           break;
         case 'online':
-          if (this.onlineUrl) {
-            this.dialog = {
-              title: '查看在线人员',
-              show: true,
-              src: this.onlineUrl
-            };
-          }
+          this.dialog = {
+            title: '查看在线人员',
+            show: true,
+            src: this.onlineUrl
+          };
           break;
         case 'notice':
           this.showMsg = !this.showMsg;

package/packages/main/src/public/online.vue

@@ -0,0 +1,90 @@
+<template>
+  <es-data-table
+    numbers
+    :url="sysuseronline"
+    :thead="thead"
+    page
+  ></es-data-table>
+</template>
+
+<script>
+import { userOnline } from 'eoss-ui/src/config/api.js';
+export default {
+  name: 'Online',
+  components: {},
+  props: {
+    sysuseronline: {
+      type: String,
+      default: userOnline
+    }
+  },
+  data() {
+    return {
+      thead: [
+        {
+          title: '单位',
+          field: 'orgName',
+          align: 'center',
+          minWidth: 120
+        },
+        {
+          title: '部门',
+          field: 'depName',
+          align: 'center',
+          minWidth: 120
+        },
+        {
+          title: '姓名',
+          field: 'userName',
+          align: 'center',
+          width: 120
+        },
+        {
+          title: '职务',
+          field: 'position',
+          align: 'center',
+          width: 120
+        },
+        {
+          title: '账号',
+          field: 'loginName',
+          align: 'center',
+          width: 120
+        },
+        {
+          title: '登录时间',
+          field: 'loginDate',
+          align: 'center',
+          width: 150
+        },
+        {
+          title: '登录次数',
+          field: 'freQuency',
+          align: 'center',
+          width: 110
+        },
+        {
+          title: '登录方式',
+          field: 'loginModel',
+          align: 'center',
+          width: 100,
+          render: (h, params) => {
+            let {
+              row: { loginModel }
+            } = params;
+            let types = ['普通登录', 'CA登录', '手机登录'];
+            return h('span', {}, [types[loginModel] || types[0]]);
+          }
+        }
+      ]
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {}
+};
+</script>
+
+<style lang="scss" scoped></style>

package/packages/main/src/simplicity/apps.vue

@@ -116,7 +116,7 @@
             background
             layout="total,prev, pager, next"
             total-text="共 {total} 专项业务系统"
-            :page-size="appSize"
+            :page-size="bsSize"
             :total="business.length"
             @current-change="
               (res) => {
@@ -169,8 +169,8 @@
             layout="total,prev, pager, next"
             total-text="共 {total} 系统设置"
             hide-on-single-page
-            :page-size="appSize"
-            :total="business.length"
+            :page-size="sysSize"
+            :total="systems.length"
             @current-change="
               (res) => {
                 this.handleChange(res, 2);

package/packages/main/src/simplicity/handler.vue

@@ -6,7 +6,11 @@
     </div>
     <div class="es-simplicity-online">
       当前
-      <span class="es-simplicity-online-num" :class="{ 'es-pointer': isClick }">
+      <span
+        class="es-simplicity-online-num"
+        @click="isClick ? handleClick({ type: 'online' }) : ''"
+        :class="{ 'es-pointer': isClick }"
+      >
         {{ online }}
       </span>
       人在线
@@ -63,7 +67,7 @@ export default {
       default() {
         return {
           type: 'index',
-          open: doorIndex,
+          link: doorIndex,
           icon: 'es-icon-home',
           title: '门户'
         };

package/packages/main/src/simplicity/index.vue

@@ -102,6 +102,7 @@
     <div class="es-simplicity-main">
       <!-- 菜单 -->
       <sub-menu
+        :mode="mode"
         :visible.sync="showMenu"
         :closed.sync="fold"
         :size="menuWidth"
@@ -291,8 +292,11 @@
 
       <!-- 公用弹窗 -->
       <es-dialog :title="dialog.title" :visible.sync="dialog.show" size="md">
+        <template v-if="dialog.title == '查看在线人员' && !dialog.src">
+          <online></online>
+        </template>
         <iframe
-          v-if="dialog.show"
+          v-else-if="dialog.show"
           width="100%"
           height="100%"
           frameborder="0"
@@ -305,6 +309,7 @@
 </template>
 
 <script>
+const dataTableMode = util.win.dataTableMode || 'default';
 import avatar from './avatar.vue';
 import handler from './handler.vue';
 import subMenu from './sub-menu.vue';
@@ -314,6 +319,7 @@ import message from './message.vue';
 import notice from './notice.vue';
 import settings from './settings.vue';
 import routerPage from './router-page.vue';
+import online from '../public/online.vue';
 import {
   wss,
   logout,
@@ -386,9 +392,15 @@ export default {
     message,
     notice,
     settings,
-    routerPage
+    routerPage,
+    online
   },
   props: {
+    //模式
+    mode: {
+      type: String,
+      default: dataTableMode
+    },
     appCode: String,
     //logo
     logo: String,
@@ -600,9 +612,7 @@ export default {
     //在线人数列表地址
     onlineUrl() {
       if (this.onlineView) {
-        return typeof this.onlineView == 'string'
-          ? this.onlineView
-          : '/main/sysuseronline/list.dhtml';
+        return typeof this.onlineView == 'string' ? this.onlineView : '';
       }
       return false;
     }
@@ -921,13 +931,6 @@ export default {
                     if (!this.appCode) {
                       this.tabs = [this.homePage];
                       this.activeName = '0';
-                      // if (this.homePage.method == 'router') {
-                      //   let params = util.getParams({ url: this.homePage.url });
-                      //   this.$router.push({
-                      //     path: this.homePage.path,
-                      //     query: { ...this.$parent.params, ...params }
-                      //   });
-                      // }
                     }
                   }
                 } else if (
@@ -943,13 +946,6 @@ export default {
                     let tab = this.setIframeType(obj);
                     this.tabs.push(tab);
                     this.activeName = tab.id;
-                    // if (tab.method == 'router') {
-                    //   let params = util.getParams({ url: tab.url });
-                    //   this.$router.push({
-                    //     path: tab.path,
-                    //     query: { ...this.$parent.params, ...params }
-                    //   });
-                    // }
                   }
                 }
               }
@@ -975,6 +971,9 @@ export default {
      **/
     setIframeType(res) {
       let { url } = res;
+      if (url) {
+        res.refresh = false;
+      }
       let urls = url.split('?');
       if (urls[0].indexOf('.js') > 1 && !isIE) {
         res.method = 'wujie';
@@ -1019,7 +1018,9 @@ export default {
           }
         }
       }
-      res.refresh = true;
+      if (Object.prototype.hasOwnProperty.call(res, 'refresh')) {
+        res.refresh = true;
+      }
       return res;
     },
     /**
@@ -1217,6 +1218,9 @@ export default {
      * @date 2024年9月7日
      **/
     handlerClickApps(res) {
+      if (res.permission === false) {
+        return false;
+      }
       let i = util.indexOfObj(this.newApps, res, 'id');
       if (i == -1) {
         this.newApps.push(res);
@@ -1263,12 +1267,20 @@ export default {
                   let tab = this.setIframeType(obj);
                   this.tabs.push(tab);
                   this.activeName = tab.id;
+                } else {
+                  if (obj.method == 'iframe') {
+                    obj.url = util.handlerUrl(obj.url);
+                  }
                 }
               } else {
                 let tab = this.setIframeType(res);
                 this.tabs.push(tab);
                 this.activeName = tab.id;
               }
+            } else {
+              if (res.method == 'iframe') {
+                res.url = util.handlerUrl(res.url);
+              }
             }
           }
         }
@@ -1284,6 +1296,10 @@ export default {
             if (i == -1) {
               let tab = this.setIframeType(subMenus);
               this.tabs.push(tab);
+            } else {
+              if (subMenus.method == 'iframe') {
+                subMenus.url = util.handlerUrl(subMenus.url);
+              }
             }
           }
         }
@@ -1326,6 +1342,10 @@ export default {
       if (i == -1) {
         let tab = this.setIframeType(res);
         this.tabs.push(tab);
+      } else {
+        if (res.method == 'iframe') {
+          res.url = util.handlerUrl(res.url);
+        }
       }
     },
 
@@ -1377,7 +1397,8 @@ export default {
      * @date 2024年9月7日
      **/
     handleRefresh() {
-      let tab = this.tabs[this.activeName];
+      let i = util.indexOfObj(this.tabs, this.activeName, 'id');
+      let tab = this.tabs[i];
       if (tab.method === 'iframe') {
         tab.url = util.handlerUrl(tab.url);
       }
@@ -1475,13 +1496,11 @@ export default {
           case 'online':
             this.showMsg = false;
             this.showSet = false;
-            if (this.onlineUrl) {
-              this.dialog = {
-                title: '查看在线人员',
-                show: true,
-                src: this.onlineUrl
-              };
-            }
+            this.dialog = {
+              title: '查看在线人员',
+              show: true,
+              src: this.onlineUrl
+            };
             break;
           case 'notice':
             this.showMsg = !this.showMsg;

package/packages/main/src/simplicity/sub-menu.vue

@@ -11,7 +11,10 @@
     :wrapperClosable="false"
     :visible.sync="show"
   >
-    <div class="es-simplicity-menus">
+    <div
+      class="es-simplicity-menus"
+      :class="{ 'es-simplicity-menus-plus': mode == 'plus' }"
+    >
       <div class="es-simplicity-menus-box" :style="{ width: width + 'px' }">
         <div class="es-simplicity-menus-title">
           <span class="es-simplicity-menus-title-text" v-if="!fold">{{
@@ -97,6 +100,7 @@ export default {
   name: 'SubMenu',
   components: { MenuList },
   props: {
+    mode: String,
     title: String,
     active: String,
     closed: Boolean,

package/packages/pagination/src/main.vue

@@ -1,6 +1,7 @@
 <template>
   <el-pagination
     class="es-pagination"
+    :class="{ 'es-pagination-complete': isComplete && position != 'center' }"
     v-bind="$attrs"
     :current-page="pageNum"
     :page-size="pageSize"
@@ -18,10 +19,28 @@
   </el-pagination>
 </template>
 <script>
+import util from 'eoss-ui/src/utils/util';
+const paginationLayout =
+  util.win.top.tableLayout ||
+  util.win.tableLayout ||
+  'prev, pager, next, sizes, total';
 export default {
   name: 'EsPagination',
   inheritAttrs: false,
+  computed: {
+    isComplete() {
+      return (
+        this.layout.indexOf('total') > -1 &&
+        this.layout.indexOf('sizes') > -1 &&
+        this.layout.indexOf('prev') > -1 &&
+        this.layout.indexOf('pager') > -1 &&
+        this.layout.indexOf('next') > -1 &&
+        this.layout.indexOf('jumper') > -1
+      );
+    }
+  },
   props: {
+    position: String,
     // 当前页码
     pageNum: {
       type: Number,
@@ -46,7 +65,7 @@ export default {
     // 自定义排版
     layout: {
       type: String,
-      default: 'prev, pager, next, sizes, total'
+      default: paginationLayout
     },
     // 只有一页时是否隐藏
     hideOnSinglePage: {