eoss-ui 0.5.63 → 0.5.65

package/lib/tree-group.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/tree.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/upload.js

@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;
@@ -3826,8 +3828,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=789e2154&
-var mainvue_type_template_id_789e2154_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=031cebad&
+var mainvue_type_template_id_031cebad_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4208,10 +4210,10 @@ var mainvue_type_template_id_789e2154_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_789e2154_render._withStripped = true
+mainvue_type_template_id_031cebad_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=789e2154&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=031cebad&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4958,7 +4960,9 @@ var _props;
               }
             });
             _this3.filesTotalSize = filesTotalSize;
-            _this3.$emit('input', _this3.lists.length ? _this3.lists : '');
+            if (_this3.lists.length) {
+              _this3.$emit('input', _this3.lists);
+            }
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
@@ -5311,7 +5315,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_789e2154_render,
+  mainvue_type_template_id_031cebad_render,
   staticRenderFns,
   false,
   null,

package/lib/utils/util.js

@@ -2118,7 +2118,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2808,7 +2808,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/wujie.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/wxlogin.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/package.json

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

package/packages/button/src/main.vue

@@ -47,7 +47,9 @@ export default {
     text: String,
     onClick: Function,
     badge: [Object, Number],
-    float: String
+    float: String,
+    selector: Boolean,
+    upload: Boolean
   },
   computed: {
     _type() {
@@ -260,68 +262,86 @@ export default {
     }
     let tag = 'el-button';
     let clas = ['es-button'];
-    let props = { type: this._type, size: this.size };
+    let props = {};
     let attrs = {};
-    if (this.link && !this.open) {
-      const link = this.param
-        ? util.urlJoinParams({ url: this.link, param: this.param })
-        : this.link;
-      attrs = { href: link };
-      tag = 'a';
-      clas = clas.concat([
-        'el-button',
-        this._type ? `el-button--${this._type}` : 'el-button--default',
-        this.size ? `el-button--${this.size}` : '',
-        this.float ? `es-button--${this.float}` : ''
-      ]);
-    }
-    if (this.badge) {
-      let config = {};
-      if (typeof this.badge === 'number') {
-        config = { class: 'es-button-badge', props: { value: this.badge } };
-      } else {
-        let { value, max, isDot, hidden, type } = this.badge;
-        config = {
-          class: this.badge.class
-            ? this.badge.class + ' es-button-badge'
-            : 'es-button-badge',
-          props: { value, max, isDot, hidden, type }
-        };
+    let listeners = {};
+    let config = {};
+    if (this.selector) {
+      tag = 'es-selector';
+      props = { ...this.$attrs, button: { type: this._type, size: this.size } };
+      listeners = this.$listeners;
+    } else if (this.upload) {
+      tag = 'es-upload';
+      props = { ...this.$attrs, showFileList: false };
+      listeners = this.$listeners;
+      config = {
+        type: this._type,
+        size: this.size
+      };
+    } else {
+      props = { ...this.$attrs, type: this._type, size: this.size };
+      listeners = { ...this.$listeners, click: this.handleClick };
+      if (this.link && !this.open) {
+        const link = this.param
+          ? util.urlJoinParams({ url: this.link, param: this.param })
+          : this.link;
+        attrs = { href: link };
+        tag = 'a';
+        clas = clas.concat([
+          'el-button',
+          this._type ? `el-button--${this._type}` : 'el-button--default',
+          this.size ? `el-button--${this.size}` : '',
+          this.float ? `es-button--${this.float}` : ''
+        ]);
       }
-      return h('el-badge', config, [
-        h(
-          tag,
-          {
-            class: clas,
-            props: { ...this.$attrs, ...props },
-            attrs: attrs,
-            on: { ...this.$listeners, click: this.handleClick },
-            directives: [
-              {
-                name: 'show',
-                value: !this.hide
-              }
-            ]
-          },
-          this.iconPlacement === 'start'
-            ? [
-                this.icon ? h('i', { class: this.icon }) : '',
-                this.$slots.default || this.text
-              ]
-            : [
-                this.$slots.default || this.text,
-                this.icon ? h('i', { class: this.icon }) : ''
+      if (this.badge) {
+        let config = {};
+        if (typeof this.badge === 'number') {
+          config = { class: 'es-button-badge', props: { value: this.badge } };
+        } else {
+          let { value, max, isDot, hidden, type } = this.badge;
+          config = {
+            class: this.badge.class
+              ? this.badge.class + ' es-button-badge'
+              : 'es-button-badge',
+            props: { value, max, isDot, hidden, type }
+          };
+        }
+        return h('el-badge', config, [
+          h(
+            tag,
+            {
+              class: clas,
+              props: { ...this.$attrs, ...props },
+              attrs: attrs,
+              on: { ...this.$listeners, click: this.handleClick },
+              directives: [
+                {
+                  name: 'show',
+                  value: !this.hide
+                }
               ]
-        )
-      ]);
+            },
+            this.iconPlacement === 'start'
+              ? [
+                  this.icon ? h('i', { class: this.icon }) : '',
+                  this.$slots.default || this.text
+                ]
+              : [
+                  this.$slots.default || this.text,
+                  this.icon ? h('i', { class: this.icon }) : ''
+                ]
+          )
+        ]);
+      }
     }
     return h(
       tag,
       {
         class: clas,
-        props: { ...this.$attrs, ...props },
+        props: props,
         attrs: attrs,
-        on: { ...this.$listeners, click: this.handleClick },
+        on: listeners,
         directives: [
           {
             name: 'show',
@@ -332,10 +352,26 @@ export default {
       this.iconPlacement === 'start'
         ? [
             this.icon ? h('i', { class: this.icon }) : '',
-            this.$slots.default || this.text
+            this.upload
+              ? h(
+                  'el-button',
+                  {
+                    props: config
+                  },
+                  [this.$slots.default || this.text]
+                )
+              : this.$slots.default || this.text
           ]
         : [
-            this.$slots.default || this.text,
+            this.upload
+              ? h(
+                  'el-button',
+                  {
+                    props: config
+                  },
+                  [this.$slots.default || this.text]
+                )
+              : this.$slots.default || this.text,
             this.icon ? h('i', { class: this.icon }) : ''
           ]
     );

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

@@ -17,10 +17,16 @@
           <es-button
             v-else
             :stop="stop"
-            v-bind="item"
+            v-bind="
+              exclAttribute({
+                data: item,
+                attrs: ['events']
+              })
+            "
             :key="index"
             :size="size"
             :type="item.type"
+            v-on="item.events"
             @click="handleClick({ ...data, handle: item })"
           >
             {{
@@ -126,6 +132,9 @@ export default {
     this.resetWidth();
   },
   methods: {
+    exclAttribute({ data, attrs }) {
+      return util.exclAttribute({ data, attrs });
+    },
     getBtns() {
       let useCaseCodes = util.getStorage('useCaseCodes');
       let keyword =

package/packages/calendar/src/main.vue

@@ -34,7 +34,8 @@
           :class="{
             'es-disabled-day': item.type == 0,
             'es-today': isSelect(item, today) && mark,
-            'es-select': isSelect(item, select)
+            'es-select': isSelect(item, select),
+            'es-disabled': item.disabled
           }"
         >
           {{ item.date }}
@@ -78,7 +79,8 @@ export default {
       type: Boolean,
       default: true
     },
-    mark: Boolean
+    mark: Boolean,
+    disabled: Boolean
   },
   watch: {
     date: {
@@ -191,6 +193,9 @@ export default {
       return target == `${year}/${month}/${date}`;
     },
     handleClick(res) {
+      if (res.disabled) {
+        return false;
+      }
       let { year, month, date } = res;
       this.selectDate = date;
       this.select = `${year}/${month}/${date}`;
@@ -322,7 +327,8 @@ export default {
             date: i,
             type: 0,
             year: month == 0 ? year - 1 : year,
-            month: month == 0 ? 12 : month
+            month: month == 0 ? 12 : month,
+            disabled: this.disabled
           });
         }
       }
@@ -343,7 +349,8 @@ export default {
             date: i,
             type: 0,
             year: month == 11 ? year + 1 : year,
-            month: month == 11 ? 1 : month + 2
+            month: month == 11 ? 1 : month + 2,
+            disabled: this.disabled
           });
         }
       }

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

@@ -8,7 +8,8 @@
           v-bind="{
             ...$attrs,
             ...item,
-            indexs: index
+            indexs: index,
+            ...(dragSort ? { ...item, fixed: false } : item)
           }"
           v-on="$listeners"
         ></children
@@ -24,6 +25,7 @@ export default {
     [column.name]: column
   },
   props: {
+    dragSort: Boolean,
     children: Array,
     childHead: Array
   },

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

@@ -43,7 +43,6 @@
         ref="oaTable"
         v-bind="{
           ...$attrs,
-          data: datas,
           emptyText: emptyText,
           showSummary: showTotal,
           sumText: sumText || totalText,
@@ -54,28 +53,46 @@
               : undefined,
           border: _border,
           infiniteScroll: getTableData,
-          infiniteScrollDisabled: infiniteDisabled
+          infiniteScrollDisabled: infiniteDisabled,
+          dragSort: dragSort,
+          dragSortClass: dragSortIcon
         }"
+        :data.sync="datas"
         v-on="{
           ...$listeners,
           'row-click': rowClick,
           'selection-change': selectionChange,
           'filter-column': handleFilterColumn,
-          'sort-change': handleSortChange
+          'sort-change': handleSortChange,
+          'update-drag-sort': handleUpdateDragSort
         }"
         :class="
           'es-table' +
           (theadBorder && border != 'none' ? ' es-thead-border' : '')
         "
       >
+        <!-- <el-table-column v-if="dragSort" width="32" fixed>
+          <template slot-scope="scope">
+            <es-icon :contents="dragSortIcon"></es-icon>
+          </template>
+        </el-table-column> -->
         <slot name="prepend"></slot>
         <slot></slot>
         <template v-for="(item, index) in theads">
           <template v-if="item.hide !== true">
             <el-table-column
-              v-if="item.type === 'index' || item.type === 'selection'"
+              v-if="item.type === 'sort'"
+              width="32"
+              :key="index"
+            >
+              <template slot-scope="scope">
+                <es-icon class="es-move" :contents="dragSortIcon"></es-icon>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else-if="item.type === 'index' || item.type === 'selection'"
               :key="index"
-              v-bind="item"
+              v-bind="dragSort ? { ...item, fixed: false } : item"
             ></el-table-column>
             <children
               v-else
@@ -86,7 +103,8 @@
                 form: form,
                 readonly: readonly,
                 optionData: optionDatas,
-                ...item
+                dragSort: dragSort,
+                ...(dragSort ? { ...item, fixed: false } : item)
               }"
               v-on="{
                 handleClick: handleClick,
@@ -402,6 +420,11 @@ export default {
       default() {
         return {};
       }
+    },
+    dragSort: Boolean,
+    dragSortIcon: {
+      type: String,
+      default: 'es-icon-caidan'
     }
   },
   data() {
@@ -430,7 +453,8 @@ export default {
       icon: true,
       show: true,
       sysCodes: [],
-      infiniteDisabled: this.infiniteScroll
+      infiniteDisabled: this.infiniteScroll,
+      isUpadeData: false
     };
   },
   computed: {
@@ -450,7 +474,23 @@ export default {
     theads: {
       get() {
         let thead = [];
-        if (this.checkbox) {
+        let types = this.theadData
+          .filter((item) => {
+            return (
+              item.type == 'selection' ||
+              item.type == 'index' ||
+              item.type == 'sort'
+            );
+          })
+          .map((item) => {
+            return item.type;
+          });
+        if (this.dragSort && !types.includes('sort')) {
+          thead.push({
+            type: 'sort'
+          });
+        }
+        if (this.checkbox && !types.includes('selection')) {
           thead.push({
             type: 'selection',
             width: '55',
@@ -460,7 +500,7 @@ export default {
             reserveSelection: this.reserveSelection
           });
         }
-        if (this.numbers) {
+        if (this.numbers && !types.includes('index')) {
           let index = 1;
           if (this.infiniteScroll) {
             index = typeof this.index == 'boolean' ? 1 : this.index;
@@ -476,7 +516,8 @@ export default {
             width: '70',
             align: 'center',
             fixed: 'left',
-            index: index
+            index: index,
+            filterIcon: this.filter ? 'es-icon-biao' : undefined
           });
         }
         if (this.theadData.length) {
@@ -512,6 +553,7 @@ export default {
         return this.data;
       },
       set(val) {
+        this.$emit('update:data', val);
         return val;
       }
     },
@@ -1481,6 +1523,9 @@ export default {
       }
       this.$emit('sort-change', res);
     },
+    handleUpdateDragSort(data, event) {
+      this.$emit('update-drag-sort', data, event);
+    },
     mergeThead(res) {
       this.theadData = res;
       this.icon = true;