eoss-ui 0.5.63 → 0.5.65

package/lib/data-table.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;
@@ -3816,8 +3818,8 @@ module.exports = require("throttle-debounce");
 // 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/data-table/src/main.vue?vue&type=template&id=c40e40b8&
-var mainvue_type_template_id_c40e40b8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=5d38af04&
+var mainvue_type_template_id_5d38af04_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3904,10 +3906,15 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                         (_vm.theadBorder && _vm.border != "none"
                           ? " es-thead-border"
                           : ""),
+                      attrs: { data: _vm.datas },
+                      on: {
+                        "update:data": function ($event) {
+                          _vm.datas = $event
+                        },
+                      },
                     },
                     "el-table",
                     Object.assign({}, _vm.$attrs, {
-                      data: _vm.datas,
                       emptyText: _vm.emptyText,
                       showSummary: _vm.showTotal,
                       sumText: _vm.sumText || _vm.totalText,
@@ -3919,6 +3926,8 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                       border: _vm._border,
                       infiniteScroll: _vm.getTableData,
                       infiniteScrollDisabled: _vm.infiniteDisabled,
+                      dragSort: _vm.dragSort,
+                      dragSortClass: _vm.dragSortIcon,
                     }),
                     false
                   ),
@@ -3927,6 +3936,7 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                     "selection-change": _vm.selectionChange,
                     "filter-column": _vm.handleFilterColumn,
                     "sort-change": _vm.handleSortChange,
+                    "update-drag-sort": _vm.handleUpdateDragSort,
                   })
                 ),
                 [
@@ -3936,13 +3946,38 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                     return [
                       item.hide !== true
                         ? [
-                            item.type === "index" || item.type === "selection"
+                            item.type === "sort"
+                              ? _c("el-table-column", {
+                                  key: index,
+                                  attrs: { width: "32" },
+                                  scopedSlots: _vm._u([
+                                    {
+                                      key: "default",
+                                      fn: function (scope) {
+                                        return [
+                                          _c("es-icon", {
+                                            staticClass: "es-move",
+                                            attrs: {
+                                              contents: _vm.dragSortIcon,
+                                            },
+                                          }),
+                                        ]
+                                      },
+                                    },
+                                  ]),
+                                })
+                              : item.type === "index" ||
+                                item.type === "selection"
                               ? _c(
                                   "el-table-column",
                                   _vm._b(
                                     { key: index },
                                     "el-table-column",
-                                    item,
+                                    _vm.dragSort
+                                      ? Object.assign({}, item, {
+                                          fixed: false,
+                                        })
+                                      : item,
                                     false
                                   )
                                 )
@@ -3960,8 +3995,13 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                                           form: _vm.form,
                                           readonly: _vm.readonly,
                                           optionData: _vm.optionDatas,
+                                          dragSort: _vm.dragSort,
                                         },
-                                        item
+                                        _vm.dragSort
+                                          ? Object.assign({}, item, {
+                                              fixed: false,
+                                            })
+                                          : item
                                       ),
                                       false
                                     ),
@@ -4086,10 +4126,10 @@ var mainvue_type_template_id_c40e40b8_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_c40e40b8_render._withStripped = true
+mainvue_type_template_id_5d38af04_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=c40e40b8&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=5d38af04&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4097,8 +4137,8 @@ var api = __webpack_require__(1);
 // EXTERNAL MODULE: external "throttle-debounce"
 var external_throttle_debounce_ = __webpack_require__(19);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
-var childrenvue_type_template_id_29bcbc72_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
+var childrenvue_type_template_id_44b7ff61_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4117,9 +4157,15 @@ var childrenvue_type_template_id_29bcbc72_render = function () {
                         _vm._b(
                           { key: index },
                           "children",
-                          Object.assign({}, _vm.$attrs, item, {
-                            indexs: index,
-                          }),
+                          Object.assign(
+                            {},
+                            _vm.$attrs,
+                            item,
+                            { indexs: index },
+                            _vm.dragSort
+                              ? Object.assign({}, item, { fixed: false })
+                              : item
+                          ),
                           false
                         ),
                         _vm.$listeners
@@ -4134,11 +4180,11 @@ var childrenvue_type_template_id_29bcbc72_render = function () {
     2
   )
 }
-var childrenvue_type_template_id_29bcbc72_staticRenderFns = []
-childrenvue_type_template_id_29bcbc72_render._withStripped = true
+var childrenvue_type_template_id_44b7ff61_staticRenderFns = []
+childrenvue_type_template_id_44b7ff61_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
+// CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=449ae3d7&
 var columnvue_type_template_id_449ae3d7_render = function () {
@@ -5764,12 +5810,14 @@ var _components;
 //
 //
 //
+//
 
 
 /* harmony default export */ var childrenvue_type_script_lang_js_ = ({
   name: 'Children',
   components: (_components = {}, _components[column.name] = column, _components),
   props: {
+    dragSort: Boolean,
     children: Array,
     childHead: Array
   },
@@ -5791,8 +5839,8 @@ var _components;
 
 var children_component = Object(componentNormalizer["a" /* default */])(
   src_childrenvue_type_script_lang_js_,
-  childrenvue_type_template_id_29bcbc72_render,
-  childrenvue_type_template_id_29bcbc72_staticRenderFns,
+  childrenvue_type_template_id_44b7ff61_render,
+  childrenvue_type_template_id_44b7ff61_staticRenderFns,
   false,
   null,
   null,
@@ -6202,6 +6250,24 @@ var mainvue_type_script_lang_js_components, _watch;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -6453,6 +6519,11 @@ var mainvue_type_script_lang_js_components, _watch;
       default: function _default() {
         return {};
       }
+    },
+    dragSort: Boolean,
+    dragSortIcon: {
+      type: String,
+      default: 'es-icon-caidan'
     }
   },
   data: function data() {
@@ -6481,7 +6552,8 @@ var mainvue_type_script_lang_js_components, _watch;
       icon: true,
       show: true,
       sysCodes: [],
-      infiniteDisabled: this.infiniteScroll
+      infiniteDisabled: this.infiniteScroll,
+      isUpadeData: false
     };
   },
 
@@ -6499,7 +6571,17 @@ var mainvue_type_script_lang_js_components, _watch;
     theads: {
       get: function get() {
         var thead = [];
-        if (this.checkbox) {
+        var types = this.theadData.filter(function (item) {
+          return item.type == 'selection' || item.type == 'index' || item.type == 'sort';
+        }).map(function (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',
@@ -6509,7 +6591,7 @@ var mainvue_type_script_lang_js_components, _watch;
             reserveSelection: this.reserveSelection
           });
         }
-        if (this.numbers) {
+        if (this.numbers && !types.includes('index')) {
           var index = 1;
           if (this.infiniteScroll) {
             index = typeof this.index == 'boolean' ? 1 : this.index;
@@ -6522,7 +6604,8 @@ var mainvue_type_script_lang_js_components, _watch;
             width: '70',
             align: 'center',
             fixed: 'left',
-            index: index
+            index: index,
+            filterIcon: this.filter ? 'es-icon-biao' : undefined
           });
         }
         if (this.theadData.length) {
@@ -6552,6 +6635,7 @@ var mainvue_type_script_lang_js_components, _watch;
         return this.data;
       },
       set: function set(val) {
+        this.$emit('update:data', val);
         return val;
       }
     },
@@ -7423,6 +7507,9 @@ var mainvue_type_script_lang_js_components, _watch;
       }
       this.$emit('sort-change', res);
     },
+    handleUpdateDragSort: function handleUpdateDragSort(data, event) {
+      this.$emit('update-drag-sort', data, event);
+    },
     mergeThead: function mergeThead(res) {
       var _this12 = this;
 
@@ -7468,7 +7555,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_c40e40b8_render,
+  mainvue_type_template_id_5d38af04_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.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/dialog.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;