eoss-ui 0.5.81-beta1 → 0.5.81-beta10

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>
@@ -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"
@@ -213,8 +214,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 +222,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 {
@@ -236,6 +236,7 @@ export default {
     notice
   },
   props: {
+    jobScrollbar: Boolean,
     maxHeight: String,
     //菜单导航地址
     menuUrl: String,

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 (

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

@@ -1,176 +1,187 @@
 <template>
-  <div class="es-simplicity_apps">
-    <div class="es-simplicity_apps-all">
-      <div class="es-simplicity_apps-title">
-        所有业务系统
-        <el-input
-          class="es-simplicity_apps-search"
-          size="medium"
-          placeholder="请输入关键字"
-          prefix-icon="el-icon-search"
-          v-model="value"
-        >
-        </el-input>
-      </div>
-      <div class="es-simplicity_apps-box">
-        <ul class="es-simplicity_apps-list">
-          <li
-            v-for="item in _applications"
-            class="es-simplicity_apps-list-item"
-            :key="item.id"
-          >
-            <div
-              class="es-simplicity_apps-list-content"
-              :class="{ 'es-simplicity_apps-disabled': !item.permission }"
-              @click="handleClick(item)"
-            >
-              <el-badge v-bind="getBadge(item)">
-                <es-icon
-                  class="es-simplicity_apps-icon"
-                  :contents="item.icons || item.icon || menuIcon"
-                ></es-icon>
-              </el-badge>
-              <div class="es-simplicity_apps-text">
-                {{ item.text || item.name }}
-              </div>
-              <div class="es-simplicity_apps-hover">
-                <es-icon
-                  class="es-simplicity_apps-icon"
-                  :contents="
-                    item.permission ? 'es-icon-jiantou-next' : 'es-icon-mm'
-                  "
-                ></es-icon>
-                <div class="es-simplicity_apps-text">
-                  {{ item.permission ? '进入系统' : '暂无权限' }}
-                </div>
-              </div>
-            </div>
-          </li>
-        </ul>
-      </div>
-      <el-pagination
-        class="es-simplicity_apps-pagination"
-        background
-        layout="total,prev, pager, next"
-        total-text="共 {total} 个业务系统"
-        :page-size="appSize"
-        :total="apps.length"
-        @current-change="
-          (res) => {
-            this.handleChange(res, 0);
-          }
-        "
-      >
-      </el-pagination>
-    </div>
-    <div class="es-simplicity_apps-other">
-      <div class="es-simplicity_apps-business">
-        <div class="es-simplicity_apps-title">专项业务系统</div>
-        <ul class="es-simplicity_apps-list">
-          <li
-            v-for="(item, index) in _business"
-            class="es-simplicity_apps-list-item"
-            :key="item.id"
+  <el-drawer
+    class="es-simplicity-apps"
+    direction="ltr"
+    modal-class="es-simplicity-apps-modal"
+    size="90%"
+    :modal-append-to-body="false"
+    :with-header="false"
+    :visible.sync="show"
+  >
+    <div class="es-simplicity_apps">
+      <div class="es-simplicity_apps-all">
+        <div class="es-simplicity_apps-title">
+          所有业务系统
+          <el-input
+            class="es-simplicity_apps-search"
+            size="medium"
+            placeholder="请输入关键字"
+            prefix-icon="el-icon-search"
+            v-model="value"
           >
-            <div
-              class="es-simplicity_apps-list-content"
-              :class="{ 'es-simplicity_apps-disabled': !item.permission }"
-              @click="handleClick(item)"
+          </el-input>
+        </div>
+        <div class="es-simplicity_apps-box" @mousewheel="handleWheel">
+          <ul class="es-simplicity_apps-list">
+            <li
+              v-for="item in _applications"
+              class="es-simplicity_apps-list-item"
+              :key="item.id"
             >
-              <es-icon
-                class="es-simplicity_app-icon"
-                :style="setStyle(index)"
-                :contents="item.icons || item.icon || menuIcon"
-              ></es-icon>
-              <el-badge v-bind="getBadge(item)">
+              <div
+                class="es-simplicity_apps-list-content"
+                :class="{ 'es-simplicity_apps-disabled': !item.permission }"
+                @click="handleClick(item)"
+              >
+                <el-badge v-bind="getBadge(item)">
+                  <es-icon
+                    class="es-simplicity_apps-icon"
+                    :contents="item.icons || item.icon || menuIcon"
+                  ></es-icon>
+                </el-badge>
                 <div class="es-simplicity_apps-text">
                   {{ item.text || item.name }}
                 </div>
-              </el-badge>
-              <div class="es-simplicity_apps-hover">
-                <es-icon
-                  class="es-simplicity_apps-icon"
-                  :contents="
-                    item.permission ? 'es-icon-jiantou-next' : 'es-icon-mm'
-                  "
-                ></es-icon>
-                <div class="es-simplicity_apps-text">
-                  {{ item.permission ? '进入系统' : '暂无权限' }}
+                <div class="es-simplicity_apps-hover">
+                  <es-icon
+                    class="es-simplicity_apps-icon"
+                    :contents="
+                      item.permission ? 'es-icon-jiantou-next' : 'es-icon-mm'
+                    "
+                  ></es-icon>
+                  <div class="es-simplicity_apps-text">
+                    {{ item.permission ? '进入系统' : '暂无权限' }}
+                  </div>
                 </div>
               </div>
-            </div>
-          </li>
-        </ul>
+            </li>
+          </ul>
+        </div>
         <el-pagination
           class="es-simplicity_apps-pagination"
           background
           layout="total,prev, pager, next"
-          total-text="共 {total} 专项业务系统"
+          total-text="共 {total} 个业务系统"
           :page-size="appSize"
-          :total="business.length"
+          :total="apps.length"
+          :current-page.sync="appNum"
           @current-change="
             (res) => {
-              this.handleChange(res, 1);
+              this.handleChange(res, 0);
             }
           "
         >
         </el-pagination>
       </div>
-      <div class="es-simplicity_apps-systems">
-        <div class="es-simplicity_apps-title">系统设置</div>
-        <ul class="es-simplicity_apps-list">
-          <li
-            v-for="(item, index) in _systems"
-            class="es-simplicity_apps-list-item"
-            :key="item.id"
-          >
-            <div
-              class="es-simplicity_apps-list-content"
-              :class="{ 'es-simplicity_apps-disabled': !item.permission }"
-              @click="handleClick(item)"
+      <div class="es-simplicity_apps-other">
+        <div class="es-simplicity_apps-business">
+          <div class="es-simplicity_apps-title">专项业务系统</div>
+          <ul class="es-simplicity_apps-list">
+            <li
+              v-for="(item, index) in _business"
+              class="es-simplicity_apps-list-item"
+              :key="item.id"
             >
-              <es-icon
-                class="es-simplicity_app-icon"
-                :style="setStyle(index)"
-                :contents="item.icons || item.icon || menuIcon"
-              ></es-icon>
-              <el-badge v-bind="getBadge(item)">
-                <div class="es-simplicity_apps-text">
-                  {{ item.text || item.name }}
+              <div
+                class="es-simplicity_apps-list-content"
+                :class="{ 'es-simplicity_apps-disabled': !item.permission }"
+                @click="handleClick(item)"
+              >
+                <es-icon
+                  class="es-simplicity_app-icon"
+                  :style="setStyle(index)"
+                  :contents="item.icons || item.icon || menuIcon"
+                ></es-icon>
+                <el-badge v-bind="getBadge(item)">
+                  <div class="es-simplicity_apps-text">
+                    {{ item.text || item.name }}
+                  </div>
+                </el-badge>
+                <div class="es-simplicity_apps-hover">
+                  <es-icon
+                    class="es-simplicity_apps-icon"
+                    :contents="
+                      item.permission ? 'es-icon-jiantou-next' : 'es-icon-mm'
+                    "
+                  ></es-icon>
+                  <div class="es-simplicity_apps-text">
+                    {{ item.permission ? '进入系统' : '暂无权限' }}
+                  </div>
                 </div>
-              </el-badge>
-              <div class="es-simplicity_apps-hover">
+              </div>
+            </li>
+          </ul>
+          <el-pagination
+            class="es-simplicity_apps-pagination"
+            background
+            layout="total,prev, pager, next"
+            total-text="共 {total} 专项业务系统"
+            :page-size="appSize"
+            :total="business.length"
+            @current-change="
+              (res) => {
+                this.handleChange(res, 1);
+              }
+            "
+          >
+          </el-pagination>
+        </div>
+        <div class="es-simplicity_apps-systems">
+          <div class="es-simplicity_apps-title">系统设置</div>
+          <ul class="es-simplicity_apps-list">
+            <li
+              v-for="(item, index) in _systems"
+              class="es-simplicity_apps-list-item"
+              :key="item.id"
+            >
+              <div
+                class="es-simplicity_apps-list-content"
+                :class="{ 'es-simplicity_apps-disabled': !item.permission }"
+                @click="handleClick(item)"
+              >
                 <es-icon
-                  class="es-simplicity_apps-icon"
-                  :contents="
-                    item.permission ? 'es-icon-jiantou-next' : 'es-icon-mm'
-                  "
+                  class="es-simplicity_app-icon"
+                  :style="setStyle(index)"
+                  :contents="item.icons || item.icon || menuIcon"
                 ></es-icon>
-                <div class="es-simplicity_apps-text">
-                  {{ item.permission ? '进入系统' : '暂无权限' }}
+                <el-badge v-bind="getBadge(item)">
+                  <div class="es-simplicity_apps-text">
+                    {{ item.text || item.name }}
+                  </div>
+                </el-badge>
+                <div class="es-simplicity_apps-hover">
+                  <es-icon
+                    class="es-simplicity_apps-icon"
+                    :contents="
+                      item.permission ? 'es-icon-jiantou-next' : 'es-icon-mm'
+                    "
+                  ></es-icon>
+                  <div class="es-simplicity_apps-text">
+                    {{ item.permission ? '进入系统' : '暂无权限' }}
+                  </div>
                 </div>
               </div>
-            </div>
-          </li>
-        </ul>
-        <el-pagination
-          class="es-simplicity_apps-pagination"
-          background
-          layout="total,prev, pager, next"
-          total-text="共 {total} 系统设置"
-          hide-on-single-page
-          :page-size="appSize"
-          :total="business.length"
-          @current-change="
-            (res) => {
-              this.handleChange(res, 2);
-            }
-          "
-        >
-        </el-pagination>
+            </li>
+          </ul>
+          <el-pagination
+            class="es-simplicity_apps-pagination"
+            background
+            layout="total,prev, pager, next"
+            total-text="共 {total} 系统设置"
+            hide-on-single-page
+            :page-size="appSize"
+            :total="business.length"
+            @current-change="
+              (res) => {
+                this.handleChange(res, 2);
+              }
+            "
+          >
+          </el-pagination>
+        </div>
       </div>
     </div>
-  </div>
+  </el-drawer>
 </template>
 
 <script>
@@ -179,6 +190,7 @@ export default {
   name: 'Apps',
   components: {},
   props: {
+    visible: Boolean,
     //菜单、应用默认图标
     menuIcon: String,
     color: {
@@ -233,6 +245,15 @@ export default {
     };
   },
   computed: {
+    show: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit('update:visible', val);
+        return val;
+      }
+    },
     _applications() {
       return this.apps.filter((item, index) => {
         return (
@@ -310,6 +331,16 @@ export default {
       let name = ['appNum', 'bsNum', 'sysNum'];
       this[name[index]] = res;
     },
+    handleWheel(e) {
+      let direction = e.deltaY > 0 ? 'down' : 'up'; //deltaY为正则滚轮向下，为负滚轮向上
+      let total = Math.ceil(this.apps.length / this.appSize);
+      if (direction == 'up' && this.appNum > 1) {
+        this.appNum -= 1;
+      }
+      if (direction == 'down' && this.appNum < total) {
+        this.appNum += 1;
+      }
+    },
     handleClick(res) {
       this.$emit('click', res);
     },