eoss-ui 0.5.94 → 0.5.96

package/lib/table-form.js

@@ -3796,8 +3796,8 @@ module.exports = require("json-bigint");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=template&id=38b43090&
-var tablevue_type_template_id_38b43090_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=template&id=270d4342&
+var tablevue_type_template_id_270d4342_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6590,10 +6590,10 @@ var tablevue_type_template_id_38b43090_render = function () {
   )
 }
 var staticRenderFns = []
-tablevue_type_template_id_38b43090_render._withStripped = true
+tablevue_type_template_id_270d4342_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=38b43090&
+// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=270d4342&
 
 // EXTERNAL MODULE: ./src/utils/rules.js
 var rules = __webpack_require__(14);
@@ -7955,6 +7955,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       this.cols = widths;
     },
     handleClick: function handleClick(res) {
+      if (res.event && typeof res.event === 'function') {
+        res.event(res);
+      }
       this.$emit('btnClick', res, this.models);
       this.$emit('btn-click', res, this.models);
     },
@@ -8019,7 +8022,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_38b43090_render,
+  tablevue_type_template_id_270d4342_render,
   staticRenderFns,
   false,
   null,

package/lib/upload.js

@@ -3977,8 +3977,8 @@ module.exports = require("js-base64");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=12134e47&
-var mainvue_type_template_id_12134e47_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=2842c2fa&
+var mainvue_type_template_id_2842c2fa_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4359,10 +4359,10 @@ var mainvue_type_template_id_12134e47_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_12134e47_render._withStripped = true
+mainvue_type_template_id_2842c2fa_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=12134e47&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=2842c2fa&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4985,8 +4985,6 @@ var _props;
           });
           this.filesTotalSize = filesTotalSize;
           this.$emit('input', val);
-        } else {
-          this.getFiles(this.params);
         }
       }
     },
@@ -5095,6 +5093,7 @@ var _props;
                   dochubConfig: _this3.dochubConfig
                 });
               }
+              _this3.getFiles(_this3.params);
             }
           }).catch(function (err) {
             if (err.message && err.message !== 'canceled') {
@@ -5110,9 +5109,10 @@ var _props;
       if (!this.show || this.fileList && Array.isArray(this.fileList) && this.fileList.length || this.requiredOwnId && !Object.prototype.hasOwnProperty.call(params, 'ownId')) {
         return false;
       }
+      var url = typeof this.fileList === 'string' ? this.fileList : this.dochubConfig.getDocumentList ? this.dochubConfig.getDocumentList : api["z" /* getAdjunctFileInfos */];
       util["a" /* default */].ajax({
         method: this.method,
-        url: this.getAdjunctFileInfos,
+        url: url,
         data: params,
         params: params,
         format: false
@@ -5507,7 +5507,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_12134e47_render,
+  mainvue_type_template_id_2842c2fa_render,
   staticRenderFns,
   false,
   null,

package/lib/wujie.js

@@ -3771,7 +3771,7 @@ module.exports = require("json-bigint");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/wujie/src/main.vue?vue&type=template&id=332bb271&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/wujie/src/main.vue?vue&type=template&id=86017ede&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3819,7 +3819,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/wujie/src/main.vue?vue&type=template&id=332bb271&
+// CONCATENATED MODULE: ./packages/wujie/src/main.vue?vue&type=template&id=86017ede&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3868,6 +3868,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     height: { type: String, default: '100%' },
     name: { type: String, default: '' },
     loading: { type: HTMLElement, default: undefined },
+    host: {
+      type: String,
+      default: ''
+    },
     url: { type: String, default: '' },
     sync: { type: Boolean, default: false },
     prefix: { type: Object, default: undefined },
@@ -3941,8 +3945,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         if (val) {
           var urls = val.split('?');
           var plugins = this.plugins;
+          var defaultUrl = '';
           if (urls[0].indexOf('.js') > 1) {
-            this.defaultUrl = this.param ? util["a" /* default */].urlJoinParams({
+            defaultUrl = this.param ? util["a" /* default */].urlJoinParams({
               url: './primary.html',
               param: this.param,
               timestamp: true
@@ -3951,8 +3956,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
               jsBeforeLoaders: [{ src: val }]
             });
           } else {
-            this.defaultUrl = val;
+            defaultUrl = val;
           }
+          this.defaultUrl = util["a" /* default */].startWith(defaultUrl, 'http') ? defaultUrl : this.host + defaultUrl;
           this.defaultPlugins = plugins;
         }
       }

package/package.json

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

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

@@ -97,11 +97,14 @@
                 ></es-icon>
               </template>
             </el-table-column>
-            <el-table-column
+            <template
               v-else-if="item.type === 'index' || item.type === 'selection'"
-              :key="item.key || item.label || item.title || index"
-              v-bind="dragSort ? { ...item, fixed: false } : item"
-            ></el-table-column>
+            >
+              <el-table-column
+                :key="item.key || item.label || item.title || index"
+                v-bind="dragSort ? { ...item, fixed: false } : item"
+              ></el-table-column>
+            </template>
             <template v-else>
               <children
                 :tag="item.tag"

package/packages/form/src/table.vue

@@ -1368,6 +1368,9 @@ export default {
       this.cols = widths;
     },
     handleClick(res) {
+      if (res.event && typeof res.event === 'function') {
+        res.event(res);
+      }
       this.$emit('btnClick', res, this.models);
       this.$emit('btn-click', res, this.models);
     },

package/packages/handler/src/main.vue

@@ -1,7 +1,7 @@
 <template>
   <ul class="es-handler">
-    <li v-for="(item, index) in lists" :key="index" class="es-handler-item">
-      <template v-if="!item.hide">
+    <template v-for="(item, index) in lists">
+      <li v-if="!item.hide" :key="index" class="es-handler-item">
         <es-handle-user
           v-if="item.type === 'user'"
           class="es-handler-user"
@@ -99,8 +99,8 @@
           :class="item.icon"
           @click.stop="handleClick(item)"
         ></div>
-      </template>
-    </li>
+      </li>
+    </template>
   </ul>
 </template>
 <script>
@@ -314,8 +314,7 @@ export default {
                   'menus',
                   'useCaseCodes',
                   'mainConfig',
-                  'jump',
-                  'showLaunch'
+                  'jump'
                 ]);
                 if (this.onQuit && typeof this.onQuit === 'function') {
                   this.onQuit();

package/packages/login/src/main.vue

@@ -862,10 +862,7 @@ export default {
       showLaunch: false,
       launchImages: this.launchImage,
       launchKey: 'day',
-      launchTime: {
-        type: Number,
-        default: 3000
-      }
+      launchTime: 3000
     };
   },
   beforeCreate() {
@@ -880,12 +877,10 @@ export default {
       'deviceUnique',
       'userId',
       'userName',
-      'useCaseCodes',
-      'showLaunch'
+      'useCaseCodes'
     ]);
   },
   created() {
-    sessionStorage.setItem('launchImage', JSON.stringify(this.launchImages));
     this.launchKey = 5 < new Date().getHours() < 18 ? 'day' : 'night';
     if (ceshi == 'true' || ceshi == true) {
       this.loginModel = '0';
@@ -1082,7 +1077,7 @@ export default {
     async getLogin() {
       const config = util.getStorage('initLogin');
       if (config) {
-        this.setConfig(config);
+        this.setConfig(JSON.parse(config));
       }
       await util
         .ajax({ url: this.initLogin })
@@ -1134,7 +1129,6 @@ export default {
         downloads['linux'] = res.linuxDownloadUrl;
       }
       this.sysName = res.subsystemName;
-      sessionStorage.setItem('sysName', this.sysName);
       this.secret = res.secret;
       this.setup = res.setup;
       this.downloadSetup = res.downloadSetup;
@@ -1220,19 +1214,11 @@ export default {
           this.warningText = res.subsystemExtend.warningText;
         }
         if (res.subsystemExtend.launchTime) {
-          sessionStorage.setItem('launchTime', res.subsystemExtend.launchTime);
+          this.launchTime = parseInt(res.subsystemExtend.launchTime, 10);
         }
         if (res.subsystemExtend.launchImage) {
           if (!this.launchShow) {
             this.launchShow = true;
-            setTimeout(
-              () => {
-                this.launchShow = false;
-              },
-              res.subsystemExtend.launchTime
-                ? parseInt(res.subsystemExtend.launchTime)
-                : this.launchTime
-            );
           }
           if (
             res.subsystemExtend.launchImage != 'true' &&
@@ -1244,10 +1230,6 @@ export default {
                 ? JSON.parse(res.subsystemExtend.launchImage)
                 : res.subsystemExtend.launchImage;
           }
-          sessionStorage.setItem(
-            'launchImage',
-            JSON.stringify(this.launchImages)
-          );
         }
       }
       this.passModifyModel = res.passModifyModel;
@@ -1576,12 +1558,7 @@ export default {
               useCaseCodes: results.resourceCodes
             }
           });
-          if (
-            this.launchShow &&
-            !this.toUrl &&
-            !results.doorIndex &&
-            !this.doorIndex
-          ) {
+          if (this.launchShow) {
             this.$message({
               message: '登录成功!',
               type: 'success',
@@ -1589,18 +1566,24 @@ export default {
             });
             this.showLaunch = true;
             setTimeout(() => {
-              sessionStorage.setItem('showLaunch', 1);
-              if (window.location.href.indexOf('login.html') > -1) {
-                window.location.href = './main.html';
+              if (this.toUrl) {
+                window.location.href = this.toUrl;
+              } else if (results.doorIndex && this.doorIndex) {
+                sessionStorage.setItem('doorIndex', results.doorIndex);
+                localStorage.setItem('isLogined', true);
+                window.location.href = results.doorIndex;
               } else {
-                this.$router.push({ name: 'main' });
+                if (window.location.href.indexOf('login.html') > -1) {
+                  window.location.href = './main.html';
+                } else {
+                  this.$router.push({ name: 'main' });
+                  this.$nextTick(() => {
+                    this.showLaunch = false;
+                  });
+                }
               }
-              this.showLaunch = false;
-            }, 3000);
+            }, this.launchTime);
           } else {
-            if (this.launchShow) {
-              sessionStorage.setItem('launch', this.launchShow);
-            }
             this.$message({
               message: '登录成功!',
               type: 'success',

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

@@ -149,8 +149,8 @@
             <template v-else-if="method === 'router' && refresh">
               <router-view v-if="!isKeepAlive" :key="routerKey" />
               <keep-alive>
-                <router-view v-if="isKeepAlive" :key="routerKey"
-              /></keep-alive>
+                <router-view v-if="isKeepAlive" :key="routerKey" />
+              </keep-alive>
             </template>
           </div>
           <message
@@ -382,7 +382,7 @@ export default {
       default: true
     },
     loadHomePage: {
-      type: [Boolean, String],
+      type: Boolean,
       default: true
     },
     appCode: String,
@@ -586,6 +586,7 @@ export default {
       selectPage: '',
       //主页面
       homePage: '',
+      isLoadHomePage: this.loadHomePage,
       //header背景
       mainLogo: null,
       headerImg: this.headerImage,
@@ -639,8 +640,8 @@ export default {
   },
   created() {
     let params = util.getParams() || {};
-    if (typeof this.loadHomePage === 'string') {
-      this.homePage = this.loadHomePage;
+    if (params.homePage == 0) {
+      this.isLoadHomePage = false;
     }
     this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
@@ -813,39 +814,38 @@ export default {
         if (i === 'initApplication' && results[i]) {
           this.results[i] = results[i].split(',');
         }
-        if (i === 'indexUrl' && results[i] && this.loadHomePage) {
-          let applicationid =
-            util.getParams('applicationid') || util.getParams('applicationId');
-          let hash = util.win.location.hash;
-          if (hash) {
-            hash = hash.split('?')[0];
-          }
-          let jump = sessionStorage.getItem('jump');
-          if (
-            (!applicationid &&
-              !this.menuCode &&
-              (!jump || !this.isHistory) &&
-              (hash === '#/' || hash === '#/main')) ||
-            jump == results[i]
-          ) {
-            this.homePage =
-              typeof this.loadHomePage === 'string'
-                ? this.loadHomePage
-                : results[i];
-            if (this.isHomePage && this.homePage) {
-              if (this.menus && this.menus.length) {
-                let ids = null;
-                this.homePage && (ids = this.getId(this.menus, this.homePage));
-                if (ids) {
-                  this.defaultActive = ids;
-                } else if (this.homePage) {
-                  this.handleJump(this.homePage);
+        if (i === 'indexUrl' && results[i]) {
+          this.homePage = results[i];
+          if (this.isLoadHomePage) {
+            let applicationid =
+              util.getParams('applicationid') ||
+              util.getParams('applicationId');
+            let hash = util.win.location.hash;
+            if (hash) {
+              hash = hash.split('?')[0];
+            }
+            let jump = sessionStorage.getItem('jump');
+            if (
+              (!applicationid &&
+                !this.menuCode &&
+                (!jump || !this.isHistory) &&
+                (hash === '#/' || hash === '#/main')) ||
+              jump == results[i]
+            ) {
+              if (this.isHomePage) {
+                if (this.menus && this.menus.length) {
+                  let ids = (ids = this.getId(this.menus, this.homePage));
+                  if (ids) {
+                    this.defaultActive = ids;
+                  } else {
+                    this.handleJump(this.homePage);
+                  }
+                  this.setMenu(this.menus);
                 }
-                this.setMenu(this.menus);
               }
+            } else if (this.menus && this.menus.length) {
+              this.setMenu(this.menus);
             }
-          } else if (this.menus && this.menus.length) {
-            this.setMenu(this.menus);
           }
         }
         if (i === 'doorIndex' && results[i]) {
@@ -1173,10 +1173,10 @@ export default {
         this.isDefault = false;
         this.setDefault(res, this.defaultActive);
       } else {
-        if (this.homePage || !util.getStorage('mainConfig')) {
-          this.isDefault = true;
+        if (this.homePage) {
+          this.isDefault = this.isLoadHomePage;
           if (
-            this.homePage &&
+            this.isLoadHomePage &&
             (!this.defaultActive || !this.defaultActive.length)
           ) {
             let ids = this.getId(this.menus, this.homePage);

package/packages/main/src/main.vue

@@ -37,15 +37,6 @@
       ></iframe>
     </es-dialog>
     <!-- 公用弹窗 end -->
-
-    <transition name="launch-fade">
-      <div class="es-launch-image" :style="_launchImage" v-show="launchShow">
-        <p class="es-launch-text es-launch-user-name">{{ userName }}，你好！</p>
-        <p class="es-launch-text es-launch-system-name">
-          欢迎进入{{ sysName }}
-        </p>
-      </div>
-    </transition>
   </div>
 </template>
 <script>
@@ -99,18 +90,10 @@ export default {
       appCode: '',
       params: {},
       dialogs: [],
-      visibles: [],
-      sysName: '',
-      userName: '',
-      launchShow: this.launch,
-      showLaunch: false,
-      launchImages: this.launchImage,
-      launchKey: 'day',
-      launchTimer: null
+      visibles: []
     };
   },
   created() {
-    this.init();
     this.params = util.getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
@@ -171,40 +154,6 @@ export default {
     });
   },
   methods: {
-    /**
-     * @desc:初始化
-     * @author huangbo
-     * @date 2024年9月7日
-     **/
-    init() {
-      this.userName = util.getStorage('userName');
-      this.sysName = util.getStorage('sysName');
-      this.launchKey = 5 < new Date().getHours() < 18 ? 'day' : 'night';
-      const showLaunch = sessionStorage.getItem('showLaunch');
-      const launch = sessionStorage.getItem('launch');
-      const launchImage = sessionStorage.getItem('launchImage');
-      const launchTime = util.getStorage('launchTime');
-      if (launchImage) {
-        this.launchImages = JSON.parse(launchImage);
-      }
-      if (showLaunch) {
-        this.launchShow = false;
-      } else if (launch) {
-        if (launch == 'true') {
-          this.launchShow = true;
-          clearTimeout(this.launchTimer);
-          this.launchTimer = setTimeout(
-            () => {
-              this.launchShow = false;
-              sessionStorage.setItem('showLaunch', 1);
-            },
-            launchTime ? parseInt(launchTime, 10) : this.launchTime
-          );
-        } else {
-          this.launchShow = false;
-        }
-      }
-    },
     /**
      * @desc:重新登录
      * @author huangbo
@@ -253,8 +202,7 @@ export default {
                 'menus',
                 'useCaseCodes',
                 'mainConfig',
-                'jump',
-                'showLaunch'
+                'jump'
               ]);
               const loginPage =
                 util.getStorage('login') || util.getStorage('loginPage');
@@ -317,45 +265,10 @@ export default {
       let mainConfig = util.getStorage('mainConfig');
       if (!mainConfig || mainConfig == '{}') {
         util.getMainConfig((res) => {
-          this.userName =
-            res.results.userModel.username || res.userModel.userName;
-          this.sysName = res.subsystemName;
-          if (res.subsystemExtend && res.subsystemExtend.launchImage) {
-            if (!this.launchShow) {
-              this.launchShow = true;
-              clearTimeout(this.launchTimer);
-              this.launchTimer = setTimeout(
-                () => {
-                  this.launchShow = false;
-                  sessionStorage.setItem('showLaunch', 1);
-                },
-                res.subsystemExtend.launchTime
-                  ? parseInt(res.subsystemExtend.launchTime, 10)
-                  : this.launchTime
-              );
-            }
-            if (
-              res.subsystemExtend.launchImage != 'true' &&
-              res.subsystemExtend.launchImage != true
-            ) {
-              this.launchImages =
-                res.subsystemExtend.launchImage.indexOf('{') > -1 &&
-                res.subsystemExtend.launchImage.indexOf('}') > -1
-                  ? JSON.parse(res.subsystemExtend.launchImage)
-                  : res.subsystemExtend.launchImage;
-            }
-            sessionStorage.setItem(
-              'launchImage',
-              JSON.stringify(this.launchImages)
-            );
-          }
           this.$refs.main.init(res);
         });
       } else {
         mainConfig = JSON.parse(mainConfig);
-        this.userName =
-          mainConfig.userModel.username || mainConfig.userModel.userName;
-        this.sysName = mainConfig.subsystemName;
       }
     },
     /**