eoss-ui 0.5.10 → 0.5.12

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

@@ -8,7 +8,7 @@
         (item.type == 'splitReading' &&
           splitReadingData &&
           splitReadingData.length > 0) ||
-        (item.type == 'preset' && presetData && presetData.length > 0) ||
+        (item.type == 'preset' && presetData && presetData.length > 0 && currentUserHasPresetInfoAuth) ||
         (item.type != 'splitReading' && item.type != 'preset')
       "
     >
@@ -128,6 +128,7 @@ export default {
       pressTableList: [],
       currentPage: 1,
       pageSize: 20,
+      currentUserHasPresetInfoAuth:false,
       pressThead: [
         {
           title: '催办节点',
@@ -320,6 +321,7 @@ export default {
             label: '经办部门',
             field: 'deptid',
             align: 'center',
+            key:'jbbm',
             showOverflowTooltip: true,
             width: 150
           },
@@ -327,6 +329,7 @@ export default {
             label: '步骤',
             field: 'itemname',
             align: 'center',
+            key:'bz',
             showOverflowTooltip: true,
             width: 110
           },
@@ -334,6 +337,7 @@ export default {
             label: '办理人',
             field: 'userName',
             align: 'center',
+            key:'blr',
             showOverflowTooltip: true,
             width: 110
           },
@@ -342,11 +346,13 @@ export default {
             field: 'deptName',
             align: 'center',
             showOverflowTooltip: true,
+            key:'blrbm',
             width: 110
           },
           {
             label: '状态',
             field: 'pendstate',
+            key:'zt',
             align: 'center',
             showOverflowTooltip: true,
             width: 80,
@@ -369,6 +375,7 @@ export default {
             field: 'doresult',
             align: 'center',
             showOverflowTooltip: true,
+            key:'blyj',
             render: (h, params) => {
               return h(
                 'span',
@@ -381,6 +388,7 @@ export default {
             label: '验签',
             field: 'authTypeStr',
             align: 'center',
+            key:'yq',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -393,6 +401,7 @@ export default {
           },
           {
             label: '附件',
+            key:'fj',
             field: 'hasAdjunct',
             align: 'center',
             showOverflowTooltip: true,
@@ -414,6 +423,7 @@ export default {
             label: '时间',
             field: 'doetime',
             align: 'center',
+            key:'sj',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -428,6 +438,7 @@ export default {
             label: '代办人',
             field: 'douserid',
             align: 'center',
+            key:'dbr',
             showOverflowTooltip: true,
             width: 80,
             hide: _that.flowTableInfo.hasAgent != '1'
@@ -436,6 +447,7 @@ export default {
             label: '催办',
             field: 'pressTimes',
             align: 'center',
+            key:'cb',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -472,6 +484,7 @@ export default {
           {
             label: '经办部门',
             field: 'deptid',
+            key:'jbbm',
             align: 'center',
             showOverflowTooltip: true,
             width: 150
@@ -480,6 +493,7 @@ export default {
             label: '步骤',
             field: 'itemname',
             align: 'center',
+            key:'bz',
             showOverflowTooltip: true,
             width: 110
           },
@@ -487,6 +501,7 @@ export default {
             label: '办理人',
             field: 'userName',
             align: 'center',
+            key:'blr',
             showOverflowTooltip: true,
             width: 110
           },
@@ -494,6 +509,7 @@ export default {
             label: '状态',
             field: 'pendstate',
             align: 'center',
+            key:'zt',
             showOverflowTooltip: true,
             width: 80,
             render: (h, params) => {
@@ -514,6 +530,7 @@ export default {
             label: '办理意见',
             field: 'doresult',
             align: 'center',
+            key:'blyj',
             showOverflowTooltip: true,
             render: (h, params) => {
               return h(
@@ -527,6 +544,7 @@ export default {
             label: '验签',
             field: 'authTypeStr',
             align: 'center',
+            key:'yq',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -541,6 +559,7 @@ export default {
             label: '附件',
             field: 'hasAdjunct',
             align: 'center',
+            key:'fj',
             showOverflowTooltip: true,
             width: 70,
             render: (h, params) => {
@@ -560,6 +579,7 @@ export default {
             label: '时间',
             field: 'doetime',
             align: 'center',
+            key:'sj',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -574,6 +594,7 @@ export default {
             label: '代办人',
             field: 'douserid',
             align: 'center',
+            key:'dbr',
             showOverflowTooltip: true,
             width: 80,
             hide: _that.flowTableInfo.hasAgent != '1'
@@ -582,6 +603,7 @@ export default {
             label: '催办',
             field: 'pressTimes',
             align: 'center',
+            key:'cb',
             showOverflowTooltip: true,
             width: 150,
             render: (h, params) => {
@@ -1084,12 +1106,13 @@ export default {
           const {
             status,
             message,
-            data: { presetInfoList, presetInfoListHiddenColumns, canDelete }
+            data: { presetInfoList, presetInfoListHiddenColumns, canDelete,currentUserHasPresetInfoAuth }
           } = res;
           this.loading.close();
           if (status == 'success') {
             presetInfoList && (this.presetData = presetInfoList);
             this.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
+            this.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth
             this.canDelete = canDelete;
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');

package/packages/form/src/main.vue

@@ -72,9 +72,7 @@
                       >
                         <es-label
                           v-if="item.label"
-                          :contents="item.label"
-                          :event="item.label.event"
-                          :events="item.label.events"
+                          v-bind="getLabel(item.label)"
                         ></es-label>
                         <span v-if="item.text || item.type === 'text'">{{
                           item.text || item.contents
@@ -249,16 +247,7 @@
                         v-if="
                           item.showLabel !== false && item.label && showLabel
                         "
-                        :contents="item.label"
-                        v-bind="
-                          item.label
-                            ? {
-                                event: item.label.event,
-                                events: item.label.events
-                              }
-                            : {}
-                        "
-                        :plain="item.plain || item.name === undefined"
+                        v-bind="getLabel(item.label)"
                       ></es-label>
                       <es-input-number
                         v-if="item.type == 'number'"
@@ -1209,16 +1198,7 @@
                   <es-label
                     slot="label"
                     v-if="item.showLabel !== false && item.label && showLabel"
-                    :contents="item.label"
-                    v-bind="
-                      item.label
-                        ? {
-                            event: item.label.event,
-                            events: item.label.events
-                          }
-                        : {}
-                    "
-                    :plain="item.plain || item.name === undefined"
+                    v-bind="getLabel(item.label)"
                   ></es-label>
                   <es-input-number
                     v-if="item.type == 'number'"
@@ -2026,9 +2006,7 @@
                     <div v-else :key="index" class="es-collapse-title-handler">
                       <es-label
                         v-if="item.label"
-                        :contents="item.label"
-                        :event="item.label.event"
-                        :events="item.label.events"
+                        v-bind="getLabel(item.label)"
                       ></es-label>
                       <span v-if="item.text || item.type === 'text'">{{
                         item.text || item.contents
@@ -2191,16 +2169,7 @@
                     <es-label
                       slot="label"
                       v-if="item.showLabel !== false && item.label && showLabel"
-                      :contents="item.label"
-                      v-bind="
-                        item.label
-                          ? {
-                              event: item.label.event,
-                              events: item.label.events
-                            }
-                          : {}
-                      "
-                      :plain="item.plain || item.name === undefined"
+                      v-bind="getLabel(item.label)"
                     ></es-label>
                     <es-input-number
                       v-if="item.type == 'number'"
@@ -3102,16 +3071,7 @@
                 <es-label
                   slot="label"
                   v-if="item.showLabel !== false && item.label && showLabel"
-                  :contents="item.label"
-                  v-bind="
-                    item.label
-                      ? {
-                          event: item.label.event,
-                          events: item.label.events
-                        }
-                      : {}
-                  "
-                  :plain="item.plain || item.name === undefined"
+                  v-bind="getLabel(item.label)"
                 ></es-label>
                 <es-input-number
                   v-if="item.type == 'number'"
@@ -4403,6 +4363,11 @@ export default {
     });
   },
   methods: {
+    getLabel(res) {
+      return typeof res === 'string'
+        ? { contents: res }
+        : { ...res, plain: res.plain || res.name === undefined };
+    },
     getHeight() {
       if (
         util.hasClass(this.$parent.$el, 'el-dialog__wrapper') ||

package/packages/form/src/table.vue

@@ -111,17 +111,7 @@
               >
                 <es-label
                   v-if="item.showLabel !== false && item.label"
-                  :contents="item.label"
-                  v-bind="
-                    item.label
-                      ? {
-                          event: item.label.event,
-                          events: item.label.events
-                        }
-                      : {}
-                  "
-                  :plain="item.plain"
-                  :rules="item.rules"
+                  v-bind="getLabel(item.label)"
                 ></es-label>
               </td>
               <td
@@ -1233,6 +1223,11 @@ export default {
     this.getWidth();
   },
   methods: {
+    getLabel(res) {
+      return typeof res === 'string'
+        ? { contents: res }
+        : { ...res, plain: res.plain || res.name === undefined };
+    },
     getRules(res) {
       if (res.rules && !res.hide) {
         if (Array.isArray(res.rules)) {

package/packages/main/src/main.vue

@@ -253,7 +253,9 @@ import message from './message.vue';
 import notice from './notice.vue';
 import AsyncComponent from './async-component/index.vue';
 import {
-  authCenter,
+  //authCenter,
+  wss,
+  topic,
   mainConfig,
   updateUserCustomInfo,
   getComplexApplications,
@@ -540,8 +542,6 @@ export default {
         copyright: { comp: '', data: {} }
       },
       pageLoading: false,
-      close: null,
-      connect: 0,
       wjName: 'singlespa',
       menus: '',
       //头部导航
@@ -618,7 +618,8 @@ export default {
       navIds: null,
       timer: null,
       pid: null,
-      showPage: false
+      showPage: false,
+      webSocket: null
     };
   },
   created() {
@@ -628,7 +629,7 @@ export default {
     this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util.setFavicon(sysLogoIco);
-    this.isLogin(params);
+    this.getConfig(params);
   },
   mounted() {
     util.win.reLogin = this.handleReLogin;
@@ -643,153 +644,6 @@ export default {
     util.win.windowOpen = this.openPage;
   },
   methods: {
-    async isLogin(query) {
-      const token =
-        util.getStorage('token') || util.getStorage('Authorization');
-
-      let loginPage = util.getStorage('login') || util.getStorage('loginPage');
-      if (loginPage) {
-        if (!util.startWith(loginPage, ['http', '/'], true)) {
-          let pathname = util.win.top.location.pathname;
-          if (pathname !== '/') {
-            pathname = pathname.split('/');
-            pathname.splice(pathname.length - 1);
-            pathname = pathname.join('/');
-            loginPage = pathname + '/' + loginPage.replace('./', '');
-          } else {
-            loginPage = pathname + loginPage.replace('./', '');
-          }
-        }
-      }
-      if (
-        !token &&
-        query &&
-        Object.prototype.hasOwnProperty.call(query, 'serverId') &&
-        Object.prototype.hasOwnProperty.call(query, 'authType')
-      ) {
-        await util
-          .ajax({
-            method: 'post',
-            url: authCenter,
-            data: query
-          })
-          .then((res) => {
-            if (res.rCode === 0) {
-              let { results } = res;
-              switch (results.statusCode) {
-                case 0:
-                  util.setStorage({
-                    type: this.storage,
-                    key: {
-                      ssId: results.ssId,
-                      token: results.token,
-                      Authorization: results.token,
-                      deviceUnique: results.deviceUnique
-                    }
-                  });
-                  if (query.openType) {
-                    let url = util.win.top.location.href;
-                    let newUrl = util.delUrlParam({
-                      url: url,
-                      key: ['serverId', 'authType', 'openType']
-                    });
-                    switch (query.openType) {
-                      case 'self':
-                        util.win.location.href = newUrl;
-                        break;
-                      case 'blank':
-                        util.win.open(newUrl);
-                        break;
-                      case 'parent':
-                        util.win.parent.location.href = href;
-                        break;
-                      default:
-                        util.win.top.location.href = href;
-                    }
-                  } else {
-                    this.getConfig();
-                  }
-                  break;
-                case 1:
-                  break;
-                case 2:
-                  break;
-                case 3:
-                  const href = results.authorizeUrl.replace(
-                    '{redirectUri}',
-                    encodeURIComponent(url)
-                  );
-                  switch (query.openType) {
-                    case 'self':
-                      util.win.location.href = href;
-                      break;
-                    case 'blank':
-                      util.win.open(href);
-                      break;
-                    case 'parent':
-                      util.win.parent.location.href = href;
-                      break;
-                    default:
-                      util.win.top.location.href = href;
-                  }
-                  break;
-                case 4:
-                  this.$alert(
-                    results.msg
-                      ? results.msg
-                      : '账号未绑定，账号密码登录后自动绑定！',
-                    '提示',
-                    {
-                      confirmButtonText: '确定',
-                      type: 'error',
-                      callback: () => {
-                        sessionStorage.setItem(
-                          'extUserBindHandleId',
-                          results.extUserBindHandleId
-                        );
-                        //window.location.href = delUrlParam({ key: 'code' });
-                        if (loginPage) {
-                          util.win.top.location.replace(loginPage);
-                        } else if (document.referrer) {
-                          util.win.top.location.replace(document.referrer);
-                        } else if (
-                          util.win.top.location.href.indexOf('main.html') > -1
-                        ) {
-                          util.win.top.location.href = './login.html';
-                        } else {
-                          this.$router.replace('/login');
-                        }
-                      }
-                    }
-                  );
-                  break;
-                default:
-              }
-            } else {
-              this.$alert(res.msg, '提示', {
-                confirmButtonText: '确定',
-                type: 'error',
-                callback: () => {
-                  if (loginPage) {
-                    util.win.top.location.replace(loginPage);
-                  } else if (document.referrer) {
-                    util.win.top.location.replace(document.referrer);
-                  } else if (
-                    util.win.top.location.href.indexOf('main.html') > -1
-                  ) {
-                    util.win.top.location.href = './login.html';
-                  } else {
-                    this.$router.replace('/login');
-                  }
-                }
-              });
-            }
-          })
-          .catch((e) => {});
-      } else {
-        this.getConfig();
-      }
-    },
     menuSuccess(res) {
       // this.menus
       this.menuType = 'custom';
@@ -1055,7 +909,16 @@ export default {
       }
     },
     //获取用户配置及信息
-    getConfig() {
+    getConfig(query) {
+      const token =
+        util.getStorage('token') || util.getStorage('Authorization');
+      if (
+        !token &&
+        Object.prototype.hasOwnProperty.call(query, 'serverId') &&
+        Object.prototype.hasOwnProperty.call(query, 'authType')
+      ) {
+        return false;
+      }
       if (util.getStorage('mainConfig')) {
         const results = JSON.parse(util.getStorage('mainConfig'));
         this.setConfig(results);
@@ -2012,11 +1875,11 @@ export default {
     },
     //开启weosocket
     initWebSocket() {
-      util
-        .socket()
-        .then((res, close) => {
-          this.close = close;
-          let data = res.data;
+      this.webSocket = util.socket({
+        url: wss,
+        take: topic,
+        success: (res) => {
+          let data = res.data || {};
           for (let i in data) {
             if (data[i] !== null && data[i] !== undefined) {
               if (i === 'onlineUserNums' && data[i] > 0) {
@@ -2048,10 +1911,8 @@ export default {
           if (util.win.eventBus) {
             util.win.eventBus.$emit('websocket', data);
           }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+        }
+      });
     },
     handleOpened(res) {
       if (res === undefined) {
@@ -2186,8 +2047,8 @@ export default {
   },
   beforeDestroy() {
     this.timer = null;
-    if (this.close) {
-      this.close();
+    if (this.webSocket) {
+      this.webSocket.destroy();
     }
   }
 };

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

@@ -175,11 +175,7 @@ export default {
       return this.options ? this.options : this.data;
     },
     labelVal() {
-      if (
-        this.readonly &&
-        (this.model || this.model === 0) &&
-        this.results.length
-      ) {
+      if (this.readonly && this.model !== undefined && this.results.length) {
         if (typeof this.model !== 'object') {
           if (util.isObject(this.results[0])) {
             let val;