eoss-ui 0.5.81-beta1 → 0.5.81-beta11

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

@@ -6,7 +6,7 @@
     ref="component"
     v-loading="tableLoading"
     element-loading-background="rgba(0, 0, 0, 0.65)"
-    :model="tag === 'div' ? '' : datas"
+    :model="tag === 'div' ? '' : list"
     :element-loading-text="tableLoadingText"
   >
     <es-toolbar
@@ -57,7 +57,7 @@
           dragSort: dragSort,
           dragSortClass: dragSortIcon
         }"
-        :data.sync="datas"
+        :data.sync="list"
         v-on="{
           ...$listeners,
           'row-click': rowClick,
@@ -149,13 +149,14 @@
       </el-table>
       <div v-if="infiniteScroll" class="es-table-page es-loading-page">
         <span>共{{ config.totalCount }}条，</span>
-        <span>已加载{{ datas.length }}条</span>
+        <span>已加载{{ list.length }}条</span>
       </div>
       <es-pagination
         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,
@@ -582,6 +583,11 @@ export default {
         return this.data;
       },
       set(val) {
+        if (this.list && this.list.length) {
+          this.$nextTick(() => {
+            this.list = val;
+          });
+        }
         this.$emit('update:data', val);
         return val;
       }
@@ -646,18 +652,12 @@ export default {
       this.resetHeight();
       this.doLayout();
     },
-    // data: {
-    //   deep: true,
-    //   handler(val) {
-    //     if (
-    //       this.page &&
-    //       typeof this.page === 'object' &&
-    //       !Object.prototype.hasOwnProperty.call(this.page, 'totalCount')
-    //     ) {
-    //       this.config.totalCount = val.length - this.lose;
-    //     }
-    //   }
-    // },
+    data: {
+      deep: true,
+      handler() {
+        this.list = this.setData();
+      }
+    },
     page() {
       this.resetHeight();
       this.doLayout();
@@ -688,7 +688,7 @@ export default {
       }
     },
     checked(newVal) {
-      this.datas.length && this.checkSelect(newVal);
+      this.list.length && this.checkSelect(newVal);
     },
     thead: {
       deep: true,
@@ -732,6 +732,7 @@ export default {
         this.$refs.oaTable &&
           this.$refs.oaTable.resetScroll &&
           this.$refs.oaTable.resetScroll(0, 0);
+        this.list = this.setData();
       }
     },
     height: {
@@ -770,10 +771,36 @@ export default {
     this.chekOpenTotalArea();
   },
   mounted() {
-    this.datas.length && this.checkSelect(this.checked);
+    if (this.data.length) {
+      this.list = this.setData();
+    }
+    this.list.length && this.checkSelect(this.checked);
     this.resetHeight();
+    if (util.win.top != util.win.self) {
+      util.win.onresize = debounce(500, this.resetHeight);
+    }
   },
   methods: {
+    setData() {
+      if (
+        this.page &&
+        ((typeof this.page === 'object' &&
+          (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') ||
+            this.page.totalCount == 0)) ||
+          this.page === true)
+      ) {
+        this.config.totalCount = this.data.length - this.lose;
+      }
+      if (this.page && this.data.length > this.config.pageSize) {
+        return this.data.filter((item, index) => {
+          return (
+            index > (this.config.pageNum - 1) * this.config.pageSize - 1 &&
+            index < this.config.pageNum * this.config.pageSize
+          );
+        });
+      }
+      return this.data;
+    },
     getRequestKey(config) {
       const { method, url, params, data } = config;
       return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
@@ -951,7 +978,7 @@ export default {
             if (util.isObject(row)) {
               this.$refs.oaTable.toggleRowSelection(row, true);
             } else
-              this.datas.forEach((item) => {
+              this.list.forEach((item) => {
                 if (item[this.checkedKey] === row) {
                   this.$refs.oaTable.toggleRowSelection(item, true);
                   return;
@@ -1061,9 +1088,8 @@ export default {
               );
               this.config.pageNum += 1;
             } else {
+              this.list = results.data || results.records || results.list;
               this.$nextTick(() => {
-                this.list =
-                  results.data || results.records || results.list || [];
                 this.$refs.oaTable &&
                   this.$refs.oaTable.resetScroll &&
                   this.$refs.oaTable.resetScroll(0, 0);
@@ -1130,14 +1156,14 @@ export default {
       this.$refs.oaTable.sort(prop, order);
     },
     formBlur(data) {
-      this.$emit('blur', data, this.datas);
+      this.$emit('blur', data, this.list);
     },
     formFocus(data) {
-      this.$emit('focus', data, this.datas);
+      this.$emit('focus', data, this.list);
     },
     formChange(data) {
-      this.$emit('edit', data, this.datas);
-      this.$emit('change', data, this.datas);
+      this.$emit('edit', data, this.list);
+      this.$emit('change', data, this.list);
     },
     handleAjax(handle, row) {
       this.changeLoading(true, `${handle.text}中...`);
@@ -1292,7 +1318,7 @@ export default {
           handle.event({
             ele: this,
             thead: thead,
-            data: this.datas,
+            data: this.list,
             selected: rows,
             ...res
           });
@@ -1395,13 +1421,13 @@ export default {
           });
           util.exportXls({
             thead: thead,
-            data: this.datas,
+            data: this.list,
             name: this.fileName,
             option: this.optionDatas
           });
         }
-        this.$emit('btnClick', res, this.datas, thead, rows);
-        this.$emit('btn-click', res, this.datas, thead, rows);
+        this.$emit('btnClick', res, this.list, thead, rows);
+        this.$emit('btn-click', res, this.list, thead, rows);
       }
     },
     sizeChange(res) {

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

@@ -203,7 +203,10 @@
                       ref="es-form-pane"
                       :key="item.name"
                       :label-width="
-                        item.showLabel !== false && item.label && showLabel
+                        item.showLabel !== false &&
+                        item.label &&
+                        !item.labelHide &&
+                        showLabel
                           ? labelWidth
                           : '0'
                       "
@@ -251,7 +254,10 @@
                       <es-label
                         slot="label"
                         v-if="
-                          item.showLabel !== false && item.label && showLabel
+                          item.showLabel !== false &&
+                          item.label &&
+                          !item.labelHide &&
+                          showLabel
                         "
                         v-bind="getLabel(item.label)"
                       ></es-label>
@@ -1192,7 +1198,10 @@
                   ref="es-form-pane"
                   :key="item.name"
                   :label-width="
-                    item.showLabel !== false && item.label && showLabel
+                    item.showLabel !== false &&
+                    item.label &&
+                    !item.labelHide &&
+                    showLabel
                       ? labelWidth
                       : '0'
                   "
@@ -1238,7 +1247,12 @@
                 >
                   <es-label
                     slot="label"
-                    v-if="item.showLabel !== false && item.label && showLabel"
+                    v-if="
+                      item.showLabel !== false &&
+                      item.label &&
+                      !item.labelHide &&
+                      showLabel
+                    "
                     v-bind="getLabel(item.label)"
                   ></es-label>
                   <es-input-number
@@ -2194,7 +2208,10 @@
                     ref="es-form-pane"
                     :key="item.name"
                     :label-width="
-                      item.showLabel !== false && item.label && showLabel
+                      item.showLabel !== false &&
+                      item.label &&
+                      !item.labelHide &&
+                      showLabel
                         ? labelWidth
                         : '0'
                     "
@@ -2244,7 +2261,12 @@
                   >
                     <es-label
                       slot="label"
-                      v-if="item.showLabel !== false && item.label && showLabel"
+                      v-if="
+                        item.showLabel !== false &&
+                        item.label &&
+                        !item.labelHide &&
+                        showLabel
+                      "
                       v-bind="getLabel(item.label)"
                     ></es-label>
                     <es-input-number
@@ -3135,7 +3157,10 @@
                 ref="es-form-pane"
                 :key="item.name"
                 :label-width="
-                  item.showLabel !== false && item.label && showLabel
+                  item.showLabel !== false &&
+                  item.label &&
+                  !item.labelHide &&
+                  showLabel
                     ? labelWidth
                     : '0'
                 "
@@ -3181,7 +3206,12 @@
               >
                 <es-label
                   slot="label"
-                  v-if="item.showLabel !== false && item.label && showLabel"
+                  v-if="
+                    item.showLabel !== false &&
+                    item.label &&
+                    !item.labelHide &&
+                    showLabel
+                  "
                   v-bind="getLabel(item.label)"
                 ></es-label>
                 <es-input-number
@@ -4193,7 +4223,8 @@ export default {
         return {};
       }
     },
-    active: Array
+    active: Array,
+    resetActive: Boolean
   },
   data() {
     return {
@@ -4418,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/handle-user/src/main.vue

@@ -20,7 +20,10 @@
           <div class="es-user-job es-pointer" :title="job.name">
             {{ job.name }}<i class="es-icon-tri-down"></i>
           </div>
-          <el-dropdown-menu slot="dropdown">
+          <el-dropdown-menu
+            slot="dropdown"
+            :max-height="jobScrollbar ? undefined : 0"
+          >
             <el-dropdown-item
               v-for="(ele, ins) in user.identityList"
               :key="ins"
@@ -29,8 +32,8 @@
               >{{ ele.name }}</el-dropdown-item
             >
           </el-dropdown-menu>
-        </el-dropdown></template
-      >
+        </el-dropdown>
+      </template>
     </div>
   </div>
 </template>
@@ -42,6 +45,10 @@ import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsHandleUser',
   props: {
+    jobScrollbar: {
+      type: Boolean,
+      default: true
+    },
     data: Object,
     userModel: Object
   },

package/packages/handler/src/main.vue

@@ -11,6 +11,7 @@
         class="es-handler-user"
         :data="item"
         :userModel="userModel"
+        :job-scrollbar="jobScrollbar"
         @click="handleClick"
         @change="handleChange"
       ></es-handle-user>
@@ -21,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
           >
@@ -91,7 +92,7 @@
           class="es-handler-icon"
           :title="item.title"
           :class="item.icon"
-          @click="handleClick(item)"
+          @click.stop="handleClick(item)"
         ></div>
       </el-badge>
       <div
@@ -99,7 +100,7 @@
         class="es-handler-icon"
         :title="item.title"
         :class="item.icon"
-        @click="handleClick(item)"
+        @click.stop="handleClick(item)"
       ></div>
     </li>
   </ul>
@@ -116,6 +117,7 @@ export default {
     }
   },
   props: {
+    jobScrollbar: Boolean,
     data: Array,
     color: {
       type: String,

package/packages/icon/src/main.vue

@@ -48,12 +48,12 @@ export default {
               if (this.unicode(val)) {
                 this.code = '';
                 this.className = val;
-              } else if (util.startWith(val, '&#')) {
-                this.code = val;
-                this.className = 'es-icon';
-              } else {
+              } else if (this.isId(val)) {
                 this.tag = 'img';
                 this.url = this.preview + val;
+              } else {
+                this.code = val;
+                this.className = 'es-icon';
               }
             }
           } else {
@@ -80,7 +80,14 @@ export default {
       if (!res) {
         return false;
       }
-      var reg = new RegExp(/^[es-|el-]\S+/, 'g');
+      var reg = new RegExp(/^(es-|el-)\S+/, 'g');
+      return res.match(reg) ? res.match(reg).length : 0;
+    },
+    isId(res) {
+      if (!res) {
+        return false;
+      }
+      var reg = new RegExp(/[a-z0-9]+-[a-z0-9]+-[a-z0-9]+-[a-z0-9]+\S+/, 'g');
       return res.match(reg) ? res.match(reg).length : 0;
     }
   }

package/packages/login/src/main.vue

@@ -579,6 +579,7 @@ export default {
       type: String,
       default: 'center'
     },
+    translate: String,
     useResults: {
       type: Boolean,
       default: true
@@ -591,31 +592,36 @@ export default {
   },
   computed: {
     transform() {
+      let translate = this.translate
+        ? this.translate
+        : this.align === 'center'
+        ? '-50%, -51%'
+        : '-51%';
       if (this.align.indexOf('%') > -1) {
         return {
           left: this.align,
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: `translateY(${translate})`
         };
       }
       if (this.align === 'left') {
         return {
           left: '30%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: `translateY(${translate})`
         };
       }
       if (this.align === 'right') {
         return {
           left: '70%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: `translateY(${translate})`
         };
       }
       return {
         left: '50%',
         top: '50%',
-        transform: 'translate(-50%, -51%)'
+        transform: `translate(${translate})`
       };
     },
     redirectUri() {

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

@@ -31,6 +31,7 @@
         ></es-menu>
       </div>
       <es-handler
+        :job-scrollbar="jobScrollbar"
         :userModel="userModel"
         :hide="hide"
         :subSystem="subsystem"
@@ -191,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"
@@ -206,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,
@@ -213,8 +218,7 @@ import {
   mainConfig,
   updateUserCustomInfo,
   getComplexApplications,
-  getComplexApplicationsNew,
-  mainDetail
+  getComplexApplicationsNew
 } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
@@ -222,7 +226,7 @@ const isIE = navigator.userAgent.indexOf('MSIE') != -1;
 const log = util.getParams('console');
 const appCode = util.getParams('appCode') || util.getParams('appcode');
 export default {
-  name: 'EsMainDefault',
+  name: 'MainDefault',
   inheritAttrs: false,
   provide() {
     return {
@@ -233,9 +237,11 @@ export default {
     userinfo,
     settings,
     message,
-    notice
+    notice,
+    online
   },
   props: {
+    jobScrollbar: Boolean,
     maxHeight: String,
     //菜单导航地址
     menuUrl: String,
@@ -533,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;
     }
@@ -1658,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/main.vue

@@ -1,22 +1,23 @@
 <template>
   <div class="es-main-box">
-    <es-main-simplicity
+    <simplicity
       ref="main"
       v-if="type == 'simplicity'"
+      :appCode="appCode"
       v-bind="$attrs"
       v-on="$listeners"
-    ></es-main-simplicity>
-    <es-main-default
+    ></simplicity>
+    <main-default
       v-else
       v-bind="$attrs"
       ref="main"
       v-on="$listeners"
-    ></es-main-default>
+    ></main-default>
   </div>
 </template>
 <script>
-import EsMainSimplicity from './simplicity/index.vue';
-import EsMainDefault from './default/index.vue';
+import Simplicity from './simplicity/index.vue';
+import MainDefault from './default/index.vue';
 import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsMain',
@@ -27,8 +28,8 @@ export default {
     };
   },
   components: {
-    EsMainSimplicity,
-    EsMainDefault
+    Simplicity,
+    MainDefault
   },
   props: {
     type: String
@@ -36,11 +37,15 @@ export default {
   computed: {},
   watch: {},
   data() {
-    return {};
+    return {
+      appCode: '',
+      params: {}
+    };
   },
   created() {
-    let params = util.getParams() || {};
-    this.getConfig(params);
+    this.params = util.getParams() || {};
+    this.appCode = this.params.appCode;
+    this.getConfig(this.params);
   },
   mounted() {},
   methods: {
@@ -50,7 +55,6 @@ export default {
      * @date 2024年9月7日
      **/
     getConfig(query) {
-      console.log(121212);
       const token =
         util.getStorage('token') || util.getStorage('Authorization');
       if (