@scenetechnology/cj_iview_table 0.0.34 → 0.0.35

package/dist/cj_iview_table.common.js

@@ -18653,42 +18653,6 @@ module.exports = function isDisjointFrom(other) {
 };
 
 
-/***/ }),
-
-/***/ 4459:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-
-var isCallable = __webpack_require__(4901);
-var definePropertyModule = __webpack_require__(4913);
-var makeBuiltIn = __webpack_require__(283);
-var defineGlobalProperty = __webpack_require__(9433);
-
-module.exports = function (O, key, value, options) {
-  if (!options) options = {};
-  var simple = options.enumerable;
-  var name = options.name !== undefined ? options.name : key;
-  if (isCallable(value)) makeBuiltIn(value, name, options);
-  if (options.global) {
-    if (simple) O[key] = value;
-    else defineGlobalProperty(key, value);
-  } else {
-    try {
-      if (!options.unsafe) delete O[key];
-      else if (O[key]) simple = true;
-    } catch (error) { /* empty */ }
-    if (simple) O[key] = value;
-    else definePropertyModule.f(O, key, {
-      value: value,
-      enumerable: false,
-      configurable: !options.nonConfigurable,
-      writable: !options.nonWritable
-    });
-  } return O;
-};
-
-
 /***/ }),
 
 /***/ 4495:
@@ -19169,7 +19133,7 @@ module.exports = {};
 
 "use strict";
 
-var defineBuiltIn = __webpack_require__(4459);
+var defineBuiltIn = __webpack_require__(6840);
 
 module.exports = function (target, src, options) {
   for (var key in src) defineBuiltIn(target, key, src[key], options);
@@ -19217,7 +19181,7 @@ module.exports = false;
 var globalThis = __webpack_require__(4576);
 var getOwnPropertyDescriptor = (__webpack_require__(7347).f);
 var createNonEnumerableProperty = __webpack_require__(6699);
-var defineBuiltIn = __webpack_require__(4459);
+var defineBuiltIn = __webpack_require__(6840);
 var defineGlobalProperty = __webpack_require__(9433);
 var copyConstructorProperties = __webpack_require__(7740);
 var isForced = __webpack_require__(2796);
@@ -19370,6 +19334,42 @@ module.exports = function (it) {
 };
 
 
+/***/ }),
+
+/***/ 6840:
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+"use strict";
+
+var isCallable = __webpack_require__(4901);
+var definePropertyModule = __webpack_require__(4913);
+var makeBuiltIn = __webpack_require__(283);
+var defineGlobalProperty = __webpack_require__(9433);
+
+module.exports = function (O, key, value, options) {
+  if (!options) options = {};
+  var simple = options.enumerable;
+  var name = options.name !== undefined ? options.name : key;
+  if (isCallable(value)) makeBuiltIn(value, name, options);
+  if (options.global) {
+    if (simple) O[key] = value;
+    else defineGlobalProperty(key, value);
+  } else {
+    try {
+      if (!options.unsafe) delete O[key];
+      else if (O[key]) simple = true;
+    } catch (error) { /* empty */ }
+    if (simple) O[key] = value;
+    else definePropertyModule.f(O, key, {
+      value: value,
+      enumerable: false,
+      configurable: !options.nonConfigurable,
+      writable: !options.nonWritable
+    });
+  } return O;
+};
+
+
 /***/ }),
 
 /***/ 6955:
@@ -19632,7 +19632,7 @@ var isCallable = __webpack_require__(4901);
 var isObject = __webpack_require__(34);
 var create = __webpack_require__(2360);
 var getPrototypeOf = __webpack_require__(2787);
-var defineBuiltIn = __webpack_require__(4459);
+var defineBuiltIn = __webpack_require__(6840);
 var wellKnownSymbol = __webpack_require__(8227);
 var IS_PURE = __webpack_require__(6395);
 
@@ -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=116dee39&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=20d42cac&scoped=true
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -27958,9 +27958,9 @@ var OrgPicker_component = normalizeComponent(
                   }, [slotContent])],
                   content: () => {
                     const value = params.row[column.key];
-                    console.log('value----', value);
-                    console.log(params.row);
-                    console.log(column.key);
+                    // console.log('value----',value)
+                    // console.log(params.row)
+                    // console.log(column.key)
                     const slotContent = this.$scopedSlots[column.slot] ? this.$scopedSlots[column.slot]({
                       row: params.row
                     }) : h('span', params.row[column.key]);
@@ -28008,7 +28008,6 @@ var OrgPicker_component = normalizeComponent(
             let renderedContent;
             if (originalRender) {
               renderedContent = originalRender(h, params); // 获取渲染后的内容
-              console.log('renderedContent---', renderedContent);
             } else {
               // 如果没有自定义 render 函数，直接渲染默认内容
               renderedContent = h('span', {
@@ -28432,7 +28431,20 @@ var OrgPicker_component = normalizeComponent(
     reset() {
       this.page.current = 1;
       this.isClickResetBtn = true;
-      console.log('reset---', this.filterForm);
+      // 清除所有列的排序状态
+      this.columnsList.forEach(item => {
+        if (item.sortable) {
+          item.sortType = '';
+        }
+      });
+      // 清除表格排序状态
+      if (this.$refs.selection) {
+        this.$refs.selection.handleSort({
+          column: {},
+          key: '',
+          order: 'normal'
+        });
+      }
       for (const key in this.filterForm) {
         if (Object.hasOwnProperty.call(this.filterForm, key)) {
           console.log(key);
@@ -28454,6 +28466,9 @@ var OrgPicker_component = normalizeComponent(
           }
         }
       }
+      // 清除排序相关的筛选条件
+      delete this.filterForm.sort;
+      delete this.filterForm.sortOrder;
       console.log('reset---', this.filterForm);
       this.page.current = 1;
       this.getDataSource({
@@ -28514,6 +28529,7 @@ var OrgPicker_component = normalizeComponent(
      * 监听筛选按钮
      */
     onFilter() {
+      console.log(this.tableColumns);
       const isHasOnFilter = this.$listeners.onFilter;
       // 如果当前父组件已绑定查询事件，那么就不走默认查询流程，由外部事件去查询数据
       if (isHasOnFilter) {
@@ -28889,15 +28905,15 @@ var OrgPicker_component = normalizeComponent(
 });
 ;// ./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=116dee39&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=20d42cac&prod&scoped=true&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./packages/components/index.vue?vue&type=style&index=0&id=116dee39&prod&scoped=true&lang=less
+;// ./packages/components/index.vue?vue&type=style&index=0&id=20d42cac&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=116dee39&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=20d42cac&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./packages/components/index.vue?vue&type=style&index=1&id=116dee39&prod&lang=css
+;// ./packages/components/index.vue?vue&type=style&index=1&id=20d42cac&prod&lang=css
 
 ;// ./packages/components/index.vue
 
@@ -28915,7 +28931,7 @@ var components_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "116dee39",
+  "20d42cac",
   null
   
 )