yc-pro-components 0.0.64 → 0.0.66

package/index.mjs

@@ -1,4 +1,4 @@
-/*! yc-pro-components v0.0.64 */
+/*! yc-pro-components v0.0.66 */
 import { unref, isRef, ref, inject, isReactive, watch, computed, shallowRef, provide, onMounted, nextTick, onBeforeUnmount, defineComponent, useAttrs, watchEffect, openBlock, createBlock, mergeProps, createSlots, withCtx, createElementVNode, renderSlot, normalizeStyle, createVNode, createTextVNode, toDisplayString, createElementBlock, normalizeClass, createCommentVNode, reactive, Fragment, renderList, resolveDynamicComponent, normalizeProps, guardReactiveProps, h, withDirectives, isVNode, withKeys, withModifiers, TransitionGroup, toHandlers, getCurrentInstance, resolveComponent, toRefs, useSlots, onUnmounted, resolveDirective, pushScopeId, popScopeId, onBeforeMount, getCurrentScope, onScopeDispose, toRef, mergeModels, useModel, vShow, createStaticVNode, hasInjectionContext, markRaw, effectScope, toRaw } from 'vue';
 import { dayjs, localeContextKey, ElDialog, ElButton, ElPagination, ElRadioGroup, ElRadio, ElTableColumn, ElDropdown, ElDropdownMenu, ElDropdownItem, ElIcon, ElTooltip, ElPopconfirm, ElLink, ElMessageBox, useFormDisabled, ElDatePicker, ClickOutside, ElTag, ElInput, ElAutocomplete, ElCascader, ElCheckboxGroup, ElCheckbox, ElColorPicker, ElInputNumber, ElRate, ElSelect, ElOption, ElSlider, ElSwitch, ElTimePicker, ElTimeSelect, ElTransfer, ElTreeSelect, ElSelectV2, ElText, ElDivider, ElFormItem, ElOptionGroup, ElRow, ElCol, ElForm, ElCard, ElMessage, ElImage, ElProgress, ElAvatar, ElPopover, ElTable, vLoading, ElDescriptions, ElDescriptionsItem, ElDrawer, TableV2FixedDir, ElAutoResizer, ElTableV2, ElSteps, ElStep, ElBreadcrumb, ElBreadcrumbItem, ElMenuItem, ElSubMenu, ElMenu, ElScrollbar, ElHeader, ElContainer, ElMain, ElBacktop, ElUpload } from 'element-plus';
 
@@ -18357,7 +18357,7 @@ const _hoisted_5$9 = /* @__PURE__ */ createElementVNode(
   /* 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"
 };
@@ -18715,7 +18715,7 @@ var _sfc_main$y = /* @__PURE__ */ defineComponent({
                               key: item.prop,
                               class: "plus-table-checkbox-item"
                             }, [
-                              ((_a3 = columnSetting.value) == null ? void 0 : _a3.dragSort) !== false ? (openBlock(), createElementBlock("div", _hoisted_7$6, [
+                              ((_a3 = columnSetting.value) == null ? void 0 : _a3.dragSort) !== false ? (openBlock(), createElementBlock("div", _hoisted_7$5, [
                                 renderSlot(_ctx.$slots, "drag-sort-icon", {}, () => [
                                   createTextVNode("\u2637")
                                 ])
@@ -22048,7 +22048,7 @@ const _hoisted_4$8 = /* @__PURE__ */ createElementVNode(
 );
 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,
@@ -22190,7 +22190,7 @@ var _sfc_main$m = /* @__PURE__ */ defineComponent({
                         src: _ctx.userInfo.avatar,
                         alt: "",
                         class: "plus-header__avatar"
-                      }, null, 8, _hoisted_7$5)) : (openBlock(), createBlock(unref(ElIcon), {
+                      }, null, 8, _hoisted_7$4)) : (openBlock(), createBlock(unref(ElIcon), {
                         key: 1,
                         size: 20,
                         class: "plus-header__avatar"
@@ -32519,7 +32519,7 @@ const FILTER_COMPONENT_STRATEGIES = {
       const showCheckAll = fp.showCheckAll !== false;
       const showInvert = fp.showInvert !== false;
       const checkAllText = fp.checkAllText || "\u5168\u9009";
-      return h("div", { class: "header-filter-checkbox-group", style: "max-height: 250px; overflow-y: auto; padding: 4px;" }, [
+      return h("div", { class: "header-filter-checkbox-group", style: "max-height: 250px; overflow-y: auto;" }, [
         showCheckAll && options.length > 0 ? 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);" }, [
           h(ElCheckbox, {
             modelValue: checkAll,
@@ -32542,7 +32542,7 @@ const FILTER_COMPONENT_STRATEGIES = {
           ...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) => h(
@@ -32632,24 +32632,16 @@ const _hoisted_3$8 = {
   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__ */ defineComponent({
   ...{
     name: "YcTableHeaderFilterCell"
@@ -32745,29 +32737,6 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
     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;
@@ -32833,19 +32802,31 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
       return false;
     });
     const popoverWidth = computed(() => hideOperatorList.value ? 320 : 220);
-    watch(popVisible, (visible) => {
+    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 = () => {
@@ -33064,28 +33045,8 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
             ]),
             default: withCtx(() => [
               createElementVNode("div", _hoisted_3$8, [
-                createCommentVNode(" \u64CD\u4F5C\u6309\u94AE\uFF08\u7F6E\u9876\u53F3\u4FA7\uFF0C\u907F\u514D\u4E0B\u62C9\u9009\u62E9\u5668\u906E\u6321\uFF09 "),
-                createElementVNode("div", _hoisted_4$6, [
-                  createVNode(unref(ElButton), { onClick: handleReset }, {
-                    default: withCtx(() => [
-                      createTextVNode("\u91CD\u7F6E")
-                    ]),
-                    _: 1
-                    /* STABLE */
-                  }),
-                  createVNode(unref(ElButton), {
-                    type: "primary",
-                    onClick: handleConfirm
-                  }, {
-                    default: withCtx(() => [
-                      createTextVNode("\u786E\u5B9A")
-                    ]),
-                    _: 1
-                    /* STABLE */
-                  })
-                ]),
                 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 ? (openBlock(), createElementBlock("div", _hoisted_5$6, [
+                !hideOperatorList.value ? (openBlock(), createElementBlock("div", _hoisted_4$6, [
                   (openBlock(true), createElementBlock(
                     Fragment,
                     null,
@@ -33112,8 +33073,8 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
                           1
                           /* TEXT */
                         ),
-                        state.selectedOp === op.code ? (openBlock(), createElementBlock("span", _hoisted_7$4, "\u2713")) : createCommentVNode("v-if", true)
-                      ], 12, _hoisted_6$5);
+                        state.selectedOp === op.code ? (openBlock(), createElementBlock("span", _hoisted_6$5, "\u2713")) : createCommentVNode("v-if", true)
+                      ], 12, _hoisted_5$6);
                     }),
                     128
                     /* KEYED_FRAGMENT */
@@ -33134,7 +33095,7 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
   }
 });
 
-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/lib/components/yc-plus-page/src/filter-strategies.js

@@ -86,7 +86,7 @@ const FILTER_COMPONENT_STRATEGIES = {
       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,
@@ -109,7 +109,7 @@ const FILTER_COMPONENT_STRATEGIES = {
           ...fp,
           modelValue: parsedValue,
           "onUpdate:modelValue": (v) => setInputVal(filterUtils.fromArrayValue(v)),
-          style: "display: flex; flex-direction: column;"
+          style: "display: flex; flex-direction: column;gap:4px;"
         }, {
           default: () => options.map(
             (opt) => vue.h(

package/lib/components/yc-plus-page/src/header-filter-cell.vue.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var headerFilterCell_vue_vue_type_script_setup_true_lang = require('./header-filter-cell.vue2.js');
 var _pluginVue_exportHelper = require('../../../_virtual/_plugin-vue_export-helper.js');
 
-var YcTableHeaderFilterCellComponent = /* @__PURE__ */ _pluginVue_exportHelper.default(headerFilterCell_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-218b6c5c"], ["__file", "header-filter-cell.vue"]]);
+var YcTableHeaderFilterCellComponent = /* @__PURE__ */ _pluginVue_exportHelper.default(headerFilterCell_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-ce1588fc"], ["__file", "header-filter-cell.vue"]]);
 
 exports.default = YcTableHeaderFilterCellComponent;

package/lib/components/yc-plus-page/src/header-filter-cell.vue2.js

@@ -20,24 +20,16 @@ const _hoisted_3 = {
   style: {
     display: "flex",
     flexDirection: "column",
-    padding: "8px",
     minWidth: "180px",
     gap: "4px"
   }
 };
 const _hoisted_4 = {
-  class: "yc-header-filter-cell__actions",
-  style: {
-    display: "flex",
-    justifyContent: "flex-end"
-  }
-};
-const _hoisted_5 = {
   key: 0,
   class: "yc-header-filter-cell__operators"
 };
-const _hoisted_6 = ["onClick"];
-const _hoisted_7 = { key: 0 };
+const _hoisted_5 = ["onClick"];
+const _hoisted_6 = { key: 0 };
 var _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{
     name: "YcTableHeaderFilterCell"
@@ -133,29 +125,6 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     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;
@@ -221,19 +190,31 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       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" && filterUtils.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" && filterUtils.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 = () => {
@@ -452,28 +433,8 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
             ]),
             default: vue.withCtx(() => [
               vue.createElementVNode("div", _hoisted_3, [
-                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, [
-                  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, [
+                !hideOperatorList.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_4, [
                   (vue.openBlock(true), vue.createElementBlock(
                     vue.Fragment,
                     null,
@@ -500,8 +461,8 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
                           1
                           /* TEXT */
                         ),
-                        state.selectedOp === op.code ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_7, "\u2713")) : vue.createCommentVNode("v-if", true)
-                      ], 12, _hoisted_6);
+                        state.selectedOp === op.code ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_6, "\u2713")) : vue.createCommentVNode("v-if", true)
+                      ], 12, _hoisted_5);
                     }),
                     128
                     /* KEYED_FRAGMENT */