@scenetechnology/cj_iview_table 0.0.34 → 0.0.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- [data-v-22b2a22d]::-webkit-scrollbar{display:none}.ellipsis[data-v-22b2a22d]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ele[data-v-22b2a22d]{cursor:pointer;height:30px;line-height:30px;display:flex;align-items:center;justify-content:space-between}.ele[data-v-22b2a22d]:hover{background-color:#f7f8fb}[data-v-22b2a22d]{list-style:none}.classTitle[data-v-dcb4b2e8]:before{content:"*";display:inline-block;margin-right:4px;line-height:1;font-family:SimSun;font-size:12px;color:#ed4014}.classTitle[data-v-dcb4b2e8]{font-family:PingFang SC;font-weight:400;font-size:15px;color:#333}.content[data-v-dcb4b2e8]{display:flex;justify-content:space-between}.headerTitle[data-v-dcb4b2e8]{font-weight:500;font-size:16px;color:#1d2027}.classTitle[data-v-43321097]:before{content:"*";display:inline-block;margin-right:4px;line-height:1;font-family:SimSun;font-size:12px;color:#ed4014}.classTitle[data-v-43321097]{font-family:PingFang SC;font-weight:400;font-size:15px;color:#333}.content[data-v-43321097]{display:flex;justify-content:space-between}.headerTitle[data-v-43321097]{font-weight:500;font-size:16px;color:#1d2027}.classTitle[data-v-3cf84ea4]:before{content:"*";display:inline-block;margin-right:4px;line-height:1;font-family:SimSun;font-size:12px;color:#ed4014}.classTitle[data-v-3cf84ea4]{font-family:PingFang SC;font-weight:400;font-size:15px;color:#333}.content[data-v-3cf84ea4]{display:flex;justify-content:space-between}.headerTitle[data-v-3cf84ea4]{font-weight:500;font-size:16px;color:#1d2027}[data-v-3cf84ea4] thead tr{background-color:#eff2fa!important;font-size:14px;font-family:Source Han Sans;font-weight:500;color:#222}.line[data-v-539871d1]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.lines[data-v-539871d1]{display:-webkit-box;word-break:break-all;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:var(--row);-webkit-box-orient:vertical}.candidate[data-v-d357ad34],.selected[data-v-d357ad34]{position:absolute;display:inline-block;width:292px;height:400px;border:1px solid #e8e8e8}.picker[data-v-d357ad34]{height:402px;position:relative;text-align:left}.picker .candidate[data-v-d357ad34]{left:0;top:0}.picker .candidate .role-header[data-v-d357ad34]{padding:10px!important;margin-bottom:5px;border-bottom:1px solid #e8e8e8}.picker .candidate .top-dept[data-v-d357ad34]{margin-left:20px;cursor:pointer;color:#38adff}.picker .candidate .next-dept[data-v-d357ad34]{float:right;color:#38adff;cursor:pointer}.picker .candidate .next-dept-disable[data-v-d357ad34]{float:right;color:#8c8c8c;cursor:not-allowed}.picker .candidate>div[data-v-d357ad34]:first-child{padding:5px 10px}.picker .selected[data-v-d357ad34]{right:0;top:0}.picker .org-items[data-v-d357ad34]{overflow-y:auto;height:310px}.picker .org-items .el-icon-close[data-v-d357ad34]{position:absolute;right:5px;cursor:pointer;font-size:larger}.picker .org-items .org-dept-item[data-v-d357ad34]{padding:10px 5px}.picker .org-items .org-dept-item>div[data-v-d357ad34]{display:inline-block}.picker .org-items .org-dept-item>div>span[data-v-d357ad34]:last-child{position:absolute;right:5px}.picker .org-items .org-role-item[data-v-d357ad34]{display:flex;align-items:center;padding:10px 5px}.picker .org-items[data-v-d357ad34] .org-user-item{display:flex;align-items:center;padding:5px}.picker .org-items[data-v-d357ad34] .org-user-item>div{display:inline-block}.picker .org-items[data-v-d357ad34] .org-user-item .avatar{width:35px;text-align:center;line-height:35px;background:#eee;color:#fff;border-radius:50%}.picker .org-items[data-v-d357ad34] .org-item{margin:0 5px;border-radius:5px;position:relative}.picker .org-items[data-v-d357ad34] .org-item .el-checkbox{margin-right:10px}.picker .org-items[data-v-d357ad34] .org-item .name{margin-left:5px}.picker .org-items[data-v-d357ad34] .org-item .overTetx{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;display:inline-block;width:165px}.picker .org-items[data-v-d357ad34] .org-item:hover{background:#f1f1f1}.selected[data-v-d357ad34]{border-left:none}.selected .count[data-v-d357ad34]{width:290px;padding:10px;display:inline-block;border-bottom:1px solid #e8e8e8;margin-bottom:5px}.selected .count>span[data-v-d357ad34]:nth-child(2){float:right;color:#c75450;cursor:pointer}.disabled[data-v-d357ad34]{cursor:not-allowed!important;color:#8c8c8c!important}[data-v-d357ad34]::-webkit-scrollbar{float:right;width:4px;height:4px;background-color:#fff}[data-v-d357ad34]::-webkit-scrollbar-thumb{border-radius:16px;background-color:#efefef}.demo-spin-icon-load[data-v-d357ad34]{animation:ani-demo-spin 1s linear infinite}.closeStyle[data-v-d357ad34]{position:absolute;right:10px;cursor:pointer}[data-v-116dee39] .ivu-table th,[data-v-116dee39] .ivu-table-border th{background-color:#eff2fa}[data-v-116dee39] .ivu-table-border{border-color:#ececec!important}[data-v-116dee39] .ivu-table-border td,[data-v-116dee39] .ivu-table-border th{border-right:1px solid #ececec}[data-v-116dee39] .ivu-table-header .ivu-table-cell{font-size:14px;font-family:Source Han Sans;font-weight:500;color:#222}[data-v-116dee39] .ivu-table-row .ivu-table-cell{font-size:14px;font-family:Source Han Sans;font-weight:400;color:#555}[data-v-116dee39] .ivu-table-cell{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}[data-v-116dee39] .ivu-table td{max-width:0}.ivu-tooltip-inner[data-v-116dee39]{max-width:300px;word-break:break-all;white-space:normal}.pro-table[data-v-116dee39]{background-color:#fff}.pro-table .filter-bar-group[data-v-116dee39]{padding:0 20px;margin-bottom:15px;background-color:#fff;padding-top:20px;box-sizing:border-box}.pro-table .filter-bar-group .filter-bar-item[data-v-116dee39]{margin-bottom:20px;display:flex;align-items:center;box-sizing:border-box;height:32px}.pro-table .filter-bar-group .filter-bar-item .labelClass[data-v-116dee39]{font-size:12px;font-family:Source Han Sans;font-weight:400;color:#222;text-align:right;line-height:15px;margin-right:8px;white-space:normal;word-wrap:break-word;word-break:break-all}.pro-table .filter-bar-group .filter-bar-item label[data-v-116dee39]{white-space:nowrap}.pro-table .filter-bar[data-v-116dee39]{padding:0 20px;margin-bottom:15px;display:flex;justify-content:space-between;background-color:#fff}.pro-table .filter-bar .filter-bar-left[data-v-116dee39]{flex:1;display:flex;align-items:center;flex-wrap:wrap;padding-top:20px}.pro-table .filter-bar .filter-bar-right[data-v-116dee39]{padding-top:20px}.pro-table .filter-bar .btn[data-v-116dee39]{margin:0 10px 20px 0}.pro-table .filterForm[data-v-116dee39]{display:flex;align-items:center;margin:0 20px 20px 0}.pro-table .filterForm .labelClass[data-v-116dee39]{font-size:12px;font-family:Source Han Sans;font-weight:400;color:#222;text-align:right;line-height:15px;margin-right:8px;white-space:normal;word-wrap:break-word;word-break:break-all}.pro-table .filterForm label[data-v-116dee39]{white-space:nowrap}.pro-table .tool-bar-content[data-v-116dee39]{padding:0 20px;box-sizing:border-box;background-color:#fff;display:flex;align-items:center;justify-content:space-between}.pro-table .tool-bar-content .tool-bar-left[data-v-116dee39]{display:flex;margin-bottom:15px;flex:2}.pro-table .tool-bar-content .tool-bar-left>div[data-v-116dee39]{margin-right:10px}.pro-table .tool-bar-content .tool-bar-right[data-v-116dee39]{display:flex;flex:1;justify-content:right;margin-bottom:15px}.pro-table .dropdownItem_content[data-v-116dee39]{display:flex;align-items:center;justify-content:space-between}.pro-table .dropdownItem_content .textTitle[data-v-116dee39]{width:110px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-right:5px;font-size:12px}.pro-table .dropdownItem_content .textTitle2[data-v-116dee39]{font-weight:400;font-size:12px;color:#666}.pro-table .table-container[data-v-116dee39]{padding:0 20px;background-color:#fff;box-sizing:border-box}.pro-table .footer[data-v-116dee39]{width:100%;display:flex;justify-content:center;padding:15px 10px;background-color:#fff}::-webkit-scrollbar{width:8px;height:8px}::-webkit-scrollbar-thumb{background-color:#e1e1e1;border-radius:32px}::-webkit-scrollbar-track{background-color:#f2f2f2;border-radius:32px}.ivu-table-overflowY::-webkit-scrollbar{width:8px;height:8px}.ivu-tooltip,.ivu-tooltip-inner,.ivu-tooltip-popper{z-index:9999!important}.ivu-table-wrapper{position:relative;z-index:1}.ivu-table-fixed-left,.ivu-table-fixed-right{z-index:2}.person_icon{position:absolute;right:0;top:0;width:33px;height:32px;z-index:1;cursor:pointer}.personSelect i{display:none}.personSelect .ivu-select-visible{display:none!important}.custom-json-viewer{width:800px!important;min-width:800px!important}.custom-json-viewer .jv-container,.custom-json-viewer .jv-container.jv-collapsed,.custom-json-viewer .jv-container.jv-expanded{width:100%!important;min-width:800px!important}.custom-json-viewer{background-color:#fff;border-radius:4px}.custom-json-viewer .jv-key{color:#881391!important}.custom-json-viewer .jv-value{color:#1c00cf!important}.custom-json-viewer .jv-string{color:#c41a16!important}.custom-json-viewer .jv-number{color:#1c00cf!important}.custom-json-viewer .jv-boolean{color:#00f!important}.custom-json-viewer .jv-null{color:grey!important}.custom-json-viewer .jv-more{display:none!important}
1
+ [data-v-22b2a22d]::-webkit-scrollbar{display:none}.ellipsis[data-v-22b2a22d]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ele[data-v-22b2a22d]{cursor:pointer;height:30px;line-height:30px;display:flex;align-items:center;justify-content:space-between}.ele[data-v-22b2a22d]:hover{background-color:#f7f8fb}[data-v-22b2a22d]{list-style:none}.classTitle[data-v-dcb4b2e8]:before{content:"*";display:inline-block;margin-right:4px;line-height:1;font-family:SimSun;font-size:12px;color:#ed4014}.classTitle[data-v-dcb4b2e8]{font-family:PingFang SC;font-weight:400;font-size:15px;color:#333}.content[data-v-dcb4b2e8]{display:flex;justify-content:space-between}.headerTitle[data-v-dcb4b2e8]{font-weight:500;font-size:16px;color:#1d2027}.classTitle[data-v-43321097]:before{content:"*";display:inline-block;margin-right:4px;line-height:1;font-family:SimSun;font-size:12px;color:#ed4014}.classTitle[data-v-43321097]{font-family:PingFang SC;font-weight:400;font-size:15px;color:#333}.content[data-v-43321097]{display:flex;justify-content:space-between}.headerTitle[data-v-43321097]{font-weight:500;font-size:16px;color:#1d2027}.classTitle[data-v-3cf84ea4]:before{content:"*";display:inline-block;margin-right:4px;line-height:1;font-family:SimSun;font-size:12px;color:#ed4014}.classTitle[data-v-3cf84ea4]{font-family:PingFang SC;font-weight:400;font-size:15px;color:#333}.content[data-v-3cf84ea4]{display:flex;justify-content:space-between}.headerTitle[data-v-3cf84ea4]{font-weight:500;font-size:16px;color:#1d2027}[data-v-3cf84ea4] thead tr{background-color:#eff2fa!important;font-size:14px;font-family:Source Han Sans;font-weight:500;color:#222}.line[data-v-539871d1]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.lines[data-v-539871d1]{display:-webkit-box;word-break:break-all;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:var(--row);-webkit-box-orient:vertical}.candidate[data-v-d357ad34],.selected[data-v-d357ad34]{position:absolute;display:inline-block;width:292px;height:400px;border:1px solid #e8e8e8}.picker[data-v-d357ad34]{height:402px;position:relative;text-align:left}.picker .candidate[data-v-d357ad34]{left:0;top:0}.picker .candidate .role-header[data-v-d357ad34]{padding:10px!important;margin-bottom:5px;border-bottom:1px solid #e8e8e8}.picker .candidate .top-dept[data-v-d357ad34]{margin-left:20px;cursor:pointer;color:#38adff}.picker .candidate .next-dept[data-v-d357ad34]{float:right;color:#38adff;cursor:pointer}.picker .candidate .next-dept-disable[data-v-d357ad34]{float:right;color:#8c8c8c;cursor:not-allowed}.picker .candidate>div[data-v-d357ad34]:first-child{padding:5px 10px}.picker .selected[data-v-d357ad34]{right:0;top:0}.picker .org-items[data-v-d357ad34]{overflow-y:auto;height:310px}.picker .org-items .el-icon-close[data-v-d357ad34]{position:absolute;right:5px;cursor:pointer;font-size:larger}.picker .org-items .org-dept-item[data-v-d357ad34]{padding:10px 5px}.picker .org-items .org-dept-item>div[data-v-d357ad34]{display:inline-block}.picker .org-items .org-dept-item>div>span[data-v-d357ad34]:last-child{position:absolute;right:5px}.picker .org-items .org-role-item[data-v-d357ad34]{display:flex;align-items:center;padding:10px 5px}.picker .org-items[data-v-d357ad34] .org-user-item{display:flex;align-items:center;padding:5px}.picker .org-items[data-v-d357ad34] .org-user-item>div{display:inline-block}.picker .org-items[data-v-d357ad34] .org-user-item .avatar{width:35px;text-align:center;line-height:35px;background:#eee;color:#fff;border-radius:50%}.picker .org-items[data-v-d357ad34] .org-item{margin:0 5px;border-radius:5px;position:relative}.picker .org-items[data-v-d357ad34] .org-item .el-checkbox{margin-right:10px}.picker .org-items[data-v-d357ad34] .org-item .name{margin-left:5px}.picker .org-items[data-v-d357ad34] .org-item .overTetx{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;display:inline-block;width:165px}.picker .org-items[data-v-d357ad34] .org-item:hover{background:#f1f1f1}.selected[data-v-d357ad34]{border-left:none}.selected .count[data-v-d357ad34]{width:290px;padding:10px;display:inline-block;border-bottom:1px solid #e8e8e8;margin-bottom:5px}.selected .count>span[data-v-d357ad34]:nth-child(2){float:right;color:#c75450;cursor:pointer}.disabled[data-v-d357ad34]{cursor:not-allowed!important;color:#8c8c8c!important}[data-v-d357ad34]::-webkit-scrollbar{float:right;width:4px;height:4px;background-color:#fff}[data-v-d357ad34]::-webkit-scrollbar-thumb{border-radius:16px;background-color:#efefef}.demo-spin-icon-load[data-v-d357ad34]{animation:ani-demo-spin 1s linear infinite}.closeStyle[data-v-d357ad34]{position:absolute;right:10px;cursor:pointer}[data-v-20d42cac] .ivu-table th,[data-v-20d42cac] .ivu-table-border th{background-color:#eff2fa}[data-v-20d42cac] .ivu-table-border{border-color:#ececec!important}[data-v-20d42cac] .ivu-table-border td,[data-v-20d42cac] .ivu-table-border th{border-right:1px solid #ececec}[data-v-20d42cac] .ivu-table-header .ivu-table-cell{font-size:14px;font-family:Source Han Sans;font-weight:500;color:#222}[data-v-20d42cac] .ivu-table-row .ivu-table-cell{font-size:14px;font-family:Source Han Sans;font-weight:400;color:#555}[data-v-20d42cac] .ivu-table-cell{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}[data-v-20d42cac] .ivu-table td{max-width:0}.ivu-tooltip-inner[data-v-20d42cac]{max-width:300px;word-break:break-all;white-space:normal}.pro-table[data-v-20d42cac]{background-color:#fff}.pro-table .filter-bar-group[data-v-20d42cac]{padding:0 20px;margin-bottom:15px;background-color:#fff;padding-top:20px;box-sizing:border-box}.pro-table .filter-bar-group .filter-bar-item[data-v-20d42cac]{margin-bottom:20px;display:flex;align-items:center;box-sizing:border-box;height:32px}.pro-table .filter-bar-group .filter-bar-item .labelClass[data-v-20d42cac]{font-size:12px;font-family:Source Han Sans;font-weight:400;color:#222;text-align:right;line-height:15px;margin-right:8px;white-space:normal;word-wrap:break-word;word-break:break-all}.pro-table .filter-bar-group .filter-bar-item label[data-v-20d42cac]{white-space:nowrap}.pro-table .filter-bar[data-v-20d42cac]{padding:0 20px;margin-bottom:15px;display:flex;justify-content:space-between;background-color:#fff}.pro-table .filter-bar .filter-bar-left[data-v-20d42cac]{flex:1;display:flex;align-items:center;flex-wrap:wrap;padding-top:20px}.pro-table .filter-bar .filter-bar-right[data-v-20d42cac]{padding-top:20px}.pro-table .filter-bar .btn[data-v-20d42cac]{margin:0 10px 20px 0}.pro-table .filterForm[data-v-20d42cac]{display:flex;align-items:center;margin:0 20px 20px 0}.pro-table .filterForm .labelClass[data-v-20d42cac]{font-size:12px;font-family:Source Han Sans;font-weight:400;color:#222;text-align:right;line-height:15px;margin-right:8px;white-space:normal;word-wrap:break-word;word-break:break-all}.pro-table .filterForm label[data-v-20d42cac]{white-space:nowrap}.pro-table .tool-bar-content[data-v-20d42cac]{padding:0 20px;box-sizing:border-box;background-color:#fff;display:flex;align-items:center;justify-content:space-between}.pro-table .tool-bar-content .tool-bar-left[data-v-20d42cac]{display:flex;margin-bottom:15px;flex:2}.pro-table .tool-bar-content .tool-bar-left>div[data-v-20d42cac]{margin-right:10px}.pro-table .tool-bar-content .tool-bar-right[data-v-20d42cac]{display:flex;flex:1;justify-content:right;margin-bottom:15px}.pro-table .dropdownItem_content[data-v-20d42cac]{display:flex;align-items:center;justify-content:space-between}.pro-table .dropdownItem_content .textTitle[data-v-20d42cac]{width:110px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-right:5px;font-size:12px}.pro-table .dropdownItem_content .textTitle2[data-v-20d42cac]{font-weight:400;font-size:12px;color:#666}.pro-table .table-container[data-v-20d42cac]{padding:0 20px;background-color:#fff;box-sizing:border-box}.pro-table .footer[data-v-20d42cac]{width:100%;display:flex;justify-content:center;padding:15px 10px;background-color:#fff}::-webkit-scrollbar{width:8px;height:8px}::-webkit-scrollbar-thumb{background-color:#e1e1e1;border-radius:32px}::-webkit-scrollbar-track{background-color:#f2f2f2;border-radius:32px}.ivu-table-overflowY::-webkit-scrollbar{width:8px;height:8px}.ivu-tooltip,.ivu-tooltip-inner,.ivu-tooltip-popper{z-index:9999!important}.ivu-table-wrapper{position:relative;z-index:1}.ivu-table-fixed-left,.ivu-table-fixed-right{z-index:2}.person_icon{position:absolute;right:0;top:0;width:33px;height:32px;z-index:1;cursor:pointer}.personSelect i{display:none}.personSelect .ivu-select-visible{display:none!important}.custom-json-viewer{width:800px!important;min-width:800px!important}.custom-json-viewer .jv-container,.custom-json-viewer .jv-container.jv-collapsed,.custom-json-viewer .jv-container.jv-expanded{width:100%!important;min-width:800px!important}.custom-json-viewer{background-color:#fff;border-radius:4px}.custom-json-viewer .jv-key{color:#881391!important}.custom-json-viewer .jv-value{color:#1c00cf!important}.custom-json-viewer .jv-string{color:#c41a16!important}.custom-json-viewer .jv-number{color:#1c00cf!important}.custom-json-viewer .jv-boolean{color:#00f!important}.custom-json-viewer .jv-null{color:grey!important}.custom-json-viewer .jv-more{display:none!important}
@@ -20587,7 +20587,7 @@ if (typeof window !== 'undefined') {
20587
20587
  // Indicate to webpack that this file can be concatenated
20588
20588
  /* harmony default export */ var setPublicPath = (null);
20589
20589
 
20590
- ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.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
20590
+ ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.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
20591
20591
  var render = function render() {
20592
20592
  var _vm = this,
20593
20593
  _c = _vm._self._c;
@@ -27968,9 +27968,9 @@ var OrgPicker_component = normalizeComponent(
27968
27968
  }, [slotContent])],
27969
27969
  content: () => {
27970
27970
  const value = params.row[column.key];
27971
- console.log('value----', value);
27972
- console.log(params.row);
27973
- console.log(column.key);
27971
+ // console.log('value----',value)
27972
+ // console.log(params.row)
27973
+ // console.log(column.key)
27974
27974
  const slotContent = this.$scopedSlots[column.slot] ? this.$scopedSlots[column.slot]({
27975
27975
  row: params.row
27976
27976
  }) : h('span', params.row[column.key]);
@@ -28018,7 +28018,6 @@ var OrgPicker_component = normalizeComponent(
28018
28018
  let renderedContent;
28019
28019
  if (originalRender) {
28020
28020
  renderedContent = originalRender(h, params); // 获取渲染后的内容
28021
- console.log('renderedContent---', renderedContent);
28022
28021
  } else {
28023
28022
  // 如果没有自定义 render 函数,直接渲染默认内容
28024
28023
  renderedContent = h('span', {
@@ -28442,7 +28441,20 @@ var OrgPicker_component = normalizeComponent(
28442
28441
  reset() {
28443
28442
  this.page.current = 1;
28444
28443
  this.isClickResetBtn = true;
28445
- console.log('reset---', this.filterForm);
28444
+ // 清除所有列的排序状态
28445
+ this.columnsList.forEach(item => {
28446
+ if (item.sortable) {
28447
+ item.sortType = '';
28448
+ }
28449
+ });
28450
+ // 清除表格排序状态
28451
+ if (this.$refs.selection) {
28452
+ this.$refs.selection.handleSort({
28453
+ column: {},
28454
+ key: '',
28455
+ order: 'normal'
28456
+ });
28457
+ }
28446
28458
  for (const key in this.filterForm) {
28447
28459
  if (Object.hasOwnProperty.call(this.filterForm, key)) {
28448
28460
  console.log(key);
@@ -28464,6 +28476,9 @@ var OrgPicker_component = normalizeComponent(
28464
28476
  }
28465
28477
  }
28466
28478
  }
28479
+ // 清除排序相关的筛选条件
28480
+ delete this.filterForm.sort;
28481
+ delete this.filterForm.sortOrder;
28467
28482
  console.log('reset---', this.filterForm);
28468
28483
  this.page.current = 1;
28469
28484
  this.getDataSource({
@@ -28524,6 +28539,7 @@ var OrgPicker_component = normalizeComponent(
28524
28539
  * 监听筛选按钮
28525
28540
  */
28526
28541
  onFilter() {
28542
+ console.log(this.tableColumns);
28527
28543
  const isHasOnFilter = this.$listeners.onFilter;
28528
28544
  // 如果当前父组件已绑定查询事件,那么就不走默认查询流程,由外部事件去查询数据
28529
28545
  if (isHasOnFilter) {
@@ -28899,15 +28915,15 @@ var OrgPicker_component = normalizeComponent(
28899
28915
  });
28900
28916
  ;// ./packages/components/index.vue?vue&type=script&lang=js
28901
28917
  /* harmony default export */ var packages_componentsvue_type_script_lang_js = (componentsvue_type_script_lang_js);
28902
- ;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-74.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-74.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-74.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-74.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
28918
+ ;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-74.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-74.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-74.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-74.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
28903
28919
  // extracted by mini-css-extract-plugin
28904
28920
 
28905
- ;// ./packages/components/index.vue?vue&type=style&index=0&id=116dee39&prod&scoped=true&lang=less
28921
+ ;// ./packages/components/index.vue?vue&type=style&index=0&id=20d42cac&prod&scoped=true&lang=less
28906
28922
 
28907
- ;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-54.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-54.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-54.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
28923
+ ;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-54.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-54.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-54.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
28908
28924
  // extracted by mini-css-extract-plugin
28909
28925
 
28910
- ;// ./packages/components/index.vue?vue&type=style&index=1&id=116dee39&prod&lang=css
28926
+ ;// ./packages/components/index.vue?vue&type=style&index=1&id=20d42cac&prod&lang=css
28911
28927
 
28912
28928
  ;// ./packages/components/index.vue
28913
28929
 
@@ -28925,7 +28941,7 @@ var components_component = normalizeComponent(
28925
28941
  staticRenderFns,
28926
28942
  false,
28927
28943
  null,
28928
- "116dee39",
28944
+ "20d42cac",
28929
28945
  null
28930
28946
 
28931
28947
  )