eoss-ui 0.5.64 → 0.5.65

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

@@ -43,7 +43,6 @@
         ref="oaTable"
         v-bind="{
           ...$attrs,
-          data: datas,
           emptyText: emptyText,
           showSummary: showTotal,
           sumText: sumText || totalText,
@@ -54,28 +53,46 @@
               : undefined,
           border: _border,
           infiniteScroll: getTableData,
-          infiniteScrollDisabled: infiniteDisabled
+          infiniteScrollDisabled: infiniteDisabled,
+          dragSort: dragSort,
+          dragSortClass: dragSortIcon
         }"
+        :data.sync="datas"
         v-on="{
           ...$listeners,
           'row-click': rowClick,
           'selection-change': selectionChange,
           'filter-column': handleFilterColumn,
-          'sort-change': handleSortChange
+          'sort-change': handleSortChange,
+          'update-drag-sort': handleUpdateDragSort
         }"
         :class="
           'es-table' +
           (theadBorder && border != 'none' ? ' es-thead-border' : '')
         "
       >
+        <!-- <el-table-column v-if="dragSort" width="32" fixed>
+          <template slot-scope="scope">
+            <es-icon :contents="dragSortIcon"></es-icon>
+          </template>
+        </el-table-column> -->
         <slot name="prepend"></slot>
         <slot></slot>
         <template v-for="(item, index) in theads">
           <template v-if="item.hide !== true">
             <el-table-column
-              v-if="item.type === 'index' || item.type === 'selection'"
+              v-if="item.type === 'sort'"
+              width="32"
+              :key="index"
+            >
+              <template slot-scope="scope">
+                <es-icon class="es-move" :contents="dragSortIcon"></es-icon>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else-if="item.type === 'index' || item.type === 'selection'"
               :key="index"
-              v-bind="item"
+              v-bind="dragSort ? { ...item, fixed: false } : item"
             ></el-table-column>
             <children
               v-else
@@ -86,7 +103,8 @@
                 form: form,
                 readonly: readonly,
                 optionData: optionDatas,
-                ...item
+                dragSort: dragSort,
+                ...(dragSort ? { ...item, fixed: false } : item)
               }"
               v-on="{
                 handleClick: handleClick,
@@ -402,6 +420,11 @@ export default {
       default() {
         return {};
       }
+    },
+    dragSort: Boolean,
+    dragSortIcon: {
+      type: String,
+      default: 'es-icon-caidan'
     }
   },
   data() {
@@ -430,7 +453,8 @@ export default {
       icon: true,
       show: true,
       sysCodes: [],
-      infiniteDisabled: this.infiniteScroll
+      infiniteDisabled: this.infiniteScroll,
+      isUpadeData: false
     };
   },
   computed: {
@@ -450,7 +474,23 @@ export default {
     theads: {
       get() {
         let thead = [];
-        if (this.checkbox) {
+        let types = this.theadData
+          .filter((item) => {
+            return (
+              item.type == 'selection' ||
+              item.type == 'index' ||
+              item.type == 'sort'
+            );
+          })
+          .map((item) => {
+            return item.type;
+          });
+        if (this.dragSort && !types.includes('sort')) {
+          thead.push({
+            type: 'sort'
+          });
+        }
+        if (this.checkbox && !types.includes('selection')) {
           thead.push({
             type: 'selection',
             width: '55',
@@ -460,7 +500,7 @@ export default {
             reserveSelection: this.reserveSelection
           });
         }
-        if (this.numbers) {
+        if (this.numbers && !types.includes('index')) {
           let index = 1;
           if (this.infiniteScroll) {
             index = typeof this.index == 'boolean' ? 1 : this.index;
@@ -476,7 +516,8 @@ export default {
             width: '70',
             align: 'center',
             fixed: 'left',
-            index: index
+            index: index,
+            filterIcon: this.filter ? 'es-icon-biao' : undefined
           });
         }
         if (this.theadData.length) {
@@ -512,6 +553,7 @@ export default {
         return this.data;
       },
       set(val) {
+        this.$emit('update:data', val);
         return val;
       }
     },
@@ -1481,6 +1523,9 @@ export default {
       }
       this.$emit('sort-change', res);
     },
+    handleUpdateDragSort(data, event) {
+      this.$emit('update-drag-sort', data, event);
+    },
     mergeThead(res) {
       this.theadData = res;
       this.icon = true;

package/packages/login/src/main.vue

@@ -695,6 +695,11 @@ export default {
         this.loginInfo(val == 3);
       }
     },
+    identifyingId(val) {
+      if (val) {
+        this.loginInfo(this.active == 3);
+      }
+    },
     appName: {
       immediate: true,
       handler(val) {
@@ -1345,6 +1350,9 @@ export default {
       }
     },
     initRequestLoginInfo() {
+      if (this.identifyingId == '') {
+        return false;
+      }
       util
         .ajax({
           method: 'post',

package/packages/main/src/main.vue

@@ -671,8 +671,9 @@ export default {
   },
   created() {
     let params = util.getParams() || {};
-    this.homePage =
-      typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
+    if (typeof this.loadHomePage === 'string') {
+      this.homePage = this.loadHomePage;
+    }
     this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util.setFavicon(sysLogoIco);
@@ -791,11 +792,7 @@ export default {
             this.setTitle(ids[0]);
           }
         } else if (sessionStorage.getItem('jump') && this.isHistory) {
-          let ids = this.getId(
-            this.menus,
-            sessionStorage.getItem('jump'),
-            true
-          );
+          let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
           if (ids) {
             this.defaultActive = ids;
             this.navIds = ids;
@@ -807,18 +804,14 @@ export default {
             hash = hash.split('?')[0];
           }
           if (hash !== '#/' && hash !== '#/main') {
-            let ids = this.getId(this.menus, util.win.location.hash, true);
+            let ids = this.getId(this.menus, util.win.location.hash);
             if (ids) {
               this.defaultActive = ids;
               this.navIds = ids;
               this.setTitle(ids[0]);
             }
           } else if (sessionStorage.getItem('jump') && this.isHistory) {
-            let ids = this.getId(
-              this.menus,
-              sessionStorage.getItem('jump'),
-              true
-            );
+            let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
             if (ids) {
               this.defaultActive = ids;
               this.navIds = ids;
@@ -907,10 +900,10 @@ export default {
           }
           let jump = sessionStorage.getItem('jump');
           if (
-            !applicationid &&
-            (!jump || !this.isHistory) &&
-            hash === '#/' &&
-            hash === '#/main'
+            (!applicationid &&
+              (!jump || !this.isHistory) &&
+              (hash === '#/' || hash === '#/main')) ||
+            jump == results[i]
           ) {
             this.homePage =
               typeof this.loadHomePage === 'string'
@@ -1032,17 +1025,71 @@ export default {
           }
         });
     },
-    jumpMenu(res, flag, param) {
-      let option = { url: res, flag: flag, param: param };
+    /**
+     * @desc 跳转菜单
+     * @param {Object/String} [res]    - 菜单id（多个用,隔开）或url地址或系统菜单数据对象
+     * @param {Boolean} [isUrl] - res是否是url地址
+     * @param {Object} [param] - 拼接地址后的参数
+     */
+    jumpMenu(res, isUrl, path) {
+      let option = { url: res, isUrl: isUrl, path: path };
       if (util.isObject(res)) {
-        option = { ...option, ...res };
+        if (res.urlopenmode == 1) {
+          util.win.open(res.url);
+          return;
+        } else if (res.urlopenmode == 2) {
+          location.href = res.url;
+          return;
+        } else {
+          option = { ...option, ...res };
+        }
       }
       let ids;
       if (typeof option.url === 'string') {
-        if (option.flag) {
-          ids = this.getId(this.menus, option.url, true);
+        if (
+          option.isUrl ||
+          option.url.indexOf('.html') > -1 ||
+          option.url.indexOf('.dhtml') > -1 ||
+          option.url.indexOf('/#/') > -1 ||
+          option.url.indexOf('#/') > -1
+        ) {
+          option.isUrlc = true;
+          ids = this.getId(this.menus, option.url);
           if (!ids) {
-            this.$message.error('未在菜单栏中找到此地址');
+            if (
+              option.url.indexOf('.html') === -1 &&
+              option.url.indexOf('#/') === -1
+            ) {
+              this.method = 'iframe';
+              this.refresh = false;
+              this.page = option.url;
+            } else {
+              this.method = 'router';
+              const routes = this.$router.options.routes;
+              if (routes) {
+                let path = this.hasRouter(routes, option.url);
+                if (path) {
+                  let params = util.getParams({ url: option.url });
+                  this.$router.push({
+                    path: path,
+                    query: params
+                  });
+                } else {
+                  if (this.loadWujie === false || (this.downgrade && isIE)) {
+                    this.method = 'iframe';
+                    this.refresh = false;
+                    this.page = option.url;
+                  } else {
+                    this.method = 'wujie';
+                    this.wjName = 'application' + Date.now();
+                    this.page = this.host + option.url;
+                  }
+                }
+              }
+            }
+            this.$nextTick(() => {
+              this.refresh = true;
+            });
             return;
           }
         } else {
@@ -1053,17 +1100,22 @@ export default {
       }
       this.setDefault(this.menus, ids, option.param);
     },
-    getId(arry, res, path) {
-      if (!res) {
+    /**
+     * @desc 获取菜单层级id
+     * @param {Array} [menus]    - 系统菜单数据对象
+     * @param {String} [url] - 菜单id或url地址
+     */
+    getId(menus, url) {
+      if (!url) {
         return false;
       }
-      for (let i = 0; i < arry.length; i++) {
-        let item = arry[i];
+      for (let i = 0; i < menus.length; i++) {
+        let item = menus[i];
         if (
           Object.prototype.hasOwnProperty.call(item, 'children') &&
           item.children.length
         ) {
-          let id = this.getId(item.children, res, path);
+          let id = this.getId(item.children, url);
           if (id) {
             if (typeof id === 'string') {
               this.isTabs = false;
@@ -1079,7 +1131,7 @@ export default {
           Object.prototype.hasOwnProperty.call(item, 'fourthTabs') &&
           item.fourthTabs.length
         ) {
-          let id = this.getId(item.fourthTabs, res, path);
+          let id = this.getId(item.fourthTabs, url);
           if (id) {
             if (typeof id === 'string') {
               this.isTabs = true;
@@ -1091,12 +1143,12 @@ export default {
             }
             return id;
           }
-        } else if (item.id === res || item.url == res) {
+        } else if (item.id === url || item.url == url) {
           return item.id;
         } else {
-          if (path && item.url) {
+          if (item.url) {
             let url = new URL(item.url, window.location.origin);
-            if (url.hash == res) {
+            if (url.hash == url) {
               return item.id;
             }
           }
@@ -1114,54 +1166,6 @@ export default {
           if (res.rCode === 0) {
             if (res.results && res.results.length) {
               this.menus = JSON.parse(JSON.stringify(res.results));
-              let applicationid =
-                util.getParams('applicationid') ||
-                util.getParams('applicationId');
-              if (applicationid) {
-                let ids = this.getId(this.menus, applicationid);
-                if (ids) {
-                  this.defaultActive = ids;
-                }
-              } else if (sessionStorage.getItem('jump') && this.isHistory) {
-                let ids = this.getId(
-                  this.menus,
-                  sessionStorage.getItem('jump'),
-                  true
-                );
-                if (ids) {
-                  this.defaultActive = ids;
-                  this.navIds = ids;
-                  this.setTitle(ids[0]);
-                }
-              } else if (util.win.location.hash) {
-                let hash = util.win.location.hash;
-                if (hash) {
-                  hash = hash.split('?')[0];
-                }
-                if (hash !== '#/' && hash !== '#/main') {
-                  let ids = this.getId(
-                    this.menus,
-                    util.win.location.hash,
-                    true
-                  );
-                  if (ids) {
-                    this.defaultActive = ids;
-                    this.navIds = ids;
-                    this.setTitle(ids[0]);
-                  }
-                } else if (sessionStorage.getItem('jump') && this.isHistory) {
-                  let ids = this.getId(
-                    this.menus,
-                    sessionStorage.getItem('jump'),
-                    true
-                  );
-                  if (ids) {
-                    this.defaultActive = ids;
-                    this.navIds = ids;
-                    this.setTitle(ids[0]);
-                  }
-                }
-              }
               this.setTips(this.menus);
               store.set('nav', this.menus);
               this.setMenu(this.menus);
@@ -1181,6 +1185,34 @@ export default {
     },
     //设置默认左侧导航
     setMenu(res) {
+      let applicationid =
+        util.getParams('applicationid') || util.getParams('applicationId');
+      if (applicationid) {
+        let ids = this.getId(this.menus, applicationid);
+        if (ids) {
+          this.defaultActive = ids;
+        }
+      } else if (util.win.location.hash) {
+        let hash = util.win.location.hash;
+        if (hash) {
+          hash = hash.split('?')[0];
+        }
+        if (hash !== '#/' && hash !== '#/main') {
+          let ids = this.getId(this.menus, util.win.location.hash);
+          if (ids) {
+            this.defaultActive = ids;
+            this.navIds = ids;
+            this.setTitle(ids[0]);
+          }
+        }
+      } else if (sessionStorage.getItem('jump') && this.isHistory) {
+        let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
+        if (ids) {
+          this.defaultActive = ids;
+          this.navIds = ids;
+          this.setTitle(ids[0]);
+        }
+      }
       if (this.defaultActive && this.defaultActive.length) {
         this.isDefault = false;
         this.setDefault(res, this.defaultActive);
@@ -1255,11 +1287,24 @@ export default {
             if (id && this.menu[0].id !== id) {
               this.active.push(id);
             } else {
-              this.handleJump(
-                this.menu[0].url,
-                this.menu[0].urlopenmode,
-                this.menu[0]
-              );
+              let hash = util.win.location.hash;
+              if (hash) {
+                hash = hash.split('?')[0];
+                if (hash !== '#/' && hash !== '#/main') {
+                  this.handleJump(hash);
+                  return;
+                }
+              }
+              let jump = sessionStorage.getItem('jump');
+              if (jump) {
+                this.handleJump(jump);
+              } else {
+                this.handleJump(
+                  this.menu[0].url,
+                  this.menu[0].urlopenmode,
+                  this.menu[0]
+                );
+              }
             }
           }
         }
@@ -1406,7 +1451,7 @@ export default {
             break;
           }
         }
-      } else {
+      } else if (active && active.length) {
         this.navs = [];
         this.subsystem = [];
         this.menu = res;
@@ -1501,12 +1546,12 @@ export default {
                 this.active = subNode.id;
                 this.navIds = [
                   node.id,
-                  ...this.getId(node.children, subNode.url, true)
+                  ...this.getId(node.children, subNode.url)
                 ];
               }
             }
           } else {
-            this.navIds = this.getId(this.menus, node.url, true);
+            this.navIds = this.getId(this.menus, node.url);
             this.setTitle(this.navIds[0]);
             this.tabsId = fourthTabs ? node.id : '';
           }
@@ -1526,7 +1571,7 @@ export default {
                 this.active = subNode.id;
                 this.navIds = [
                   node.id,
-                  ...this.getId(node.children, subNode.url, true)
+                  ...this.getId(node.children, subNode.url)
                 ];
               }
             }
@@ -1546,7 +1591,7 @@ export default {
             let subNode = this.getFirst(node);
             this.active = [node.id];
             if (subNode && node.id !== subNode.id) {
-              this.navIds = this.getId(this.menus, subNode.url, true);
+              this.navIds = this.getId(this.menus, subNode.url);
               this.$set(this.active, 1, subNode.id);
             }
           }
@@ -1570,7 +1615,7 @@ export default {
                   } else {
                     this.active = tab.id;
                   }
-                  this.navIds = this.getId(this.menus, tab.url, true);
+                  this.navIds = this.getId(this.menus, tab.url);
                 }
               } else {
                 let tab = (node.fourthTabs || []).filter((item) => {
@@ -1579,9 +1624,9 @@ export default {
                 if (tab) {
                   this.tabs = node.fourthTabs;
                   this.tabsId = tab.id;
-                  this.navIds = this.getId(this.menus, tab.url, true);
+                  this.navIds = this.getId(this.menus, tab.url);
                 } else {
-                  this.navIds = this.getId(this.menus, node.url, true);
+                  this.navIds = this.getId(this.menus, node.url);
                 }
               }
             } else {
@@ -1593,7 +1638,7 @@ export default {
                   this.tabs[0].urlopenmode,
                   this.tabs[0]
                 );
-                this.navIds = this.getId(this.menus, this.tabs[0].url, true);
+                this.navIds = this.getId(this.menus, this.tabs[0].url);
               }
             }
           } else {
@@ -1606,14 +1651,14 @@ export default {
                 } else {
                   this.active = subNode.id;
                 }
-                this.navIds = this.getId(this.menus, subNode.url, true);
+                this.navIds = this.getId(this.menus, subNode.url);
               }
             }
           }
           break;
         case 'tabs':
           this.tabsId = node.id;
-          this.navIds = this.getId(this.menus, node.url, true);
+          this.navIds = this.getId(this.menus, node.url);
           break;
       }
       if (node.url) {