yc-pro-components 0.0.64 → 0.0.66

package/index.js

@@ -1,4 +1,4 @@
-/*! yc-pro-components v0.0.64 */
+/*! yc-pro-components v0.0.66 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('element-plus')) :
   typeof define === 'function' && define.amd ? define(['exports', 'vue', 'element-plus'], factory) :
@@ -18360,7 +18360,7 @@
     /* HOISTED */
   );
   const _hoisted_6$7 = { class: "plus-table-checkbox-checkAll" };
-  const _hoisted_7$6 = {
+  const _hoisted_7$5 = {
     key: 0,
     class: "plus-table-checkbox-handle"
   };
@@ -18718,7 +18718,7 @@
                                 key: item.prop,
                                 class: "plus-table-checkbox-item"
                               }, [
-                                ((_a3 = columnSetting.value) == null ? void 0 : _a3.dragSort) !== false ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7$6, [
+                                ((_a3 = columnSetting.value) == null ? void 0 : _a3.dragSort) !== false ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7$5, [
                                   vue.renderSlot(_ctx.$slots, "drag-sort-icon", {}, () => [
                                     vue.createTextVNode("\u2637")
                                   ])
@@ -22051,7 +22051,7 @@
   );
   const _hoisted_5$8 = { class: "plus-header__right" };
   const _hoisted_6$6 = { class: "plus-header__dropdown-area" };
-  const _hoisted_7$5 = ["src"];
+  const _hoisted_7$4 = ["src"];
   const _hoisted_8$3 = { class: "plus-header__username" };
   const _hoisted_9$3 = {
     key: 0,
@@ -22193,7 +22193,7 @@
                           src: _ctx.userInfo.avatar,
                           alt: "",
                           class: "plus-header__avatar"
-                        }, null, 8, _hoisted_7$5)) : (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElIcon), {
+                        }, null, 8, _hoisted_7$4)) : (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElIcon), {
                           key: 1,
                           size: 20,
                           class: "plus-header__avatar"
@@ -32522,7 +32522,7 @@
         const showCheckAll = fp.showCheckAll !== false;
         const showInvert = fp.showInvert !== false;
         const checkAllText = fp.checkAllText || "\u5168\u9009";
-        return vue.h("div", { class: "header-filter-checkbox-group", style: "max-height: 250px; overflow-y: auto; padding: 4px;" }, [
+        return vue.h("div", { class: "header-filter-checkbox-group", style: "max-height: 250px; overflow-y: auto;" }, [
           showCheckAll && options.length > 0 ? vue.h("div", { style: "display: flex; align-items: center; gap: 8px; flex-wrap: wrap; margin-bottom: 8px; padding-bottom: 8px; border-bottom: 1px solid var(--el-border-color-lighter);" }, [
             vue.h(elementPlus.ElCheckbox, {
               modelValue: checkAll,
@@ -32545,7 +32545,7 @@
             ...fp,
             modelValue: parsedValue,
             "onUpdate:modelValue": (v) => setInputVal(fromArrayValue(v)),
-            style: "display: flex; flex-direction: column;"
+            style: "display: flex; flex-direction: column;gap:4px;"
           }, {
             default: () => options.map(
               (opt) => vue.h(
@@ -32635,24 +32635,16 @@
     style: {
       display: "flex",
       flexDirection: "column",
-      padding: "8px",
       minWidth: "180px",
       gap: "4px"
     }
   };
   const _hoisted_4$6 = {
-    class: "yc-header-filter-cell__actions",
-    style: {
-      display: "flex",
-      justifyContent: "flex-end"
-    }
-  };
-  const _hoisted_5$6 = {
     key: 0,
     class: "yc-header-filter-cell__operators"
   };
-  const _hoisted_6$5 = ["onClick"];
-  const _hoisted_7$4 = { key: 0 };
+  const _hoisted_5$6 = ["onClick"];
+  const _hoisted_6$5 = { key: 0 };
   var _sfc_main$g = /* @__PURE__ */ vue.defineComponent({
     ...{
       name: "YcTableHeaderFilterCell"
@@ -32748,29 +32740,6 @@
       const handleSelect = (op) => {
         state.selectedOp = op.code;
       };
-      const handleReset = () => {
-        state.inputVal = "";
-        const payload = { column: props.column, op: state.selectedOp };
-        const customConfig = getHeaderFilterObject();
-        if (customConfig.onReset) {
-          customConfig.onReset(payload);
-        }
-        emit("reset", payload);
-        popVisible.value = false;
-      };
-      const handleConfirm = () => {
-        const payload = {
-          column: props.column,
-          op: state.selectedOp,
-          value: state.inputVal
-        };
-        const customConfig = getHeaderFilterObject();
-        if (customConfig.onConfirm) {
-          customConfig.onConfirm(payload);
-        }
-        emit("confirm", payload);
-        popVisible.value = false;
-      };
       const cycleSort = () => {
         const field = fieldRef.value;
         if (!field) return;
@@ -32836,19 +32805,31 @@
         return false;
       });
       const popoverWidth = vue.computed(() => hideOperatorList.value ? 320 : 220);
-      vue.watch(popVisible, (visible) => {
+      vue.watch(popVisible, (visible, prevVisible) => {
         var _a, _b;
-        if (!visible) return;
-        const t = resolvedInteractionType.value;
-        const customConfig = getHeaderFilterObject();
-        const fp = {
-          ...fieldPropsForFilter.value,
-          ...customConfig.props || {}
-        };
-        if (t === "date-picker" && isRangeType(fp.type)) {
-          if (state.selectedOp !== "between") state.selectedOp = "between";
-        } else if (t === "checkbox" || t === "select" && ((_a = customConfig.props) == null ? void 0 : _a.multiple) || t === "tree-select" && ((_b = customConfig.props) == null ? void 0 : _b.multiple)) {
-          if (state.selectedOp !== "in") state.selectedOp = "in";
+        if (visible) {
+          const t = resolvedInteractionType.value;
+          const customConfig = getHeaderFilterObject();
+          const fp = {
+            ...fieldPropsForFilter.value,
+            ...customConfig.props || {}
+          };
+          if (t === "date-picker" && isRangeType(fp.type)) {
+            if (state.selectedOp !== "between") state.selectedOp = "between";
+          } else if (t === "checkbox" || t === "select" && ((_a = customConfig.props) == null ? void 0 : _a.multiple) || t === "tree-select" && ((_b = customConfig.props) == null ? void 0 : _b.multiple)) {
+            if (state.selectedOp !== "in") state.selectedOp = "in";
+          }
+        } else if (prevVisible) {
+          const payload = {
+            column: props.column,
+            op: state.selectedOp,
+            value: state.inputVal
+          };
+          const customConfig = getHeaderFilterObject();
+          if (customConfig.onConfirm) {
+            customConfig.onConfirm(payload);
+          }
+          emit("confirm", payload);
         }
       });
       const renderValueField = () => {
@@ -33067,28 +33048,8 @@
               ]),
               default: vue.withCtx(() => [
                 vue.createElementVNode("div", _hoisted_3$8, [
-                  vue.createCommentVNode(" \u64CD\u4F5C\u6309\u94AE\uFF08\u7F6E\u9876\u53F3\u4FA7\uFF0C\u907F\u514D\u4E0B\u62C9\u9009\u62E9\u5668\u906E\u6321\uFF09 "),
-                  vue.createElementVNode("div", _hoisted_4$6, [
-                    vue.createVNode(vue.unref(elementPlus.ElButton), { onClick: handleReset }, {
-                      default: vue.withCtx(() => [
-                        vue.createTextVNode("\u91CD\u7F6E")
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    }),
-                    vue.createVNode(vue.unref(elementPlus.ElButton), {
-                      type: "primary",
-                      onClick: handleConfirm
-                    }, {
-                      default: vue.withCtx(() => [
-                        vue.createTextVNode("\u786E\u5B9A")
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    })
-                  ]),
                   vue.createCommentVNode(" \u64CD\u4F5C\u7B26\u5217\u8868\uFF08\u591A\u9009/\u65E5\u671F\u533A\u95F4\u7B49\u7531 hideOperatorList \u9690\u85CF\uFF0C\u9ED8\u8BA4 in / between\uFF09 "),
-                  !hideOperatorList.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5$6, [
+                  !hideOperatorList.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4$6, [
                     (vue.openBlock(true), vue.createElementBlock(
                       vue.Fragment,
                       null,
@@ -33115,8 +33076,8 @@
                             1
                             /* TEXT */
                           ),
-                          state.selectedOp === op.code ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_7$4, "\u2713")) : vue.createCommentVNode("v-if", true)
-                        ], 12, _hoisted_6$5);
+                          state.selectedOp === op.code ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_6$5, "\u2713")) : vue.createCommentVNode("v-if", true)
+                        ], 12, _hoisted_5$6);
                       }),
                       128
                       /* KEYED_FRAGMENT */
@@ -33137,7 +33098,7 @@
     }
   });
 
-  var YcTableHeaderFilterCellComponent = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-218b6c5c"], ["__file", "header-filter-cell.vue"]]);
+  var YcTableHeaderFilterCellComponent = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-ce1588fc"], ["__file", "header-filter-cell.vue"]]);
 
   const DEFAULT_PAGE_SIZE = 20;
   const COLUMN_CACHE_PREFIX = "yc-column-settings:";

package/index.min.css

@@ -1,6 +1,6 @@
 .plus-virtual-table{display:flex;flex-direction:column;height:100%;min-height:0;width:100%}.plus-virtual-table__title-bar{justify-content:space-between;padding:12px 0}.plus-virtual-table__title-bar,.plus-virtual-table__title-bar__left{align-items:center;display:flex}.plus-virtual-table__title-bar__right{align-items:center;display:flex;gap:8px}.plus-virtual-table__title-bar__text{font-size:16px;font-weight:500}.plus-virtual-table__title-bar__refresh{color:#606266;cursor:pointer;transition:color .2s}.plus-virtual-table__title-bar__refresh:hover{color:var(--el-color-primary)}.plus-virtual-table__body{flex:1;max-height:calc(100vh - 280px);min-height:0;overflow:hidden}.plus-virtual-table__header,.plus-virtual-table__header .el-table-v2__header-cell{background-color:var(--el-fill-color-light)!important}.plus-virtual-table__pagination{padding:12px 0}.plus-virtual-table-action-bar{align-items:center;display:flex;gap:4px;justify-content:center}.plus-table-column-status{align-items:center;display:inline-flex;gap:6px}.plus-table-column-status__dot{border-radius:50%;display:inline-block;height:8px;width:8px}.plus-table-column-empty{color:#c0c4cc}.plus-virtual-table--striped .plus-virtual-table__row--striped .el-table-v2__row-cell{background-color:var(--el-fill-color-lighter,#fafafa)}.plus-virtual-table--border .plus-virtual-table__body{border:1px solid var(--el-border-color-lighter,#ebeef5)}.plus-virtual-table--border .el-table-v2__header-cell,.plus-virtual-table--border .el-table-v2__row-cell{border-right:1px solid var(--el-border-color-lighter,#ebeef5)}.plus-virtual-table--border .el-table-v2__header-cell:last-child,.plus-virtual-table--border .el-table-v2__row-cell:last-child{border-right:none}.plus-virtual-table--border .el-table-v2__header-row,.plus-virtual-table--border .el-table-v2__row{border-bottom:1px solid var(--el-border-color-lighter,#ebeef5)}
 .yc-svg-icon[data-v-34e1f2f7]{display:inline-block;-webkit-mask-size:contain;mask-size:contain;vertical-align:middle}.yc-svg-icon--original[data-v-34e1f2f7]{-o-object-fit:contain;object-fit:contain}
-.yc-header-filter-cell[data-v-218b6c5c]{width:100%}.yc-header-filter-cell__label--ellipsis[data-v-218b6c5c]{flex:1 1 0;min-width:0;overflow:hidden}.yc-header-filter-cell__label--ellipsis[data-v-218b6c5c] .yc-header-filter-cell__label-text[data-v-218b6c5c]{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:100%}.yc-header-filter-cell__label--active[data-v-218b6c5c]{color:var(--el-color-primary)}[data-v-218b6c5c] .yc-header-filter-cell__sort-icon--asc,[data-v-218b6c5c] .yc-header-filter-cell__sort-icon--desc{background-color:var(--el-color-primary)!important}[data-v-218b6c5c] .yc-header-filter-cell__filter-icon--active{background-color:var(--el-color-primary)!important}
+.yc-header-filter-cell[data-v-ce1588fc]{width:100%}.yc-header-filter-cell__label--ellipsis[data-v-ce1588fc]{flex:1 1 0;min-width:0;overflow:hidden}.yc-header-filter-cell__label--ellipsis[data-v-ce1588fc] .yc-header-filter-cell__label-text[data-v-ce1588fc]{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:100%}.yc-header-filter-cell__label--active[data-v-ce1588fc]{color:var(--el-color-primary)}[data-v-ce1588fc] .yc-header-filter-cell__sort-icon--asc,[data-v-ce1588fc] .yc-header-filter-cell__sort-icon--desc{background-color:var(--el-color-primary)!important}[data-v-ce1588fc] .yc-header-filter-cell__filter-icon--active{background-color:var(--el-color-primary)!important}
 .yc-header-filter-inner-dropdown{z-index:4100!important}
 .yc-plus-page[data-v-53b16de1]{height:100%}.yc-plus-page[data-v-53b16de1] [data-v-53b16de1] .plus-page>.el-card{border-radius:8px}[data-v-53b16de1] .yc-search-card-body{padding-right:0}[data-v-53b16de1] .plus-table-title-bar__toolbar__icon{font-size:16px!important;position:relative;top:-2px}.column-settings-wrapper[data-v-53b16de1]{align-items:center;cursor:pointer;display:flex;gap:4px;margin-left:8px}.column-settings-text[data-v-53b16de1]{font-size:14px}
 .yc-select-v2-loading.el-select-dropdown__item{color:#909399;cursor:default;font-size:13px;pointer-events:none;text-align:center}.yc-select-v2-loading.el-select-dropdown__item.is-disabled{color:#909399;cursor:default}