eoss-ui 0.5.81-beta10 → 0.5.81-beta11

package/lib/theme-chalk/pagination.css

@@ -1 +1 @@
-.es-pagination .el-select .el-input{width:56px}.es-pagination:not(.is-background) .btn-next,.es-pagination:not(.is-background) .btn-prev,.es-pagination:not(.is-background) li{background-color:transparent!important}.es-pagination button,.es-pagination span:not([class*=suffix]){height:26px;line-height:26px}.es-pagination .el-input__suffix{line-height:26px}
+.es-pagination{text-align:center}.es-pagination .el-select .el-input{width:56px}.es-pagination:not(.is-background) .btn-next,.es-pagination:not(.is-background) .btn-prev,.es-pagination:not(.is-background) li{background-color:transparent!important}.es-pagination button,.es-pagination span:not([class*=suffix]){height:26px;line-height:26px}.es-pagination .el-input__suffix{line-height:26px}.es-pagination.es-pagination-complete{text-align:right}.es-pagination.es-pagination-complete .el-pagination__total{float:left}

package/lib/tips.js

@@ -3269,6 +3269,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return scanCodeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return codeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doAssistanceQrLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return userOnline; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return initUserSet; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserInfo; });
@@ -3339,7 +3340,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return endFlowHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return handleInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dc", function() { return wss; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getPresetCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getPresetNodeInfo; });
@@ -3397,6 +3398,7 @@ var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证
 var doAssistanceQrLogin = '/sso2/signIn/auth/doAssistanceQrLogin'; // 二级身份验证-验证码验证
 
 // 框架
+var userOnline = 'sys/v1/mecpSys/userOnlineListJson.dhtml'; // 在线人数列表
 var mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 var initUserSet = '/main2/main/initUserSet'; // 获取用户信息
 var updateUserInfo = '/main2/main/updateUserInfo'; // 更新用户信息

package/lib/tree-group.js

@@ -3269,6 +3269,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return scanCodeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return codeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doAssistanceQrLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return userOnline; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return initUserSet; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserInfo; });
@@ -3339,7 +3340,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return endFlowHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return handleInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dc", function() { return wss; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getPresetCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getPresetNodeInfo; });
@@ -3397,6 +3398,7 @@ var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证
 var doAssistanceQrLogin = '/sso2/signIn/auth/doAssistanceQrLogin'; // 二级身份验证-验证码验证
 
 // 框架
+var userOnline = 'sys/v1/mecpSys/userOnlineListJson.dhtml'; // 在线人数列表
 var mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 var initUserSet = '/main2/main/initUserSet'; // 获取用户信息
 var updateUserInfo = '/main2/main/updateUserInfo'; // 更新用户信息

package/lib/tree.js

@@ -3269,6 +3269,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return scanCodeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return codeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doAssistanceQrLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return userOnline; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return initUserSet; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserInfo; });
@@ -3339,7 +3340,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return endFlowHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return handleInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dc", function() { return wss; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getPresetCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getPresetNodeInfo; });
@@ -3397,6 +3398,7 @@ var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证
 var doAssistanceQrLogin = '/sso2/signIn/auth/doAssistanceQrLogin'; // 二级身份验证-验证码验证
 
 // 框架
+var userOnline = 'sys/v1/mecpSys/userOnlineListJson.dhtml'; // 在线人数列表
 var mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 var initUserSet = '/main2/main/initUserSet'; // 获取用户信息
 var updateUserInfo = '/main2/main/updateUserInfo'; // 更新用户信息

package/lib/upload.js

@@ -3267,6 +3267,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return scanCodeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return codeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doAssistanceQrLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return userOnline; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return initUserSet; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserInfo; });
@@ -3337,7 +3338,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return endFlowHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return handleInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dc", function() { return wss; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getPresetCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getPresetNodeInfo; });
@@ -3395,6 +3396,7 @@ var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证
 var doAssistanceQrLogin = '/sso2/signIn/auth/doAssistanceQrLogin'; // 二级身份验证-验证码验证
 
 // 框架
+var userOnline = 'sys/v1/mecpSys/userOnlineListJson.dhtml'; // 在线人数列表
 var mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 var initUserSet = '/main2/main/initUserSet'; // 获取用户信息
 var updateUserInfo = '/main2/main/updateUserInfo'; // 更新用户信息

package/lib/wujie.js

@@ -3269,6 +3269,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return scanCodeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return codeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doAssistanceQrLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return userOnline; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return initUserSet; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserInfo; });
@@ -3339,7 +3340,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return endFlowHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return handleInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dc", function() { return wss; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getPresetCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getPresetNodeInfo; });
@@ -3397,6 +3398,7 @@ var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证
 var doAssistanceQrLogin = '/sso2/signIn/auth/doAssistanceQrLogin'; // 二级身份验证-验证码验证
 
 // 框架
+var userOnline = 'sys/v1/mecpSys/userOnlineListJson.dhtml'; // 在线人数列表
 var mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 var initUserSet = '/main2/main/initUserSet'; // 获取用户信息
 var updateUserInfo = '/main2/main/updateUserInfo'; // 更新用户信息

package/lib/wxlogin.js

@@ -3269,6 +3269,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return scanCodeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return codeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doAssistanceQrLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return userOnline; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return initUserSet; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserInfo; });
@@ -3339,7 +3340,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return endFlowHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return handleInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dc", function() { return wss; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getPresetCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getPresetNodeInfo; });
@@ -3397,6 +3398,7 @@ var codeRetrialAuth = '/sso2/retrialAuth/codeRetrialAuth'; // 二级身份验证
 var doAssistanceQrLogin = '/sso2/signIn/auth/doAssistanceQrLogin'; // 二级身份验证-验证码验证
 
 // 框架
+var userOnline = 'sys/v1/mecpSys/userOnlineListJson.dhtml'; // 在线人数列表
 var mainConfig = '/main2/main/mainConfig'; // 获取主页面配置
 var initUserSet = '/main2/main/initUserSet'; // 获取用户信息
 var updateUserInfo = '/main2/main/updateUserInfo'; // 更新用户信息

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.81-beta10",
+  "version": "0.5.81-beta11",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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

@@ -155,7 +155,8 @@
         v-else-if="page"
         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,

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>
       人在线

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

@@ -291,8 +291,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"
@@ -314,6 +317,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,7 +390,8 @@ export default {
     message,
     notice,
     settings,
-    routerPage
+    routerPage,
+    online
   },
   props: {
     appCode: String,
@@ -600,9 +605,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 +924,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 +939,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 +964,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 +1011,9 @@ export default {
           }
         }
       }
-      res.refresh = true;
+      if (Object.prototype.hasOwnProperty.call(res, 'refresh')) {
+        res.refresh = true;
+      }
       return res;
     },
     /**
@@ -1217,6 +1211,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 +1260,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 +1289,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 +1335,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 +1390,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 +1489,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;