yc-pro-components 0.0.48 → 0.0.50

package/index.mjs

@@ -1,4 +1,4 @@
-/*! yc-pro-components v0.0.48 */
+/*! yc-pro-components v0.0.50 */
 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';
 
@@ -31950,7 +31950,8 @@ const DEFAULT_YC_CONFIG = {
   t: (key) => key,
   components: {
     plusPage: {
-      showSearch: true
+      showSearch: true,
+      columnSettingsText: "\u5B57\u6BB5\u7BA1\u7406"
     },
     tabsWithFilter: {
       filterText: "\u7B5B\u9009"
@@ -32392,7 +32393,6 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const { getCdnUrl } = useYcCdnUrl();
     const filterIconUrl = computed(() => getCdnUrl("images", "table_filter_icon.svg"));
-    const sortIconUrl = computed(() => getCdnUrl("images", "table_sort_icon.svg"));
     const state = reactive({
       selectedOp: "=",
       inputVal: ""
@@ -32536,6 +32536,7 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
         modelValue: state.inputVal,
         "onUpdate:modelValue": (v) => state.inputVal = v,
         placeholder: "",
+        maxlength: 50,
         style: "margin-top: 4px; width: 100%"
       });
     };
@@ -32563,7 +32564,10 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
           createElementVNode(
             "span",
             {
-              class: normalizeClass(["yc-header-filter-cell__label", { "yc-header-filter-cell__label--ellipsis": shouldShowEllipsis.value }]),
+              class: normalizeClass(["yc-header-filter-cell__label", {
+                "yc-header-filter-cell__label--ellipsis": shouldShowEllipsis.value,
+                "yc-header-filter-cell__label--active": isAscActive.value || isDescActive.value || isActive.value
+              }]),
               style: {
                 userSelect: "none",
                 cursor: "pointer"
@@ -32662,19 +32666,35 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
             class: "yc-header-filter-cell__sort",
             style: {
               display: "inline-flex",
+              flexDirection: "column",
               alignItems: "center",
-              cursor: "pointer"
+              cursor: "pointer",
+              lineHeight: 1
             },
             onClick: withModifiers(cycleSort, ["stop"])
           }, [
-            createVNode(unref(YcSvgIcon), {
-              src: sortIconUrl.value,
-              size: 14,
-              class: normalizeClass({
-                "yc-header-filter-cell__sort-icon--asc": isAscActive.value,
-                "yc-header-filter-cell__sort-icon--desc": isDescActive.value
-              })
-            }, null, 8, ["src", "class"])
+            createCommentVNode(" \u5347\u5E8F\u7BAD\u5934\uFF1A\u6FC0\u6D3B\u65F6\u9AD8\u4EAE "),
+            createVNode(unref(ElIcon), {
+              size: 10,
+              style: normalizeStyle({ color: isAscActive.value ? "var(--el-color-primary)" : "var(--el-text-color-placeholder)", marginBottom: "-4px" })
+            }, {
+              default: withCtx(() => [
+                createVNode(unref(caret_top_default))
+              ]),
+              _: 1
+              /* STABLE */
+            }, 8, ["style"]),
+            createCommentVNode(" \u964D\u5E8F\u7BAD\u5934\uFF1A\u6FC0\u6D3B\u65F6\u9AD8\u4EAE "),
+            createVNode(unref(ElIcon), {
+              size: 10,
+              style: normalizeStyle({ color: isDescActive.value ? "var(--el-color-primary)" : "var(--el-text-color-placeholder)" })
+            }, {
+              default: withCtx(() => [
+                createVNode(unref(caret_bottom_default))
+              ]),
+              _: 1
+              /* STABLE */
+            }, 8, ["style"])
           ]),
           createCommentVNode(" \u7B5B\u9009\u56FE\u6807\u548C\u5F39\u7A97 "),
           !_ctx.disableFilter ? (openBlock(), createBlock(unref(ElPopover), {
@@ -32692,8 +32712,9 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
                 createVNode(unref(YcSvgIcon), {
                   src: filterIconUrl.value,
                   size: 14,
+                  color: isActive.value ? "var(--el-color-primary)" : "currentColor",
                   class: normalizeClass({ "yc-header-filter-cell__filter-icon--active": isActive.value })
-                }, null, 8, ["src", "class"])
+                }, null, 8, ["src", "color", "class"])
               ])
             ]),
             default: withCtx(() => [
@@ -32768,7 +32789,7 @@ var _sfc_main$g = /* @__PURE__ */ defineComponent({
   }
 });
 
-var YcTableHeaderFilterCellComponent = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-e0442d8a"], ["__file", "header-filter-cell.vue"]]);
+var YcTableHeaderFilterCellComponent = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-3330af37"], ["__file", "header-filter-cell.vue"]]);
 
 const DEFAULT_PAGE_SIZE = 20;
 const COLUMN_CACHE_PREFIX = "yc-column-settings:";
@@ -32798,7 +32819,8 @@ var _sfc_main$f = /* @__PURE__ */ defineComponent({
     headerFilter: { type: [Object, Boolean], default: false },
     hideHeaderFilter: { type: Boolean, default: true },
     columnCacheKey: { default: void 0 },
-    disableColumnCache: { type: Boolean, default: false }
+    disableColumnCache: { type: Boolean, default: false },
+    columnSettingsText: { default: void 0 }
   },
   emits: ["header-filter-confirm", "header-filter-reset"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -32940,6 +32962,16 @@ var _sfc_main$f = /* @__PURE__ */ defineComponent({
       if (customIcon) return customIcon;
       return getCdnUrl("images", "table_value_setting.svg");
     });
+    const resolvedColumnSettingsText = computed(() => {
+      if (props.columnSettingsText !== void 0) {
+        return props.columnSettingsText;
+      }
+      const fromGlobal = plusPageConfig == null ? void 0 : plusPageConfig.columnSettingsText;
+      if (fromGlobal !== void 0) {
+        return fromGlobal;
+      }
+      return "\u5B57\u6BB5\u7BA1\u7406";
+    });
     watch(
       showSearch,
       () => {
@@ -33183,6 +33215,7 @@ var _sfc_main$f = /* @__PURE__ */ defineComponent({
       return !((tableConfig == null ? void 0 : tableConfig.border) === true);
     });
     void fieldSettingIconUrl.value;
+    void resolvedColumnSettingsText.value;
     void hasRequest.value;
     void showDefaultColumnSettingsIcon.value;
     __expose({
@@ -33248,7 +33281,13 @@ var _sfc_main$f = /* @__PURE__ */ defineComponent({
                     src: fieldSettingIconUrl.value,
                     size: 16
                   }, null, 8, ["src"]),
-                  createElementVNode("span", { class: "column-settings-text" }, "\u5B57\u6BB5\u7BA1\u7406")
+                  createElementVNode(
+                    "span",
+                    { class: "column-settings-text" },
+                    toDisplayString(resolvedColumnSettingsText.value),
+                    1
+                    /* TEXT */
+                  )
                 ])
               ]),
               key: "1"
@@ -33270,7 +33309,7 @@ var _sfc_main$f = /* @__PURE__ */ defineComponent({
   }
 });
 
-var YcPlusPageComponent = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-c7557953"], ["__file", "index.vue"]]);
+var YcPlusPageComponent = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-bc9aafd7"], ["__file", "index.vue"]]);
 
 function compareValues(a, b) {
   if (a == null && b == null) return 0;
@@ -33316,7 +33355,13 @@ function matchFilter(value, op, filterValue) {
       return !set.includes(strValue);
     }
     case "between": {
-      const parts = strFilter.split(",").map((s) => Number(s.trim()));
+      let parts = strFilter.split(",").map((s) => Number(s.trim()));
+      if (parts.length < 2 || isNaN(parts[0]) || isNaN(parts[1])) {
+        const hyphenMatch = strFilter.match(/^(-?\d+(?:\.\d+)?)-(-?\d+(?:\.\d+)?)$/);
+        if (hyphenMatch) {
+          parts = [Number(hyphenMatch[1]), Number(hyphenMatch[2])];
+        }
+      }
       const num = Number(value);
       return parts.length === 2 && !isNaN(num) && !isNaN(parts[0]) && !isNaN(parts[1]) && num >= parts[0] && num <= parts[1];
     }

package/lib/components/yc-config-provider/src/type.d.ts

@@ -60,6 +60,8 @@ export interface YcGlobalConfig {
             showSearch?: boolean;
             /** 字段管理图标 URL */
             fieldSettingIcon?: string;
+            /** 工具栏「字段管理」/列设置旁文案，默认「字段管理」 */
+            columnSettingsText?: string;
         };
         /** YcTabsWithFilter 默认配置 */
         tabsWithFilter?: {

package/lib/components/yc-config-provider/src/type.js

@@ -14,7 +14,8 @@ const DEFAULT_YC_CONFIG = {
   t: (key) => key,
   components: {
     plusPage: {
-      showSearch: true
+      showSearch: true,
+      columnSettingsText: "\u5B57\u6BB5\u7BA1\u7406"
     },
     tabsWithFilter: {
       filterText: "\u7B5B\u9009"

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-e0442d8a"], ["__file", "header-filter-cell.vue"]]);
+var YcTableHeaderFilterCellComponent = /* @__PURE__ */ _pluginVue_exportHelper.default(headerFilterCell_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-3330af37"], ["__file", "header-filter-cell.vue"]]);
 
 exports.default = YcTableHeaderFilterCellComponent;

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

@@ -54,7 +54,6 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const emit = __emit;
     const { getCdnUrl } = useYcConfig.useYcCdnUrl();
     const filterIconUrl = vue.computed(() => getCdnUrl("images", "table_filter_icon.svg"));
-    const sortIconUrl = vue.computed(() => getCdnUrl("images", "table_sort_icon.svg"));
     const state = vue.reactive({
       selectedOp: "=",
       inputVal: ""
@@ -198,6 +197,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
         modelValue: state.inputVal,
         "onUpdate:modelValue": (v) => state.inputVal = v,
         placeholder: "",
+        maxlength: 50,
         style: "margin-top: 4px; width: 100%"
       });
     };
@@ -225,7 +225,10 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
           vue.createElementVNode(
             "span",
             {
-              class: vue.normalizeClass(["yc-header-filter-cell__label", { "yc-header-filter-cell__label--ellipsis": shouldShowEllipsis.value }]),
+              class: vue.normalizeClass(["yc-header-filter-cell__label", {
+                "yc-header-filter-cell__label--ellipsis": shouldShowEllipsis.value,
+                "yc-header-filter-cell__label--active": isAscActive.value || isDescActive.value || isActive.value
+              }]),
               style: {
                 userSelect: "none",
                 cursor: "pointer"
@@ -324,19 +327,35 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
             class: "yc-header-filter-cell__sort",
             style: {
               display: "inline-flex",
+              flexDirection: "column",
               alignItems: "center",
-              cursor: "pointer"
+              cursor: "pointer",
+              lineHeight: 1
             },
             onClick: vue.withModifiers(cycleSort, ["stop"])
           }, [
-            vue.createVNode(vue.unref(index$1.default), {
-              src: sortIconUrl.value,
-              size: 14,
-              class: vue.normalizeClass({
-                "yc-header-filter-cell__sort-icon--asc": isAscActive.value,
-                "yc-header-filter-cell__sort-icon--desc": isDescActive.value
-              })
-            }, null, 8, ["src", "class"])
+            vue.createCommentVNode(" \u5347\u5E8F\u7BAD\u5934\uFF1A\u6FC0\u6D3B\u65F6\u9AD8\u4EAE "),
+            vue.createVNode(vue.unref(elementPlus.ElIcon), {
+              size: 10,
+              style: vue.normalizeStyle({ color: isAscActive.value ? "var(--el-color-primary)" : "var(--el-text-color-placeholder)", marginBottom: "-4px" })
+            }, {
+              default: vue.withCtx(() => [
+                vue.createVNode(vue.unref(ElementPlusIconsVue.CaretTop))
+              ]),
+              _: 1
+              /* STABLE */
+            }, 8, ["style"]),
+            vue.createCommentVNode(" \u964D\u5E8F\u7BAD\u5934\uFF1A\u6FC0\u6D3B\u65F6\u9AD8\u4EAE "),
+            vue.createVNode(vue.unref(elementPlus.ElIcon), {
+              size: 10,
+              style: vue.normalizeStyle({ color: isDescActive.value ? "var(--el-color-primary)" : "var(--el-text-color-placeholder)" })
+            }, {
+              default: vue.withCtx(() => [
+                vue.createVNode(vue.unref(ElementPlusIconsVue.CaretBottom))
+              ]),
+              _: 1
+              /* STABLE */
+            }, 8, ["style"])
           ]),
           vue.createCommentVNode(" \u7B5B\u9009\u56FE\u6807\u548C\u5F39\u7A97 "),
           !_ctx.disableFilter ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElPopover), {
@@ -354,8 +373,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 vue.createVNode(vue.unref(index$1.default), {
                   src: filterIconUrl.value,
                   size: 14,
+                  color: isActive.value ? "var(--el-color-primary)" : "currentColor",
                   class: vue.normalizeClass({ "yc-header-filter-cell__filter-icon--active": isActive.value })
-                }, null, 8, ["src", "class"])
+                }, null, 8, ["src", "color", "class"])
               ])
             ]),
             default: vue.withCtx(() => [