v-nuxt-ui 0.1.35 → 0.1.36

package/dist/runtime/components/table/query/where/simple/item/opr/Select.vue

@@ -1,12 +1,12 @@
 <script setup>
-import { computed, useTemplateRef } from "vue";
-import ButtonDropdown from "#v/components/button/Dropdown.vue";
+import { computed, ref, useTemplateRef } from "vue";
 const props = defineProps({
   disabled: { type: Boolean, required: false },
-  items: { type: Array, required: true }
+  items: { type: Array, required: true },
+  placeholder: { type: String, required: false }
 });
 const whereQueryItem = defineModel("whereQueryItem", { type: Object, ...{ required: true } });
-const queryValue = computed({
+const inputMenuValue = computed({
   get() {
     return whereQueryItem.value.value;
   },
@@ -14,49 +14,49 @@ const queryValue = computed({
     whereQueryItem.value = { ...whereQueryItem.value, value: newValue };
   }
 });
-const groups = computed(() => [
-  {
-    id: "fields",
-    items: props.items,
-    ignoreFilter: true
+const searchTerm = ref("");
+const filteredItems = computed(() => {
+  if (!searchTerm.value) {
+    return props.items;
   }
-]);
-const ref = useTemplateRef("dropdownBtn");
+  return props.items.filter((item) => item?.label.toLowerCase().includes(searchTerm.value.toLowerCase()));
+});
+const inputMenuRef = useTemplateRef("inputMenu");
 defineExpose({
   focus: () => {
-    ref.value?.focus();
+    inputMenuRef.value?.inputRef.focus();
   }
 });
 </script>
 
 <template>
-  <ButtonDropdown
-    ref="dropdownBtn"
-    v-model="queryValue"
-    :groups="groups"
+  <UInputMenu
+    ref="inputMenu"
+    v-model:search-term="searchTerm"
+    v-model="inputMenuValue"
+    :items="filteredItems"
+    :placeholder="placeholder"
     multiple
-    enable-footer-toolbar
-  >
-    <UButton
-      size="sm"
-      color="neutral"
-      variant="outline"
-    >
-      <div v-if="!queryValue || queryValue.length === 0">
-        --
-      </div>
-      <div v-else-if="queryValue.length <= 2" class="flex items-center gap-1">
-        {{ queryValue.map((value2) => items.find((item) => item.value === value2)?.label || value2).join(", ") }}
-      </div>
-      <div v-else>
-        <!-- 打印前两项，后面+1代替 -->
-        <div class="flex items-center gap-1">
-          <div v-for="value in queryValue.slice(0, 2)" :key="value">
-            {{ items.find((item) => item.value === value)?.label || value }}
-          </div>
-          <span>+{{ queryValue.length - 2 }}</span>
-        </div>
-      </div>
-    </UButton>
-  </ButtonDropdown>
+    color="neutral"
+    delete-icon="i-lucide-trash"
+    value-key="value"
+    clear
+    clear-icon="i-lucide-circle-x"
+    icon=""
+    :disabled="disabled"
+    open-on-focus
+    trailing
+    :ui="{
+  root: 'rounded-none min-w-32',
+  // TODO: 不然有rounded，这个应该是个bug
+  content: 'min-w-fit',
+  tagsInput: 'min-w-4 w-0'
+}"
+    :content="{
+  align: 'start'
+}"
+    @update:model-value="() => {
+  inputMenuRef?.inputRef.focus();
+}"
+  />
 </template>

package/dist/runtime/components/table/query/where/simple/item/opr/Select.vue.d.ts

@@ -1,8 +1,10 @@
-import type { SelectOption, WhereQueryItem } from '#v/types';
+import type { WhereQueryItem } from '#v/types';
+import type { InputMenuItem, InputMenuProps } from '@nuxt/ui';
 declare const __VLS_export: <T>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: import("vue").PublicProps & __VLS_PrettifyLocal<({
         disabled?: boolean;
-        items: SelectOption[];
+        items: InputMenuItem[];
+        placeholder?: InputMenuProps["placeholder"];
     } & {
         whereQueryItem: WhereQueryItem<T>;
     }) & {

package/dist/runtime/components/table/query/where/simple/item/opr/index.vue

@@ -48,6 +48,7 @@ defineExpose({
     v-model:where-query-item="whereQueryItem"
     :disabled="fetching"
     :items="option.items || []"
+    :placeholder="option.placeholder"
   />
   <TableQueryWhereSimpleItemOprDatePicker
     v-else-if="option.type === 'date-picker'"
@@ -68,5 +69,6 @@ defineExpose({
     :label-field="option.labelField"
     :value-field="option.valueField"
     :multiple="option.multiple"
+    :placeholder="option.placeholder"
   />
 </template>

package/dist/runtime/components/table/settings/TableSettings.d.vue.ts

@@ -1,3 +1,3 @@
+declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;
-declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/components/table/settings/TableSettings.vue

@@ -2,9 +2,6 @@
 import { useTableColumnPermission } from "#v/composables/table/useTableColumnPermission";
 import UserTableColumnModal from "./UserTableColumnModal.vue";
 import { ref, h, onMounted } from "vue";
-</script>
-
-<script>
 const { tables, fetchTables, fetchMergedColumns, saveUserColumns } = useTableColumnPermission();
 const selectedTable = ref(null);
 const mergedColumns = ref([]);

package/dist/runtime/components/table/settings/TableSettings.vue.d.ts

@@ -1,3 +1,3 @@
+declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;
-declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/composables/api/sys/useRoleApi.js

@@ -7,6 +7,7 @@ export const useRoleApi = createSharedComposable(() => ({
   prune: (model) => {
     const cloned = cloneJson(model);
     cloned.menus = useBizModel().extractIds(cloned.menus);
+    cloned.tablePermissions = useBizModel().extractIds(cloned.tablePermissions);
     return cloned;
   },
   copy: (model) => ({
@@ -15,6 +16,7 @@ export const useRoleApi = createSharedComposable(() => ({
     permission: model.permission,
     disabled: model.disabled,
     remark: model.remark,
-    menus: model.menus
+    menus: model.menus,
+    tablePermissions: model.tablePermissions
   })
 }));

package/dist/runtime/composables/api/sys/useUserApi.js

@@ -13,6 +13,7 @@ export const useUserApi = createSharedComposable(() => ({
     const bizModel = useBizModel();
     cloned.roles = bizModel.extractIds(cloned.roles);
     cloned.menus = bizModel.extractIds(cloned.menus);
+    cloned.tablePermissions = bizModel.extractIds(cloned.tablePermissions);
     return cloned;
   },
   copy: (model) => ({
@@ -28,7 +29,8 @@ export const useUserApi = createSharedComposable(() => ({
     entryDate: model.entryDate,
     resignDate: model.resignDate,
     gender: model.gender,
-    loginType: model.loginType
+    loginType: model.loginType,
+    tablePermissions: model.tablePermissions
   }),
   changePwd: (payload, customOptions = {}) => {
     return usePutFetch(`/users/pwd/change`, payload, customOptions);

package/dist/runtime/composables/useDate.js

@@ -39,7 +39,7 @@ const _useDate = () => {
         return `${date.year()}-W${weekNumber}`;
       }
       case "day":
-        return date.format("YYYY/MM/DD");
+        return date.format("YYYY-MM-DD");
       default:
         throw new Error(`Unsupported time unit: ${unit}`);
     }
@@ -53,8 +53,8 @@ const _useDate = () => {
     };
   };
   const getlastWeekDateRange = () => {
-    const end = dayjs().subtract(1, "week").endOf("week");
-    const start = end.subtract(6, "day").startOf("day");
+    const end = dayjs().endOf("week").subtract(1, "week");
+    const start = end.startOf("week");
     return {
       start: dayjsToDateValue(start),
       end: dayjsToDateValue(end)
@@ -66,7 +66,7 @@ const _useDate = () => {
   };
   const getCurrentWeekDateRange = () => {
     const end = dayjs().endOf("week");
-    const start = end.subtract(6, "day").startOf("day");
+    const start = end.startOf("week");
     return {
       start: dayjsToDateValue(start),
       end: dayjsToDateValue(end)
@@ -78,7 +78,7 @@ const _useDate = () => {
   };
   const getLastMonthDateRange = () => {
     const end = dayjs().subtract(1, "month").endOf("month");
-    const start = end.subtract(1, "month").startOf("month");
+    const start = end.startOf("month");
     return {
       start: dayjsToDateValue(start),
       end: dayjsToDateValue(end)
@@ -90,7 +90,7 @@ const _useDate = () => {
   };
   const getCurrentMonthDateRange = () => {
     const end = dayjs().endOf("month");
-    const start = end.subtract(1, "month").startOf("month");
+    const start = end.startOf("month");
     return {
       start: dayjsToDateValue(start),
       end: dayjsToDateValue(end)
@@ -102,7 +102,7 @@ const _useDate = () => {
   };
   const getlastYearDateRange = () => {
     const end = dayjs().subtract(1, "year").endOf("year");
-    const start = end.subtract(1, "year").startOf("year");
+    const start = end.startOf("year");
     return {
       start: dayjsToDateValue(start),
       end: dayjsToDateValue(end)
@@ -114,7 +114,7 @@ const _useDate = () => {
   };
   const getCurrentYearDateRange = () => {
     const end = dayjs().endOf("year");
-    const start = end.subtract(1, "year").startOf("year");
+    const start = end.startOf("year");
     return {
       start: dayjsToDateValue(start),
       end: dayjsToDateValue(end)

package/dist/runtime/constants/index.d.ts

@@ -5,3 +5,4 @@ export * from './time.js';
 export * from './menu.js';
 export * from './user.js';
 export * from './calendar.js';
+export * from './table.js';

package/dist/runtime/constants/index.js

@@ -5,3 +5,4 @@ export * from "./time.js";
 export * from "./menu.js";
 export * from "./user.js";
 export * from "./calendar.js";
+export * from "./table.js";

package/dist/runtime/constants/options.js

@@ -9,7 +9,6 @@ export var Gender = /* @__PURE__ */ ((Gender2) => {
   return Gender2;
 })(Gender || {});
 export const genderOptions = [
-  { label: "Male", value: 1 /* MALE */ },
-  { label: "Female", value: 2 /* FEMALE */ },
-  { label: "Unknown", value: 0 /* UNKNOWN */ }
+  { label: "\u7537", value: 1 /* MALE */ },
+  { label: "\u5973", value: 2 /* FEMALE */ }
 ];

package/dist/runtime/constants/table.d.ts

@@ -0,0 +1,2 @@
+import type { WhereQueryColumnOption } from '#v/types';
+export declare const tableWhereQueryItemIconMap: Map<WhereQueryColumnOption<any>['type'], string>;

package/dist/runtime/constants/table.js

@@ -0,0 +1,8 @@
+export const tableWhereQueryItemIconMap = /* @__PURE__ */ new Map([
+  ["async-select", "i-lucide-list-check"],
+  ["date-picker", "i-lucide-calendar-cog"],
+  ["input", "i-lucide-text-cursor-input"],
+  ["input-number", "i-lucide-text-cursor-input"],
+  ["select", "i-lucide-list-check"],
+  ["unknown", "i-lucide-circle-question-mark"]
+]);

package/dist/runtime/types/components/table/column.d.ts

@@ -1,6 +1,6 @@
 import type { OrderQueryOpr, WhereQueryOpr, QueryTemplate, WhereQueryItem } from '../../query.js';
 import type { PageResult, RequestResult } from '../../request.js';
-import type { TableColumn, BadgeProps, SelectProps } from '@nuxt/ui';
+import type { TableColumn, BadgeProps, InputMenuProps } from '@nuxt/ui';
 import type { SelectOption } from '../../index.js';
 import type { Ref } from 'vue';
 export type WhereQueryType = 'input' | 'input-number' | 'date-picker' | 'select' | 'async-select' | 'unknown';
@@ -23,8 +23,8 @@ export type WhereQueryColumnAsyncSelectProps<T> = {
     enableEmptyOption?: boolean;
     disableOprSelector?: boolean;
     multiple?: boolean;
-    placeholder?: string;
-    size?: SelectProps['size'];
+    placeholder?: InputMenuProps['placeholder'];
+    size?: InputMenuProps['size'];
 };
 export type WhereQueryColumnOption<T> = {
     defaultOpr?: WhereQueryOpr;
@@ -43,6 +43,7 @@ export type WhereQueryColumnOption<T> = {
     variant?: BadgeProps['variant'];
     items: SelectOption[];
     empty?: BadgeProps;
+    placeholder?: InputMenuProps['placeholder'];
 } | {
     type: 'async-select';
 } & WhereQueryColumnAsyncSelectProps<T> | {

package/dist/runtime/types/components/table/query/where.d.ts

@@ -1,4 +1,4 @@
-import type { VColumn, WhereQuery, WhereQueryColumnOption, WhereQueryItem, WhereQueryItemGroup } from '../../../index.js';
+import type { VColumn, WhereQuery, WhereQueryColumnOption, WhereQueryItemGroup } from '../../../index.js';
 export type WhereQueryOption<T> = {
     field: string & keyof T | string;
     label: string;
@@ -16,10 +16,6 @@ export type WhereQueryProps<T> = {
     bizColumns?: VColumn<T>[];
     hideQueryButton?: boolean;
 };
-export type WhereSimpleQueryProps<T> = {
-    items?: WhereQueryItem<T>[];
-    onUpdateItems: (items: WhereQueryItem<T>[] | undefined) => void;
-} & Pick<WhereQueryProps<T>, 'whereOptions' | 'fetching' | 'triggerFetching' | 'bizColumns'>;
 export type WhereAdvancedQueryProps<T> = {
     group?: WhereQueryItemGroup<T>;
     onUpdateGroup?: (items: WhereQueryItemGroup<T>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "v-nuxt-ui",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "description": "Veken UI Component Library - Reusable Nuxt UI components, composables, and utilities for enterprise applications",
   "type": "module",
   "style": "./dist/runtime/index.css",

package/dist/runtime/components/table/query/where/simple/index.d.vue.ts

@@ -1,21 +0,0 @@
-import type { WhereSimpleQueryProps } from '#v/types';
-declare const __VLS_export: <T>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: import("vue").PublicProps & __VLS_PrettifyLocal<WhereSimpleQueryProps<T>> & (typeof globalThis extends {
-        __VLS_PROPS_FALLBACK: infer P;
-    } ? P : {});
-    expose: (exposed: import("vue").ShallowUnwrapRef<{
-        focusItem: (field: string) => boolean;
-    }>) => void;
-    attrs: any;
-    slots: {};
-    emit: {};
-}>) => import("vue").VNode & {
-    __ctx?: Awaited<typeof __VLS_setup>;
-};
-declare const _default: typeof __VLS_export;
-export default _default;
-type __VLS_PrettifyLocal<T> = (T extends any ? {
-    [K in keyof T]: T[K];
-} : {
-    [K in keyof T as K]: T[K];
-}) & {};

package/dist/runtime/components/table/query/where/simple/index.vue

@@ -1,52 +0,0 @@
-<script setup>
-import { ref } from "vue";
-import TableQueryWhereSimpleItem from "#v/components/table/query/where/simple/item/index.vue";
-const props = defineProps({
-  items: { type: Array, required: false },
-  onUpdateItems: { type: Function, required: true },
-  whereOptions: { type: Array, required: true },
-  fetching: { type: Boolean, required: false },
-  triggerFetching: { type: Function, required: true },
-  bizColumns: { type: Array, required: false }
-});
-const onRemoveFilter = (field) => {
-  props.onUpdateItems(props.items?.filter((query) => query.field !== field) ?? []);
-};
-const itemRefMap = ref(/* @__PURE__ */ new Map());
-function setItemRef(field, el) {
-  if (el && "focus" in el && typeof el.focus === "function") {
-    itemRefMap.value.set(field, el);
-  }
-}
-defineExpose({
-  focusItem: (field) => {
-    const item = itemRefMap.value.get(field);
-    if (item) {
-      item.focus();
-      return true;
-    }
-    return false;
-  }
-});
-</script>
-
-<template>
-  <div class="flex flex-wrap gap-2.5">
-    <!-- key如果是field，那么field修改后，不能聚焦后面的组件，所以这里的key用idx代替 -->
-    <TableQueryWhereSimpleItem
-      v-for="(item, idx) in items"
-      :ref="(el) => setItemRef(item.field, el)"
-      :key="idx"
-      :where-query-item="item"
-      :options="whereOptions"
-      :fetching="fetching"
-      :trigger-fetching="() => triggerFetching(true)"
-      @remove="onRemoveFilter"
-      @update:where-query-item="(newWhereQueryItem) => {
-  const updatedItems = [...props.items ?? []];
-  updatedItems[idx] = newWhereQueryItem;
-  props.onUpdateItems(updatedItems);
-}"
-    />
-  </div>
-</template>

package/dist/runtime/components/table/query/where/simple/index.vue.d.ts

@@ -1,21 +0,0 @@
-import type { WhereSimpleQueryProps } from '#v/types';
-declare const __VLS_export: <T>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: import("vue").PublicProps & __VLS_PrettifyLocal<WhereSimpleQueryProps<T>> & (typeof globalThis extends {
-        __VLS_PROPS_FALLBACK: infer P;
-    } ? P : {});
-    expose: (exposed: import("vue").ShallowUnwrapRef<{
-        focusItem: (field: string) => boolean;
-    }>) => void;
-    attrs: any;
-    slots: {};
-    emit: {};
-}>) => import("vue").VNode & {
-    __ctx?: Awaited<typeof __VLS_setup>;
-};
-declare const _default: typeof __VLS_export;
-export default _default;
-type __VLS_PrettifyLocal<T> = (T extends any ? {
-    [K in keyof T]: T[K];
-} : {
-    [K in keyof T as K]: T[K];
-}) & {};