@tongfun/tf-widget 0.1.169 → 0.1.170

package/lib/tf-widget.common.js

@@ -137444,8 +137444,8 @@ var component = (0,componentNormalizer/* default */.Z)(
 /* harmony default export */ var tf_filter = (component.exports);
 // EXTERNAL MODULE: ./src/utils/index.js
 var utils = __webpack_require__(42325);
-// EXTERNAL MODULE: ./src/directives/index.js + 69 modules
-var directives = __webpack_require__(90406);
+// EXTERNAL MODULE: ./src/directives/index.js + 61 modules
+var directives = __webpack_require__(94159);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/index.vue?vue&type=script&lang=js&
 //
 //
@@ -138180,7 +138180,7 @@ function getVoucherIds(data) {
 
 /***/ }),
 
-/***/ 90406:
+/***/ 94159:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -138453,7 +138453,7 @@ var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(13797);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
 // EXTERNAL MODULE: ./node_modules/element-ui/lib/element-ui.common.js
 var element_ui_common = __webpack_require__(64720);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=template&id=21dd2a1f&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=template&id=052f7289&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"column-header-directive",on:{"click":_vm.sortColumn}},[_c('span',[_vm._v(_vm._s(_vm.column.title))]),(_vm.column.orderBy)?_c('span',[_c('i',{class:[_vm.column.orderBy === 'asc' ? 'el-icon-top' : 'el-icon-bottom']})]):_vm._e(),_c('div',{class:{ 'filter-main': _vm.isClick || _vm.isFilter }},[_c('el-popover',{attrs:{"width":"200","trigger":"manual","placement":"bottom"},model:{value:(_vm.isClick),callback:function ($$v) {_vm.isClick=$$v},expression:"isClick"}},[(_vm.isClick)?_c('div',{directives:[{name:"clickoutside",rawName:"v-clickoutside",value:(_vm.handleClickOut),expression:"handleClickOut"}],staticClass:"filter-main-context"},[_c('TfInput',{attrs:{"not-form":"","full-border":"","placeholder":"输入需要过滤的值"},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.handleSubmit.apply(null, arguments)}},model:{value:(_vm.column.filterValue),callback:function ($$v) {_vm.$set(_vm.column, "filterValue", $$v)},expression:"column.filterValue"}}),_c('div',{staticClass:"option-buttons"},[_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.handleCancel}},[_vm._v("重置")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.handleSubmit}},[_vm._v("确定")])],1)],1):_vm._e(),_c('SvgIcon',{staticClass:"filter-icon",attrs:{"slot":"reference","icon-class":"filter"},on:{"click":function($event){$event.stopPropagation();return _vm.handleFilterClick.apply(null, arguments)}},slot:"reference"})],1)],1)])}
 var staticRenderFns = []
 
@@ -138622,6 +138622,10 @@ var clickoutside = __webpack_require__(96410);
         // 加载所有数据
         this.tableInstance.reloadData(this.tableInstance.data);
       }
+      this.tableInstance.$emit('handleFilter', filterColumns.map(item => ({
+        key: item.property,
+        value: item.filterValue
+      })));
       // 过滤后根据当前列的排序方式进行排序
       this.afterFilter();
       // 这里防止重复计算
@@ -138642,15 +138646,15 @@ var clickoutside = __webpack_require__(96410);
 });
 ;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_column_headervue_type_script_lang_js_ = (column_headervue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./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!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=21dd2a1f&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./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!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=052f7289&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=21dd2a1f&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=052f7289&prod&lang=less&scoped=true&
 
-;// CONCATENATED MODULE: ./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!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=1&id=21dd2a1f&prod&lang=less&
+;// CONCATENATED MODULE: ./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!./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=1&id=052f7289&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=1&id=21dd2a1f&prod&lang=less&
+;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/components/column-header/index.vue?vue&type=style&index=1&id=052f7289&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1001);
@@ -138670,7 +138674,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "21dd2a1f",
+  "052f7289",
   null
   
 )
@@ -139576,223 +139580,6 @@ function util_getFieldIndex(obj) {
   }
   return fieldIndex;
 }
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/directives/modules/vxe-table-setting/components/column-header/index.vue?vue&type=template&id=26af2921&scoped=true&
-var column_headervue_type_template_id_26af2921_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"column-header-directive",on:{"click":_vm.sortColumn}},[_c('span',[_vm._v(_vm._s(_vm.column.title))]),(_vm.column.orderBy)?_c('span',[_c('i',{class:[_vm.column.orderBy === 'asc' ? 'el-icon-top' : 'el-icon-bottom']})]):_vm._e(),_c('div',{class:{ 'filter-main': _vm.isClick || _vm.isFilter }},[_c('el-popover',{attrs:{"width":"200","trigger":"manual","placement":"bottom"},model:{value:(_vm.isClick),callback:function ($$v) {_vm.isClick=$$v},expression:"isClick"}},[(_vm.isClick)?_c('div',{directives:[{name:"clickoutside",rawName:"v-clickoutside",value:(_vm.handleClickOut),expression:"handleClickOut"}],staticClass:"filter-main-context"},[_c('TfInput',{attrs:{"not-form":"","full-border":"","placeholder":"输入需要过滤的值"},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.handleSubmit.apply(null, arguments)}},model:{value:(_vm.column.filterValue),callback:function ($$v) {_vm.$set(_vm.column, "filterValue", $$v)},expression:"column.filterValue"}}),_c('div',{staticClass:"option-buttons"},[_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.handleCancel}},[_vm._v("重置")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.handleSubmit}},[_vm._v("确定")])],1)],1):_vm._e(),_c('SvgIcon',{staticClass:"filter-icon",attrs:{"slot":"reference","icon-class":"filter"},on:{"click":function($event){$event.stopPropagation();return _vm.handleFilterClick.apply(null, arguments)}},slot:"reference"})],1)],1)])}
-var column_headervue_type_template_id_26af2921_scoped_true_staticRenderFns = []
-
-
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/directives/modules/vxe-table-setting/components/column-header/index.vue?vue&type=script&lang=js&
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-
-
-
-/* harmony default export */ var vxe_table_setting_components_column_headervue_type_script_lang_js_ = ({
-  components: {
-    TfInput: tf_input/* default */.Z
-  },
-  directives: {
-    Clickoutside: clickoutside/* default */.Z
-  },
-  props: {
-    // 当前列
-    column: {
-      type: Object,
-      default: () => {}
-    },
-    // 表格实例
-    tableInstance: {
-      type: Object,
-      default: () => null
-    }
-  },
-  data() {
-    return {
-      textBak: '',
-      isClick: false
-    };
-  },
-  computed: {
-    isFilter() {
-      return this.column.filterValue !== null && this.column.filterValue !== undefined && this.column.filterValue !== '';
-    }
-  },
-  watch: {
-    'tableInstance.data.length': {
-      handler(newVal, oldVal) {
-        if (!newVal) {
-          return;
-        }
-        // this.tableInstance.isFilter 为true时表示表格已经触发过滤方法，无需重复触发
-        // 当过滤方法执行完毕后，会有定时器将此标志位置为false
-        if (newVal !== oldVal && !this.tableInstance.isFilter) {
-          this.tableInstance.isFilter = true;
-          this.handleSubmit();
-        }
-      },
-      immediate: true
-    }
-  },
-  methods: {
-    /** 排序 */
-    sortColumn() {
-      const field = this.column.property;
-      switch (this.column.orderBy) {
-        case 'asc':
-          this.column.orderBy = 'desc';
-          this.tableInstance.sort(field, 'desc');
-          break;
-        case 'desc':
-          this.column.orderBy = null;
-          this.tableInstance.clearSort();
-          break;
-        default:
-          this.column.orderBy = 'asc';
-          this.tableInstance.sort(field, 'asc');
-          break;
-      }
-      this.$emit('handleSort', this.column.property);
-    },
-    /** 图标点击事件 */
-    handleFilterClick() {
-      this.isClick = !this.isClick;
-      this.textBak = this.column.filterValue;
-    },
-    /** 单击外侧事件 */
-    handleClickOut(e) {
-      if (!this.isClick) {
-        return;
-      }
-      this.isClick = false;
-      this.column.filterValue = this.textBak;
-    },
-    /** 重置 */
-    handleCancel() {
-      this.textBak = '';
-      this.column.filterValue = '';
-      this.handleSubmit();
-    },
-    /** 确认 */
-    handleSubmit() {
-      this.isClick = false;
-      this.textBak = this.column.filterValue;
-      // filterColumns 意为需要过滤的列
-      const filterColumns = this.tableInstance.getTableColumn().fullColumn.filter(item => {
-        return ['index', 'checkbox'].indexOf(item.type) === -1 && item.filterValue;
-      });
-      if (filterColumns.length) {
-        const filterMap = new Map();
-        filterColumns.forEach(item => {
-          filterMap.set(item.property, item.filterValue);
-        });
-        // this.tableInstance.data 意为表格的原始数据
-        const showTableData = this.tableInstance.data.filter(current => {
-          let isFilter = true;
-          const keyArr = Object.keys(current);
-          keyArr.some(key => {
-            const keyword = filterMap.get(key);
-            if (keyword !== null && keyword !== undefined) {
-              // 基础资料和枚举要特殊处理
-              const currentName = this.isBasicData(current[key]) ? current[key].name : current[key];
-              if (currentName === null || currentName === undefined || !`${currentName}`.includes(`${filterMap.get(key)}`)) {
-                isFilter = false;
-                return true;
-              }
-            }
-          });
-          return isFilter;
-        });
-        this.tableInstance.reloadData(showTableData);
-      } else {
-        // 加载所有数据
-        this.tableInstance.reloadData(this.tableInstance.data);
-      }
-      // 过滤后根据当前列的排序方式进行排序
-      this.afterFilter();
-      // 这里防止重复计算
-      setTimeout(() => {
-        this.tableInstance.isFilter = false;
-      }, 100);
-    },
-    /** 筛选后，根据当前表格已有的列的状态进行排序 */
-    afterFilter() {
-      const columns = this.tableInstance.getTableColumn().fullColumn;
-      const hasOrderColumn = columns.find(d => d.orderBy);
-      hasOrderColumn && this.tableInstance.sort(hasOrderColumn.property, hasOrderColumn.orderBy);
-    },
-    isBasicData(data) {
-      return typeof data === 'object' && data !== null && data !== undefined;
-    }
-  }
-});
-;// CONCATENATED MODULE: ./src/directives/modules/vxe-table-setting/components/column-header/index.vue?vue&type=script&lang=js&
- /* harmony default export */ var modules_vxe_table_setting_components_column_headervue_type_script_lang_js_ = (vxe_table_setting_components_column_headervue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./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!./src/directives/modules/vxe-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=26af2921&prod&lang=less&scoped=true&
-// extracted by mini-css-extract-plugin
-
-;// CONCATENATED MODULE: ./src/directives/modules/vxe-table-setting/components/column-header/index.vue?vue&type=style&index=0&id=26af2921&prod&lang=less&scoped=true&
-
-;// CONCATENATED MODULE: ./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!./src/directives/modules/vxe-table-setting/components/column-header/index.vue?vue&type=style&index=1&id=26af2921&prod&lang=less&
-// extracted by mini-css-extract-plugin
-
-;// CONCATENATED MODULE: ./src/directives/modules/vxe-table-setting/components/column-header/index.vue?vue&type=style&index=1&id=26af2921&prod&lang=less&
-
-;// CONCATENATED MODULE: ./src/directives/modules/vxe-table-setting/components/column-header/index.vue
-
-
-
-;
-
-
-
-/* normalize component */
-
-var column_header_component = (0,componentNormalizer/* default */.Z)(
-  modules_vxe_table_setting_components_column_headervue_type_script_lang_js_,
-  column_headervue_type_template_id_26af2921_scoped_true_render,
-  column_headervue_type_template_id_26af2921_scoped_true_staticRenderFns,
-  false,
-  null,
-  "26af2921",
-  null
-  
-)
-
-/* harmony default export */ var components_column_header = (column_header_component.exports);
 ;// CONCATENATED MODULE: ./src/directives/modules/vxe-table-setting/js/init.js
 
 
@@ -139800,7 +139587,7 @@ var column_header_component = (0,componentNormalizer/* default */.Z)(
 
 
 
-external_commonjs_vue_commonjs2_vue_root_Vue_default().component('DirectiveColumnHeader', components_column_header);
+external_commonjs_vue_commonjs2_vue_root_Vue_default().component('DirectiveColumnHeader', column_header);
 
 /** 初始化表格配置信息 */
 function init_initTableConfig(el, binding, vNode) {
@@ -260391,8 +260178,8 @@ var push_down_component = (0,componentNormalizer/* default */.Z)(
     }
   }
 });
-// EXTERNAL MODULE: ./src/directives/index.js + 69 modules
-var directives = __webpack_require__(90406);
+// EXTERNAL MODULE: ./src/directives/index.js + 61 modules
+var directives = __webpack_require__(94159);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/t-data-list/main.vue?vue&type=script&lang=js&
 //
 //