eoss-ui 0.5.90 → 0.5.92

package/packages/handler/src/main.vue

@@ -1,108 +1,105 @@
 <template>
   <ul class="es-handler">
-    <li
-      v-for="(item, index) in lists"
-      :key="index"
-      class="es-handler-item"
-      v-if="!item.hide"
-    >
-      <es-handle-user
-        v-if="item.type === 'user'"
-        class="es-handler-user"
-        :data="item"
-        :userModel="userModel"
-        :job-scrollbar="jobScrollbar"
-        @visible-change="handleVisibleChange"
-        @click="handleClick"
-        @change="handleChange"
-      ></es-handle-user>
-      <div v-else-if="item.type === 'date'" class="es-handler-date">
-        <div>
-          {{ time }}
-          <span v-if="show"
-            >当前<span
-              class="es-online-num"
-              :class="{ 'es-pointer': onlineList }"
-              @click.stop="onlineList ? handleClick({ type: 'online' }) : ''"
-              >{{ online }}</span
-            >人在线</span
-          >
-        </div>
-        <div>今 天：{{ date }}</div>
-      </div>
-      <el-popover
-        v-else-if="item.type === 'system'"
-        placement="bottom"
-        trigger="hover"
-        ref="system"
-        :popper-class="
-          system.length > 4
-            ? 'es-popper-sub-system is-width'
-            : 'es-popper-sub-system'
-        "
-        @show="showPopper = true"
-        @hide="showPopper = false"
-      >
-        <el-scrollbar :max-height="maxHeight" v-if="system.length">
-          <ul class="es-sub-system">
-            <li
-              v-for="ele in system"
-              class="es-sub-system-item"
-              :class="{
-                'es-disabled':
-                  (application && !ele.hasPermission) ||
-                  (ele.extendData && ele.extendData.businessStatus == 0)
-              }"
-              :key="ele.id"
-              :title="ele.text"
-              @click.stop="handleSelect({ node: ele })"
+    <li v-for="(item, index) in lists" :key="index" class="es-handler-item">
+      <template v-if="!item.hide">
+        <es-handle-user
+          v-if="item.type === 'user'"
+          class="es-handler-user"
+          :data="item"
+          :userModel="userModel"
+          :job-scrollbar="jobScrollbar"
+          @visible-change="handleVisibleChange"
+          @click="handleClick"
+          @change="handleChange"
+        ></es-handle-user>
+        <div v-else-if="item.type === 'date'" class="es-handler-date">
+          <div>
+            {{ time }}
+            <span v-if="show"
+              >当前<span
+                class="es-online-num"
+                :class="{ 'es-pointer': onlineList }"
+                @click.stop="onlineList ? handleClick({ type: 'online' }) : ''"
+                >{{ online }}</span
+              >人在线</span
             >
-              <el-badge
-                :is-dot="typeof ele.tips === 'boolean'"
-                :hidden="!ele.tips"
-                :max="99"
-                :value="typeof ele.tips !== 'boolean' ? ele.tips : 0"
-                ><i
-                  :class="[
-                    unicode(ele.icons) ? ele.icons : 'es-icon',
-                    'es-sub-system-icon',
-                    { 'es-icon-yingyong': !ele.icons }
-                  ]"
-                  v-html="unicode(ele.icons) ? '' : ele.icons"
-                ></i
-              ></el-badge>
-              <div class="es-sub-system-title">{{ ele.text }}</div>
-            </li>
-          </ul>
-        </el-scrollbar>
-        <div
-          slot="reference"
-          class="es-handler-icon"
-          :title="item.title"
-          :class="item.icon"
-        ></div>
-      </el-popover>
-      <el-badge
-        class="es-badge"
-        v-else-if="item.type === 'notice'"
-        :value="notice"
-        :max="99"
-        :hidden="notice === 0"
-      >
+          </div>
+          <div>今 天：{{ date }}</div>
+        </div>
+        <el-popover
+          v-else-if="item.type === 'system'"
+          placement="bottom"
+          trigger="hover"
+          ref="system"
+          :popper-class="
+            system.length > 4
+              ? 'es-popper-sub-system is-width'
+              : 'es-popper-sub-system'
+          "
+          @show="showPopper = true"
+          @hide="showPopper = false"
+        >
+          <el-scrollbar :max-height="maxHeight" v-if="system.length">
+            <ul class="es-sub-system">
+              <li
+                v-for="ele in system"
+                class="es-sub-system-item"
+                :class="{
+                  'es-disabled':
+                    (application && !ele.hasPermission) ||
+                    (ele.extendData && ele.extendData.businessStatus == 0)
+                }"
+                :key="ele.id"
+                :title="ele.text"
+                @click.stop="handleSelect({ node: ele })"
+              >
+                <el-badge
+                  :is-dot="typeof ele.tips === 'boolean'"
+                  :hidden="!ele.tips"
+                  :max="99"
+                  :value="typeof ele.tips !== 'boolean' ? ele.tips : 0"
+                  ><i
+                    :class="[
+                      unicode(ele.icons) ? ele.icons : 'es-icon',
+                      'es-sub-system-icon',
+                      { 'es-icon-yingyong': !ele.icons }
+                    ]"
+                    v-html="unicode(ele.icons) ? '' : ele.icons"
+                  ></i
+                ></el-badge>
+                <div class="es-sub-system-title">{{ ele.text }}</div>
+              </li>
+            </ul>
+          </el-scrollbar>
+          <div
+            slot="reference"
+            class="es-handler-icon"
+            :title="item.title"
+            :class="item.icon"
+          ></div>
+        </el-popover>
+        <el-badge
+          class="es-badge"
+          v-else-if="item.type === 'notice'"
+          :value="notice"
+          :max="99"
+          :hidden="notice === 0"
+        >
+          <div
+            class="es-handler-icon"
+            :title="item.title"
+            :class="item.icon"
+            @click.stop="handleClick(item)"
+          ></div>
+        </el-badge>
         <div
+          v-else
           class="es-handler-icon"
           :title="item.title"
           :class="item.icon"
           @click.stop="handleClick(item)"
         ></div>
-      </el-badge>
-      <div
-        v-else
-        class="es-handler-icon"
-        :title="item.title"
-        :class="item.icon"
-        @click.stop="handleClick(item)"
-      ></div>
+      </template>
     </li>
   </ul>
 </template>
@@ -317,7 +314,8 @@ export default {
                   'menus',
                   'useCaseCodes',
                   'mainConfig',
-                  'jump'
+                  'jump',
+                  'showLaunch'
                 ]);
                 if (this.onQuit && typeof this.onQuit === 'function') {
                   this.onQuit();

package/packages/login/src/main.vue

@@ -641,11 +641,20 @@ export default {
       }
     },
     warnInfo() {
-      return this.warning === false
-        ? false
-        : typeof this.warning === 'string'
-        ? this.warning
-        : '本系统为非涉密系统，禁止上传和处理任何涉密文件';
+      if (this.warning === false && !this.warningText) {
+        return false;
+      }
+      if (
+        this.warningText &&
+        this.warningText !== 'true' &&
+        this.warningText !== true
+      ) {
+        return this.warningText;
+      }
+      if (this.warning && typeof this.warning === 'string') {
+        return this.warning;
+      }
+      return '本系统为非涉密系统，禁止上传和处理任何涉密文件';
     },
     switchs() {
       return Array.isArray(this.loginModel)
@@ -803,6 +812,7 @@ export default {
       checkCode: '',
       showAssistance: false,
       doAssistance: null,
+      warningText: '',
       safes: {
         paste: (event) => {
           event.preventDefault();
@@ -835,7 +845,8 @@ export default {
       'deviceUnique',
       'userId',
       'userName',
-      'useCaseCodes'
+      'useCaseCodes',
+      'showLaunch'
     ]);
   },
   created() {

package/packages/main/src/main.vue

@@ -180,7 +180,8 @@ export default {
                 'menus',
                 'useCaseCodes',
                 'mainConfig',
-                'jump'
+                'jump',
+                'showLaunch'
               ]);
               const loginPage =
                 util.getStorage('login') || util.getStorage('loginPage');

package/packages/main/src/public/search.vue

@@ -235,7 +235,7 @@ export default {
       this.searchAll(res);
     });
     this.handleSearchd = debounce(500, (obj, index) => {
-      this.handleSearch(obj, index);
+      this.handleSearch(obj, index, false);
     });
   },
   created() {
@@ -335,7 +335,7 @@ export default {
             this.$set(this.noMore, item.id || String(i), true);
           } else if (item.dataRequestUrl) {
             this.isLoading = true;
-            this.handleSearch(item, i);
+            this.handleSearch(item, i, true);
           } else {
             this.types[i].records = [];
             this.types[i].totalCount = 0;
@@ -371,7 +371,7 @@ export default {
       });
       return records;
     },
-    handleSearch(obj, index) {
+    handleSearch(obj, index, reset) {
       if (obj.pageNum < obj.pageCount && this.keyWords) {
         this.$set(this.loadings, obj.id || String(index), true);
         if (this.active == '0') {
@@ -406,7 +406,9 @@ export default {
               obj.totalCount = results.totalCount;
               obj.pageCount = results.pageCount;
               obj.pageNum = results.pageNum;
-              obj.records = obj.records.concat(results.records);
+              obj.records = reset
+                ? results.records
+                : obj.records.concat(results.records);
               this.$set(
                 this.noMore,
                 obj.id || String(index),

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

@@ -1707,7 +1707,8 @@ export default {
                   'menus',
                   'useCaseCodes',
                   'mainConfig',
-                  'jump'
+                  'jump',
+                  'showLaunch'
                 ]);
                 if (this.onQuit && typeof this.onQuit === 'function') {
                   this.onQuit();

package/packages/selector/src/main.vue

@@ -203,6 +203,7 @@
         :type="types"
         :mix="mix"
         :isShowLevel3="isShowLevel3"
+        @tabschage="tabschage"
         @click.capture="stopd"
         @confirm="handleConfirm"
         @cancel="handleCancel"
@@ -536,6 +537,9 @@ export default {
     handleBlur() {
       this.focus = false;
     },
+    tabschage(trees, active) {
+      this.$emit('tabs-change', trees, active);
+    },
     handleClose(res) {
       if (!this.multiple && this.selected[0] === this.words) {
         this.selected = [];

package/packages/selector-panel/src/main.vue

@@ -652,12 +652,15 @@ export default {
         this.nodeData = this.trees[active].nodeData;
       } else {
         if (typeof this.selection === 'string') {
+          let params = this.param[this.activeName]
+            ? this.param[this.activeName]
+            : this.param;
           util
             .ajax({
               method: this.method,
               url: this.host + this.selection,
-              params: this.param,
-              data: this.param
+              params: params,
+              data: params
             })
             .then((res) => {
               if (res.rCode === 0) {
@@ -677,7 +680,11 @@ export default {
       }
     },
     getTreeData(url, params, id) {
-      let data = util.extend({}, params, this.param);
+      let data = util.extend(
+        {},
+        params,
+        this.param[this.activeName] ? this.param[this.activeName] : this.param
+      );
       if (id !== undefined) {
         data.id = id;
       }
@@ -715,7 +722,12 @@ export default {
       if (flag) {
         if (data.selection === undefined || data.selection.length === 0) {
           this.checkAll = false;
-          let params = util.extend({}, this.param);
+          let params = util.extend(
+            {},
+            this.param[this.activeName]
+              ? this.param[this.activeName]
+              : this.param
+          );
           params.type = this.activeName;
           params.mid = data.id;
           if (this.activeName === 'enterprise') {
@@ -772,7 +784,9 @@ export default {
           let params = util.extend(
             {},
             this.newTabs[this.activeName].param,
-            this.param
+            this.param[this.activeName]
+              ? this.param[this.activeName]
+              : this.param
           );
           params.id = data.id;
           util

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.90',
+  version: '0.5.92',
   install,
   Button,
   ButtonGroup,