@scenetechnology/cj_iview_table 0.0.45 → 0.0.47

package/dist/cj_iview_table.common.js

@@ -43,7 +43,7 @@ module.exports = function (argument, usingIterator) {
 "use strict";
 
 var $ = __webpack_require__(6518);
-var iterate = __webpack_require__(271);
+var iterate = __webpack_require__(2652);
 var aCallable = __webpack_require__(9306);
 var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
@@ -63,83 +63,6 @@ $({ target: 'Iterator', proto: true, real: true }, {
 });
 
 
-/***/ }),
-
-/***/ 271:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-
-var bind = __webpack_require__(6080);
-var call = __webpack_require__(9565);
-var anObject = __webpack_require__(8551);
-var tryToString = __webpack_require__(6823);
-var isArrayIteratorMethod = __webpack_require__(4209);
-var lengthOfArrayLike = __webpack_require__(6198);
-var isPrototypeOf = __webpack_require__(1625);
-var getIterator = __webpack_require__(81);
-var getIteratorMethod = __webpack_require__(851);
-var iteratorClose = __webpack_require__(9539);
-
-var $TypeError = TypeError;
-
-var Result = function (stopped, result) {
-  this.stopped = stopped;
-  this.result = result;
-};
-
-var ResultPrototype = Result.prototype;
-
-module.exports = function (iterable, unboundFunction, options) {
-  var that = options && options.that;
-  var AS_ENTRIES = !!(options && options.AS_ENTRIES);
-  var IS_RECORD = !!(options && options.IS_RECORD);
-  var IS_ITERATOR = !!(options && options.IS_ITERATOR);
-  var INTERRUPTED = !!(options && options.INTERRUPTED);
-  var fn = bind(unboundFunction, that);
-  var iterator, iterFn, index, length, result, next, step;
-
-  var stop = function (condition) {
-    if (iterator) iteratorClose(iterator, 'normal', condition);
-    return new Result(true, condition);
-  };
-
-  var callFn = function (value) {
-    if (AS_ENTRIES) {
-      anObject(value);
-      return INTERRUPTED ? fn(value[0], value[1], stop) : fn(value[0], value[1]);
-    } return INTERRUPTED ? fn(value, stop) : fn(value);
-  };
-
-  if (IS_RECORD) {
-    iterator = iterable.iterator;
-  } else if (IS_ITERATOR) {
-    iterator = iterable;
-  } else {
-    iterFn = getIteratorMethod(iterable);
-    if (!iterFn) throw new $TypeError(tryToString(iterable) + ' is not iterable');
-    // optimisation for array iterators
-    if (isArrayIteratorMethod(iterFn)) {
-      for (index = 0, length = lengthOfArrayLike(iterable); length > index; index++) {
-        result = callFn(iterable[index]);
-        if (result && isPrototypeOf(ResultPrototype, result)) return result;
-      } return new Result(false);
-    }
-    iterator = getIterator(iterable, iterFn);
-  }
-
-  next = IS_RECORD ? iterable.next : iterator.next;
-  while (!(step = call(next, iterator)).done) {
-    try {
-      result = callFn(step.value);
-    } catch (error) {
-      iteratorClose(iterator, 'throw', error);
-    }
-    if (typeof result == 'object' && result && isPrototypeOf(ResultPrototype, result)) return result;
-  } return new Result(false);
-};
-
-
 /***/ }),
 
 /***/ 283:
@@ -18067,6 +17990,83 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/**
 }.call(this));
 
 
+/***/ }),
+
+/***/ 2652:
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+"use strict";
+
+var bind = __webpack_require__(6080);
+var call = __webpack_require__(9565);
+var anObject = __webpack_require__(8551);
+var tryToString = __webpack_require__(6823);
+var isArrayIteratorMethod = __webpack_require__(4209);
+var lengthOfArrayLike = __webpack_require__(6198);
+var isPrototypeOf = __webpack_require__(1625);
+var getIterator = __webpack_require__(81);
+var getIteratorMethod = __webpack_require__(851);
+var iteratorClose = __webpack_require__(9539);
+
+var $TypeError = TypeError;
+
+var Result = function (stopped, result) {
+  this.stopped = stopped;
+  this.result = result;
+};
+
+var ResultPrototype = Result.prototype;
+
+module.exports = function (iterable, unboundFunction, options) {
+  var that = options && options.that;
+  var AS_ENTRIES = !!(options && options.AS_ENTRIES);
+  var IS_RECORD = !!(options && options.IS_RECORD);
+  var IS_ITERATOR = !!(options && options.IS_ITERATOR);
+  var INTERRUPTED = !!(options && options.INTERRUPTED);
+  var fn = bind(unboundFunction, that);
+  var iterator, iterFn, index, length, result, next, step;
+
+  var stop = function (condition) {
+    if (iterator) iteratorClose(iterator, 'normal', condition);
+    return new Result(true, condition);
+  };
+
+  var callFn = function (value) {
+    if (AS_ENTRIES) {
+      anObject(value);
+      return INTERRUPTED ? fn(value[0], value[1], stop) : fn(value[0], value[1]);
+    } return INTERRUPTED ? fn(value, stop) : fn(value);
+  };
+
+  if (IS_RECORD) {
+    iterator = iterable.iterator;
+  } else if (IS_ITERATOR) {
+    iterator = iterable;
+  } else {
+    iterFn = getIteratorMethod(iterable);
+    if (!iterFn) throw new $TypeError(tryToString(iterable) + ' is not iterable');
+    // optimisation for array iterators
+    if (isArrayIteratorMethod(iterFn)) {
+      for (index = 0, length = lengthOfArrayLike(iterable); length > index; index++) {
+        result = callFn(iterable[index]);
+        if (result && isPrototypeOf(ResultPrototype, result)) return result;
+      } return new Result(false);
+    }
+    iterator = getIterator(iterable, iterFn);
+  }
+
+  next = IS_RECORD ? iterable.next : iterator.next;
+  while (!(step = call(next, iterator)).done) {
+    try {
+      result = callFn(step.value);
+    } catch (error) {
+      iteratorClose(iterator, 'throw', error);
+    }
+    if (typeof result == 'object' && result && isPrototypeOf(ResultPrototype, result)) return result;
+  } return new Result(false);
+};
+
+
 /***/ }),
 
 /***/ 2777:
@@ -18237,7 +18237,7 @@ module.exports = function difference(other) {
 "use strict";
 
 var $ = __webpack_require__(6518);
-var iterate = __webpack_require__(271);
+var iterate = __webpack_require__(2652);
 var aCallable = __webpack_require__(9306);
 var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
@@ -19555,7 +19555,7 @@ module.exports = function (fn) {
 "use strict";
 
 var $ = __webpack_require__(6518);
-var iterate = __webpack_require__(271);
+var iterate = __webpack_require__(2652);
 var aCallable = __webpack_require__(9306);
 var anObject = __webpack_require__(8551);
 var getIteratorDirect = __webpack_require__(1767);
@@ -20577,7 +20577,7 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/babel-loader/lib/index.js!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=template&id=642d0325&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/babel-loader/lib/index.js!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=template&id=6ea5b614&scoped=true
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -31225,10 +31225,10 @@ Sortable.mount(Remove, Revert);
       type: Number,
       default: 10
     },
-    /**
-     * params及pagination可设置每页数据条数, params优先级最高
-     * params: {current, pageSize}
-     * pagination: {pageSize, onChange}
+    /**
+     * params及pagination可设置每页数据条数, params优先级最高
+     * params: {current, pageSize}
+     * pagination: {pageSize, onChange}
      */
     params: {
       type: Object,
@@ -31238,10 +31238,10 @@ Sortable.mount(Remove, Revert);
       type: Object,
       default: () => ({})
     },
-    /**
-     * 可通过传递data和request字段设置表格数据
-     * data优先级最高, 如果通过data参数设置表格数据, 需手动刷新table数据, data需是一个对象，包含data 和 total属性
-     * request函数会接收一个对象。对象中必须要有 data 和 total, 当params发生变化时会重新执行request
+    /**
+     * 可通过传递data和request字段设置表格数据
+     * data优先级最高, 如果通过data参数设置表格数据, 需手动刷新table数据, data需是一个对象，包含data 和 total属性
+     * request函数会接收一个对象。对象中必须要有 data 和 total, 当params发生变化时会重新执行request
      */
     data: {
       type: Object,
@@ -31304,8 +31304,8 @@ Sortable.mount(Remove, Revert);
     };
   },
   computed: {
-    /**
-     * 表格列
+    /**
+     * 表格列
      */
     tableColumns() {
       return this.columnsList.filter(item => !item.hideInTable).map(column => {
@@ -31501,14 +31501,18 @@ Sortable.mount(Remove, Revert);
                   if (this.filterForm.sort == (column.as || column.key)) {
                     return;
                   }
-                  this.filterForm.sort = column.as || column.key;
-                  this.$set(column.headerConfig, 'options', [...column.headerConfig.options]);
-                  let sortOrder = [];
-                  column.headerConfig.options.forEach(item => {
-                    sortOrder.push(item.value);
-                  });
-                  this.filterForm.sortOrder = sortOrder.join(',');
-                  this.reload();
+                  setTimeout(() => {
+                    this.filterForm.sort = column.as || column.key;
+                    this.$set(column.headerConfig, 'options', lodash_default().cloneDeep(...column.headerConfig.options));
+                    let sortOrder = [];
+                    column.headerConfig.options.forEach(item => {
+                      sortOrder.push(item.value);
+                    });
+                    this.filterForm.sortOrder = sortOrder.join(',');
+                    console.log(this.filterForm);
+                  }, 0);
+
+                  // this.reload()
                 }
               }
             })]), h('div', {
@@ -31527,7 +31531,8 @@ Sortable.mount(Remove, Revert);
               return h('div', {
                 class: 'header-option',
                 attrs: {
-                  'data-id': (column.as || column.key) + option.value
+                  'data-id': (column.as || column.key) + option.value,
+                  'data-value': option.value
                 },
                 style: {
                   padding: '5px 0px',
@@ -31562,8 +31567,8 @@ Sortable.mount(Remove, Revert);
         return config;
       });
     },
-    /**
-     * 筛选项集合
+    /**
+     * 筛选项集合
      */
     setcolumnsList() {
       return this.columns.filter(item => item.title && item.title != '操作');
@@ -31599,10 +31604,10 @@ Sortable.mount(Remove, Revert);
       console.log('tableSlot---', this.columns.filter(item => item.slot));
       return this.columns.filter(item => item.slot);
     },
-    /**
-     * 获取数据请求参数
-     * params及pagination如果为空,默认通过page.current进行查询
-     * 如果不为空,那么就覆盖掉默认查询参数
+    /**
+     * 获取数据请求参数
+     * params及pagination如果为空,默认通过page.current进行查询
+     * 如果不为空,那么就覆盖掉默认查询参数
      */
     requestParams() {
       const {
@@ -31617,8 +31622,8 @@ Sortable.mount(Remove, Revert);
         pageSize: pageSize || defaultSize
       };
     },
-    /**
-     * 数据源
+    /**
+     * 数据源
      */
     dataSource() {
       if (this.data && this.data.data) {
@@ -31626,8 +31631,8 @@ Sortable.mount(Remove, Revert);
       }
       return this.tableData;
     },
-    /**
-     * 筛选栏表单属性名
+    /**
+     * 筛选栏表单属性名
      */
     formKey() {
       return item => item.as ? item.as : item.key;
@@ -31890,8 +31895,8 @@ Sortable.mount(Remove, Revert);
       console.log(JSON.stringify(filterForm));
       this.filterForm = Object.assign({}, filterForm);
     },
-    /**
-     * 获取数据
+    /**
+     * 获取数据
      */
     async getDataSource(params = this.requestParams) {
       if (this.request) {
@@ -31906,9 +31911,9 @@ Sortable.mount(Remove, Revert);
         this.tableLoading = false;
       }
     },
-    /**
-     * 删除对象属性值为空的属性
-     * @param {*} obj
+    /**
+     * 删除对象属性值为空的属性
+     * @param {*} obj
      */
     delValueEmptyProperty(obj) {
       for (const key in obj) {
@@ -31920,8 +31925,8 @@ Sortable.mount(Remove, Revert);
       }
       return obj;
     },
-    /**
-     * 清空筛选栏表单
+    /**
+     * 清空筛选栏表单
      */
     reset() {
       this.page.current = 1;
@@ -31994,9 +31999,9 @@ Sortable.mount(Remove, Revert);
         pageSize: this.page.pageSize
       });
     },
-    /**
-     * 监听当前选中项
-     * @param {*} selectionItems
+    /**
+     * 监听当前选中项
+     * @param {*} selectionItems
      */
     onSelectionChange(selectionItems) {
       this.selectionItems = selectionItems;
@@ -32019,9 +32024,9 @@ Sortable.mount(Remove, Revert);
       });
       this.reload();
     },
-    /**
-     * 监听工具栏按钮
-     * @param {*} index
+    /**
+     * 监听工具栏按钮
+     * @param {*} index
      */
     onToolBar(index) {
       const isSelection = this.columns.some(item => item.type === 'selection');
@@ -32030,8 +32035,8 @@ Sortable.mount(Remove, Revert);
       }
       this.$emit('onToolBar', index, this.selectionItems);
     },
-    /**
-     * 当前表单属性值是否为空
+    /**
+     * 当前表单属性值是否为空
      */
     isEmptyFilterForm() {
       let isEmpty = true;
@@ -32043,8 +32048,8 @@ Sortable.mount(Remove, Revert);
       }
       return isEmpty;
     },
-    /**
-     * 监听筛选按钮
+    /**
+     * 监听筛选按钮
      */
     onFilter() {
       console.log(this.tableColumns);
@@ -32059,9 +32064,9 @@ Sortable.mount(Remove, Revert);
         pageSize: this.page.pageSize
       });
     },
-    /**
-     * 监听页数变化
-     * @param {*} current
+    /**
+     * 监听页数变化
+     * @param {*} current
      */
     onPageChange(current) {
       this.page.current = current;
@@ -32085,8 +32090,8 @@ Sortable.mount(Remove, Revert);
     setSelectionItem(status) {
       this.$refs.selection.selectAll(status);
     },
-    /**
-     * 刷新
+    /**
+     * 刷新
      */
     reload() {
       if (this.selectionItems.length > 0) {
@@ -32433,9 +32438,11 @@ Sortable.mount(Remove, Revert);
           } = evt;
           // 獲取當前列的所有選項
           const options = Array.from(container.children).map(el => ({
-            value: el.getAttribute('data-id'),
+            value: el.getAttribute('data-value'),
             label: el.textContent.trim()
           }));
+          console.log('options---', options);
+          console.log('columnsList---', this.columnsList);
 
           // 更新對應列的選項順序
           const column = this.columnsList.find(col => col.headerConfig && col.headerConfig.options && col.headerConfig.options.some(opt => opt.value === options[0].value));
@@ -32493,15 +32500,15 @@ Sortable.mount(Remove, Revert);
 });
 ;// ./packages/components/index.vue?vue&type=script&lang=js
  /* harmony default export */ var packages_componentsvue_type_script_lang_js = (componentsvue_type_script_lang_js); 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=style&index=0&id=642d0325&prod&scoped=true&lang=less
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=style&index=0&id=6ea5b614&prod&scoped=true&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./packages/components/index.vue?vue&type=style&index=0&id=642d0325&prod&scoped=true&lang=less
+;// ./packages/components/index.vue?vue&type=style&index=0&id=6ea5b614&prod&scoped=true&lang=less
 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=style&index=1&id=642d0325&prod&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=style&index=1&id=6ea5b614&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./packages/components/index.vue?vue&type=style&index=1&id=642d0325&prod&lang=css
+;// ./packages/components/index.vue?vue&type=style&index=1&id=6ea5b614&prod&lang=css
 
 ;// ./packages/components/index.vue
 
@@ -32519,7 +32526,7 @@ var components_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "642d0325",
+  "6ea5b614",
   null
   
 )