eoss-ui 0.5.85 → 0.5.87

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

@@ -1,11 +1,12 @@
 <template>
   <component
-    :is="tag"
+    v-show="showTable"
     class="es-data-table"
     label-width="0"
     ref="component"
     v-loading="tableLoading"
     element-loading-background="rgba(0, 0, 0, 0.65)"
+    :is="tag"
     :model="tag === 'div' ? '' : list"
     :element-loading-text="tableLoadingText"
   >
@@ -452,6 +453,7 @@ export default {
     least: Boolean,
     //保留搜索参数
     retainSearh: Boolean,
+    //无线滚动
     infiniteScroll: Boolean,
     isJoin: {
       type: Boolean,
@@ -502,11 +504,13 @@ export default {
       options: {},
       icon: true,
       sysCodes: [],
-      infiniteDisabled: this.infiniteScroll,
+      infiniteDisabled: !this.infiniteScroll,
       isReload: false,
       pageView: null,
       showSizer: false,
-      show: true
+      show: true,
+      isSetHeight: false,
+      showTable: false
     };
   },
   computed: {
@@ -818,6 +822,9 @@ export default {
     this.chekOpenTotalArea();
   },
   mounted() {
+    this.isSetHeight =
+      util.getStyle(this.$el.parentNode, 'height') == '0px' ? false : true;
+    this.showTable = true;
     if (this.data.length) {
       this.list = this.setData();
     }
@@ -1586,7 +1593,7 @@ export default {
     },
     resetHeight(warn) {
       this.$nextTick(() => {
-        if (this.full && !this.height && !this.maxHeight) {
+        if (this.full && !this.height && !this.maxHeight && this.isSetHeight) {
           let height = this.$el.parentNode.offsetHeight;
           if (height) {
             height = parseInt(
@@ -1602,7 +1609,11 @@ export default {
               );
             for (let i = 0; i < this.$el.parentNode.childNodes.length; i++) {
               let ele = this.$el.parentNode.childNodes[i];
-              if (ele.offsetHeight !== undefined) {
+              if (
+                this.$el &&
+                ele.offsetHeight !== undefined &&
+                ele != this.$el
+              ) {
                 height =
                   height -
                   ele.offsetHeight -

package/packages/login/src/main.vue

@@ -104,6 +104,8 @@
                   :placeholder="password.placeholder"
                   autocomplete="off"
                   show-password
+                  @paste.native.capture="handlePaste"
+                  @copy.native.capture="handlePaste"
                 >
                   <template slot="prefix">
                     <i class="es-icon-mima es-label-password"></i>
@@ -160,7 +162,7 @@
                   >记住密码</el-checkbox
                 >
                 <div v-show="forget" class="es-password-forget">
-                  <span @click="handleForget">忘记密码？</span>
+                  <span @click="handleForget">修改密码</span>
                 </div>
               </div>
               <el-button
@@ -594,7 +596,8 @@ export default {
       default: 1500
     },
     isScale: Boolean,
-    showIosTips: Boolean
+    showIosTips: Boolean,
+    safe: Boolean
   },
   computed: {
     transform() {
@@ -799,7 +802,25 @@ export default {
       copyrightBgColor: null,
       checkCode: '',
       showAssistance: false,
-      doAssistance: null
+      doAssistance: null,
+      safes: {
+        paste: (event) => {
+          event.preventDefault();
+          return false;
+        },
+        contextmenu: (event) => {
+          event.preventDefault();
+          return false;
+        },
+        copy: (event) => {
+          event.preventDefault();
+          return false;
+        },
+        cut: (event) => {
+          event.preventDefault();
+          return false;
+        }
+      }
     };
   },
   beforeCreate() {
@@ -1617,6 +1638,9 @@ export default {
       if (e.keyCode == 9) {
         return false;
       }
+    },
+    handlePaste(event) {
+      this.safe && event.preventDefault();
     }
   },
   beforeDestroy() {

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

@@ -9,13 +9,7 @@
       round
     ></el-input>
     <el-tabs class="es-public-search-tabs" v-model="active">
-      <el-tab-pane
-        label="综合"
-        name="0"
-        v-loading="loading"
-        element-loading-background="rgba(0, 0, 0, 0.01)"
-        element-loading-text="加载中..."
-      >
+      <el-tab-pane label="综合" name="0">
         <el-scrollbar class="es-scrollbar">
           <template v-for="(item, index) in types">
             <div
@@ -69,72 +63,72 @@
           </template>
         </el-scrollbar>
       </el-tab-pane>
-      <el-tab-pane
-        v-for="(item, index) in types"
-        lazy
-        :label="item.name"
-        :name="item.id || String(index + 1)"
-        :key="item.id"
-        v-loading="loadings[item.id || String(index)]"
-        element-loading-background="rgba(0, 0, 0, 0.01)"
-        element-loading-text="加载中..."
-        v-show="hides.includes(item.name)"
-      >
-        <el-scrollbar
-          class="es-scrollbar es-public-search-scrollbar"
-          :infinite-scroll="
-            () => {
-              handleSearchd(item, index);
-            }
-          "
-          :infinite-scroll-disabled="disabled"
-          :infinite-scroll-immediate="false"
+      <template v-for="(item, index) in types">
+        <el-tab-pane
+          :label="item.name"
+          :name="item.id || String(index + 1)"
+          :key="item.id"
+          v-loading="loadings[item.id || String(index)]"
+          element-loading-background="rgba(0, 0, 0, 0.01)"
+          element-loading-text="加载中..."
+          v-if="!hides.includes(item.name)"
         >
-          <div class="es-public-search-info">
-            {{ item.totalCount }}条与"<span
-              class="es-public-search-more-quote"
-              >{{ keyWords }}</span
-            >"相关的搜索结果
-          </div>
-          <ul class="es-public-search-lists">
-            <li
-              v-for="ele in item.records"
-              class="es-public-search-list-item"
-              :key="ele.id"
-              @click="handleClick(ele, item)"
-            >
-              <es-icon
-                class="es-public-search-item-icon"
-                v-bind="getIcon(ele, item)"
-                :style="setStyle(ele, index)"
-              ></es-icon>
-              <div class="es-public-search-item-name">
-                {{ ele.name || ele.title || ele.text }}
-              </div>
-              <div class="es-public-search-item-texts" v-if="ele.summary">
-                {{ ele.summary }}
-              </div>
-              <div class="es-public-search-item-texts">
-                <template v-if="Array.isArray(ele.infos || ele.footer)">
-                  <span
-                    v-for="(text, idx) in ele.infos || ele.footer"
-                    class="es-public-search-item-text"
-                    :key="idx"
-                    >{{ text }}</span
-                  >
-                </template>
-                <template v-else>{{ ele.infos || ele.footer }}</template>
-              </div>
-            </li>
-          </ul>
-          <p
-            class="es-public-search-no-more"
-            v-if="noMore[item.id || String(index)]"
+          <el-scrollbar
+            class="es-scrollbar es-public-search-scrollbar"
+            :infinite-scroll="
+              () => {
+                handleSearchd(item, index);
+              }
+            "
+            :infinite-scroll-disabled="disabled"
+            :infinite-scroll-immediate="false"
           >
-            没有更多了
-          </p>
-        </el-scrollbar>
-      </el-tab-pane>
+            <div class="es-public-search-info" v-show="keyWords">
+              {{ item.totalCount }}条与"<span
+                class="es-public-search-more-quote"
+                >{{ keyWords }}</span
+              >"相关的搜索结果
+            </div>
+            <ul class="es-public-search-lists">
+              <li
+                v-for="ele in item.records"
+                class="es-public-search-list-item"
+                :key="ele.id"
+                @click="handleClick(ele, item)"
+              >
+                <es-icon
+                  class="es-public-search-item-icon"
+                  v-bind="getIcon(ele, item)"
+                  :style="setStyle(ele, index)"
+                ></es-icon>
+                <div class="es-public-search-item-name">
+                  {{ ele.name || ele.title || ele.text }}
+                </div>
+                <div class="es-public-search-item-texts" v-if="ele.summary">
+                  {{ ele.summary }}
+                </div>
+                <div class="es-public-search-item-texts">
+                  <template v-if="Array.isArray(ele.infos || ele.footer)">
+                    <span
+                      v-for="(text, idx) in ele.infos || ele.footer"
+                      class="es-public-search-item-text"
+                      :key="idx"
+                      >{{ text }}</span
+                    >
+                  </template>
+                  <template v-else>{{ ele.infos || ele.footer }}</template>
+                </div>
+              </li>
+            </ul>
+            <p
+              class="es-public-search-no-more"
+              v-if="noMore[item.id || String(index)]"
+            >
+              没有更多了
+            </p>
+          </el-scrollbar>
+        </el-tab-pane>
+      </template>
     </el-tabs>
   </div>
 </template>
@@ -311,8 +305,8 @@ export default {
     },
     searchAll(keyWords) {
       for (let i = 0; i < this.types.length; i++) {
+        let item = this.types[i];
         if (keyWords) {
-          let item = this.types[i];
           if (item.name == '菜单' && this.menus.length) {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.menus, keyWords);

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

@@ -191,6 +191,7 @@
 </template>
 
 <script>
+import util from 'eoss-ui/src/utils/util';
 import { debounce } from 'throttle-debounce';
 import { recordUserApp } from 'eoss-ui/src/config/api.js';
 export default {

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

@@ -170,7 +170,7 @@
           <div
             class="es-simplicity-tabs-handler-item"
             :class="{ 'is-disabled': isDisabled.other }"
-            @click="isDisabled.left ? '' : handleTabsEvents(2)"
+            @click="isDisabled.other ? '' : handleTabsEvents(2)"
           >
             关闭其他
           </div>
@@ -285,7 +285,11 @@
       <notice :data="sysMsg" :winopen="winopen" @opened="handleOpened"></notice>
       <!-- 消息提醒 end -->
 
-      <es-dialog :visible.sync="showSearch" size="lg">
+      <es-dialog
+        class="es-public-search-dialog"
+        :visible.sync="showSearch"
+        size="lg"
+      >
         <search
           :apps="applications"
           :menus="menus"

package/packages/theme-chalk/lib/button-group.css

@@ -1 +1 @@
-@charset "UTF-8";.el-button-group>.es-selector,.el-button-group>.es-upload{float:left}.el-button-group>.es-selector:first-child>.el-button,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button{border-top-right-radius:0;border-bottom-right-radius:0}.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button{border-radius:0}.el-button-group>.es-selector:last-child>.el-button,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button{border-top-left-radius:0;border-bottom-left-radius:0}.el-button-group>.es-selector:not(:last-child)>.el-button,.el-button-group>.es-upload:not(:last-child)>.el-upload--handle>.el-upload>.el-button{margin-right:-1px}.es-button-group{display:-webkit-box;display:-ms-flexbox;display:flex}.es-button-group>.el-dropdown{margin-left:10px}.es-button-group>.el-dropdown>.el-button:not(.el-button--text){border-color:#d9d9d9}.el-button-group>.el-button:not(.el-button--text)+.es-button:not(.el-button--text),.el-button-group>.es-button:not(.el-button--text)+.el-button:not(.el-button--text),.el-button-group>.es-button:not(.el-button--text)+.el-dropdown,.el-button-group>.es-button:not(.el-button--text)+.es-button:not(.el-button--text),.el-button-group>.es-button:not(.el-button--text)+.es-selector,.el-button-group>.es-button:not(.el-button--text)+.es-upload{margin-left:0}.el-button-group>.es-selector+.el-button--text,.el-button-group>.es-selector+.el-dropdown,.el-button-group>.es-selector:not(:first-child):not(:last-child),.el-button-group>.es-upload+.el-button--text,.el-button-group>.es-upload+.el-dropdown,.el-button-group>.es-upload:not(:first-child):not(:last-child){margin-left:10px}.el-button-group>.es-selector:first-child>.el-button.el-button--danger,.el-button-group>.es-selector:first-child>.el-button.el-button--info,.el-button-group>.es-selector:first-child>.el-button.el-button--primary,.el-button-group>.es-selector:first-child>.el-button.el-button--success,.el-button-group>.es-selector:first-child>.el-button.el-button--warning{border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--danger,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--info,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--primary,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--success,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5);border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-selector:last-child>.el-button.el-button--danger,.el-button-group>.es-selector:last-child>.el-button.el-button--info,.el-button-group>.es-selector:last-child>.el-button.el-button--primary,.el-button-group>.es-selector:last-child>.el-button.el-button--success,.el-button-group>.es-selector:last-child>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5);border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5)}.es-dropdown-padding{padding:0}.es-dropdown-selector>.el-button,.es-dropdown-upload>.el-upload--handle>.el-upload>.el-button{display:block;width:100%;text-align:left;padding:6px 20px;line-height:24px;font-size:14px;border:0}.es-dropdown-upload>.el-upload--handle,.es-dropdown-upload>.el-upload--handle>.el-upload{display:block}.es-dropdown-upload>.el-upload--handle>.el-upload>.el-button{color:rgba(0,0,0,.75)}.es-dropdown-upload>.el-upload--handle>.el-upload>.el-button:hover{color:#69c0ff}.es-dropdown-selector>.el-button{color:rgba(0,0,0,.75)}.es-dropdown-selector>.el-button:hover{color:#69c0ff}
+@charset "UTF-8";.el-button-group>.es-selector,.el-button-group>.es-upload{float:left}.el-button-group>.es-selector:first-child>.el-button,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button{border-top-right-radius:0;border-bottom-right-radius:0}.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button{border-radius:0}.el-button-group>.es-selector:last-child>.el-button,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button{border-top-left-radius:0;border-bottom-left-radius:0}.el-button-group>.es-selector:not(:last-child)>.el-button,.el-button-group>.es-upload:not(:last-child)>.el-upload--handle>.el-upload>.el-button{margin-right:-1px}.es-button-group{display:-webkit-box;display:-ms-flexbox;display:flex}.es-button-group>.el-dropdown{margin-left:10px}.es-button-group>.el-dropdown>.el-button:not(.el-button--text){border-color:#d9d9d9}.es-button-group>.el-dropdown>.el-button:not(.el-button--text) .el-badge{vertical-align:unset}.el-button-group>.el-button:not(.el-button--text)+.es-button:not(.el-button--text),.el-button-group>.es-button:not(.el-button--text)+.el-button:not(.el-button--text),.el-button-group>.es-button:not(.el-button--text)+.el-dropdown,.el-button-group>.es-button:not(.el-button--text)+.es-button:not(.el-button--text),.el-button-group>.es-button:not(.el-button--text)+.es-selector,.el-button-group>.es-button:not(.el-button--text)+.es-upload{margin-left:0}.el-button-group>.es-selector+.el-button--text,.el-button-group>.es-selector+.el-dropdown,.el-button-group>.es-selector:not(:first-child):not(:last-child),.el-button-group>.es-upload+.el-button--text,.el-button-group>.es-upload+.el-dropdown,.el-button-group>.es-upload:not(:first-child):not(:last-child){margin-left:10px}.el-button-group>.es-selector:first-child>.el-button.el-button--danger,.el-button-group>.es-selector:first-child>.el-button.el-button--info,.el-button-group>.es-selector:first-child>.el-button.el-button--primary,.el-button-group>.es-selector:first-child>.el-button.el-button--success,.el-button-group>.es-selector:first-child>.el-button.el-button--warning{border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--danger,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--info,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--primary,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--success,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5);border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-selector:last-child>.el-button.el-button--danger,.el-button-group>.es-selector:last-child>.el-button.el-button--info,.el-button-group>.es-selector:last-child>.el-button.el-button--primary,.el-button-group>.es-selector:last-child>.el-button.el-button--success,.el-button-group>.es-selector:last-child>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5);border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5)}.es-dropdown-padding{padding:0}.es-dropdown-selector>.el-button,.es-dropdown-upload>.el-upload--handle>.el-upload>.el-button{display:block;width:100%;text-align:left;padding:6px 20px;line-height:24px;font-size:14px;border:0}.es-dropdown-upload>.el-upload--handle,.es-dropdown-upload>.el-upload--handle>.el-upload{display:block}.es-dropdown-upload>.el-upload--handle>.el-upload>.el-button{color:rgba(0,0,0,.75)}.es-dropdown-upload>.el-upload--handle>.el-upload>.el-button:hover{color:#69c0ff}.es-dropdown-selector>.el-button{color:rgba(0,0,0,.75)}.es-dropdown-selector>.el-button:hover{color:#69c0ff}