eoss-ui 0.5.27 → 0.5.29

package/lib/upload.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 35);
+/******/ 	return __webpack_require__(__webpack_require__.s = 36);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -3630,13 +3630,13 @@ window.__store = store;
 /* 22 */,
 /* 23 */,
 /* 24 */,
-/* 25 */,
-/* 26 */
+/* 25 */
 /***/ (function(module, exports) {
 
 module.exports = require("js-base64");
 
 /***/ }),
+/* 26 */,
 /* 27 */,
 /* 28 */,
 /* 29 */,
@@ -3645,7 +3645,8 @@ module.exports = require("js-base64");
 /* 32 */,
 /* 33 */,
 /* 34 */,
-/* 35 */
+/* 35 */,
+/* 36 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4064,7 +4065,7 @@ var util = __webpack_require__(0);
 var store = __webpack_require__(11);
 
 // EXTERNAL MODULE: external "js-base64"
-var external_js_base64_ = __webpack_require__(26);
+var external_js_base64_ = __webpack_require__(25);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=script&lang=js&
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.27",
+  "version": "0.5.29",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -96,7 +96,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.80",
+    "eoss-element": "^0.2.81",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/button/src/main.vue

@@ -46,7 +46,8 @@ export default {
     syncKeys: Object,
     text: String,
     onClick: Function,
-    badge: [Object, Number]
+    badge: [Object, Number],
+    float: String
   },
   computed: {
     _type() {
@@ -268,7 +269,8 @@ export default {
       clas = clas.concat([
         'el-button',
         this._type ? `el-button--${this._type}` : 'el-button--default',
-        this.size ? `el-button--${this.size}` : ''
+        this.size ? `el-button--${this.size}` : '',
+        this.float ? `es-button--${this.float}` : ''
       ]);
     }
     if (this.badge) {

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

@@ -97,6 +97,7 @@
           label="操作"
           fixed="right"
           class="eoss-ui-eidt-column"
+          :button="headButton"
           :total="false"
         >
           <template slot-scope="scope">
@@ -108,7 +109,7 @@
               <i class="el-icon-circle-plus-outline"></i>
             </el-button>
             <el-button
-              v-if="!scope.row.cantDelete"
+              v-if="!scope.row.cantDelete && !isLeast"
               type="text"
               @click="handleClickDeleteData(scope)"
             >
@@ -142,7 +143,6 @@ import sizer from './sizer.vue';
 import util from 'eoss-ui/src/utils/util';
 import bus from 'eoss-ui/src/utils/bus';
 import qs from 'qs';
-import itemVue from '../../layout/src/item.vue';
 export default {
   name: 'EsDataTable',
   inheritAttrs: false,
@@ -303,6 +303,10 @@ export default {
       type: Boolean,
       default: false
     },
+    theadAdd: {
+      type: Boolean,
+      default: true
+    },
     // 单元格点击事件
     click: {
       type: Boolean,
@@ -356,6 +360,11 @@ export default {
       default() {
         return [];
       }
+    },
+    rowData: [Object, Boolean],
+    least: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -490,6 +499,18 @@ export default {
       set(val) {
         return val;
       }
+    },
+    headButton() {
+      return this.theadAdd
+        ? {
+            icon: 'el-icon-circle-plus-outline',
+            type: 'text',
+            event: this.handleClickAddData
+          }
+        : false;
+    },
+    isLeast() {
+      return this.data.length < 2 && this.least;
     }
   },
   watch: {
@@ -708,18 +729,43 @@ export default {
       this.$emit('row-click', row, column, event);
     },
     handleClickAddData(scope) {
-      const data = JSON.parse(JSON.stringify(scope.row));
-      let index = scope.$index + 1;
-      if (this.page) {
-        index += (this.config.pageNum - 1) * this.config.pageSize;
+      if (scope && scope.row) {
+        const data = JSON.parse(JSON.stringify(scope.row));
+        let index = scope.$index + 1;
+        if (this.page) {
+          index += (this.config.pageNum - 1) * this.config.pageSize;
+        }
+        this.data.splice(index, 0, data);
+        this.$emit('dataChange', 'add', data);
+        this.$emit('btnClick', {
+          event: 'addRow',
+          row: data,
+          index: index,
+          data: this.data
+        });
+      } else {
+        let index = this.data.length;
+        if (this.page) {
+          index += (this.config.pageNum - 1) * this.config.pageSize;
+        }
+        let rows = {};
+        if (this.rowData && typeof this.rowData == 'object') {
+          rows = this.rowData;
+        } else if (index && this.rowData === true) {
+          rows = JSON.parse(JSON.stringify(this.data[index - 1]));
+        } else {
+          this.getRow(this.thead, rows);
+        }
+        this.data.splice(index, 0, rows);
       }
-      this.data.splice(index, 0, data);
-      this.$emit('dataChange', 'add', data);
-      this.$emit('btnClick', {
-        event: 'addRow',
-        row: data,
-        index: index,
-        data: this.data
+    },
+    getRow(thead, obj) {
+      thead.forEach((item) => {
+        if (item.field) {
+          obj[item['field']] = item.defaultValue || '';
+        } else if (item.children && item.children.length) {
+          this.getRow(item.children, obj);
+        }
       });
     },
     handleClickDeleteData(scope) {
@@ -1309,7 +1355,6 @@ export default {
       });
     },
     validate(callback) {
-      console.log(this);
       if (this.form) {
         let form = this.elForm || this.$children[0];
         form.validate((valid) => {

package/packages/main/src/main.vue

@@ -927,6 +927,9 @@ export default {
         if (i === 'subsystemName') {
           document.title = results[i];
         }
+        if (i === 'loginPage' && results[i]) {
+          util.setStorage('loginPage', results[i]);
+        }
         if (i === 'sysLogoIco' && results[i]) {
           sessionStorage.setItem('sysLogoIco', results[i]);
           util.setFavicon(results[i]);
@@ -938,6 +941,10 @@ export default {
           util.win.top.webPageWatermark = results[i].webPageWatermark;
           util.watermark(results[i].webPageWatermark);
         }
+
+        if (i === 'subsystemExtend' && results[i].loginPage) {
+          util.setStorage('loginPage', results[i].loginPage);
+        }
         store.set(i, results[i]);
       }
       this.userModel = results.userModel;

package/packages/main/src/userinfo.vue

@@ -316,6 +316,7 @@ export default {
                   key: 'userId',
                   value: value.value
                 });
+                util.removeStorage('mainConfig');
                 this.$message({
                   message: res.msg,
                   type: 'success',

package/packages/selector/src/main.vue

@@ -88,7 +88,6 @@
               :tabindex="multiple ? '-1' : null"
               v-popover:popover
               @dblclick.native="openDialog"
-              @keyup.enter.native="handleSearch"
               @focus="handleFocus"
               @blur="handleBlur"
             >
@@ -106,6 +105,7 @@
               readonly
               :name="name"
               type="text"
+              wqwq
               v-show="false"
             ></el-input>
           </template>
@@ -131,7 +131,6 @@
             }"
             :tabindex="multiple ? '-1' : null"
             @dblclick.native="openDialog"
-            @keyup.enter.native="handleSearch"
             @clear="handleClear"
           >
             <template slot="append">
@@ -211,6 +210,7 @@
 import util from 'eoss-ui/src/utils/util.js';
 import { getSelectorOrgDetail } from 'eoss-ui/src/config/api.js';
 import Clickoutside from 'eoss-element/src/utils/clickoutside';
+import { debounce } from 'eoss-element/src/utils/util';
 export default {
   name: 'EsSelector',
   inheritAttrs: false,
@@ -326,6 +326,10 @@ export default {
     noMatchText: {
       type: String,
       default: '无匹配数据'
+    },
+    emptySerach: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -340,7 +344,8 @@ export default {
       options: '',
       show: false,
       focus: false,
-      reference: undefined
+      reference: undefined,
+      timer: null
     };
   },
   computed: {
@@ -386,7 +391,7 @@ export default {
       if (this.selected && this.selected.length) {
         return '';
       } else if (this.filterable) {
-        return '输入关键字按回车搜索';
+        return '输入关键字搜索';
       } else {
         return this.placeholder;
       }
@@ -414,6 +419,12 @@ export default {
           this.resetInputHeight();
         }
       }
+    },
+    words(val) {
+      if (this.emptySerach || val !== '') {
+        clearTimeout(this.timer);
+        this.timer = setTimeout(this.handleSearch, 500);
+      }
     }
   },
   created() {
@@ -611,6 +622,9 @@ export default {
           : res.label || res[this.valueKey])
       );
     }
+  },
+  beforeDestroy() {
+    this.$el.removeEventListener('keyup', this.doSearch);
   }
 };
 </script>

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

@@ -28,6 +28,7 @@
             :inline="true"
             :model="form"
             class="es-selector-selection-toolbar"
+            v-if="multiple || isShowTree"
           >
             <el-form-item>
               <el-checkbox
@@ -38,7 +39,7 @@
                 全选
               </el-checkbox>
             </el-form-item>
-            <div class="es-float-right">
+            <div class="es-float-right" v-if="isShowTree">
               <el-form-item v-if="showSelect && activeName == 'enterprise'">
                 <es-select
                   v-model="selectValue"

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

@@ -1 +1 @@
-.el-button+.es-button-badge,.es-button-badge+.el-button{margin-left:10px}.es-button-badge{vertical-align:unset}
+.el-button+.es-button-badge,.es-button-badge+.el-button{margin-left:10px}.es-button-badge{vertical-align:unset}.el-button[float=left],.el-button[float=right],.es-button--left,.es-button--right{float:left}