vome-core 0.3.65 → 0.3.66

package/dist/admin/crud/vm-export-btn.vue

@@ -1,183 +1,183 @@
-<template>
-  <button
-    v-if="visible"
-    type="button"
-    class="vm-crud-toolbar__btn is-ghost"
-    :disabled="disabled || submitting"
-    @click="onExport"
-  >
-    <i class="ri-download-2-line" />
-    {{ buttonText }}
-  </button>
-</template>
-
-<script setup lang="ts">
-import { computed, inject, ref } from 'vue'
-import { toast } from 'vue-sonner'
-import {
-  exportCrudExcel,
-  flattenExportRows,
-  pickExportColumns,
-} from '../lib/export-excel'
-import {
-  injectTableOptions,
-  TABLE_API_KEY,
-  type TableApi,
-} from './key'
-import { fetchExportRowsByPage } from './export-fetch'
-import { useCrud } from './useCrud'
-import { crudFormat, crudLabel, getCrudStyle } from './style'
-import { resolveMergedTableColumns } from './auto-fields'
-import type {
-  CrudColumn,
-  CrudPermission,
-} from '../../../typings/admin/comm/crud'
-
-defineOptions({ name: 'vm-export-btn' })
-
-const props = withDefaults(
-  defineProps<{
-    /** 列配置；默认取 Table.getColumns() 或 useTable columns */
-    columns?: CrudColumn[]
-    /** 自定义数据源；默认按当前筛选 POST page 自动翻页拉全量 */
-    data?:
-      | Record<string, unknown>[]
-      | ((params: Record<string, unknown>) => Promise<Record<string, unknown>[]>)
-    filename?: string | (() => string)
-    maxExportLimit?: number
-    disabled?: boolean
-    text?: string
-    /** 权限键，默认 page */
-    permission?: keyof CrudPermission
-  }>(),
-  {
-    filename: undefined,
-    maxExportLimit: 5000,
-    disabled: false,
-    permission: 'page',
-  },
-)
-
-const crud = useCrud()
-const tableOpts = injectTableOptions()
-const tableApi = inject(TABLE_API_KEY, null as TableApi | null)
-const submitting = ref(false)
-
-/** 导出长请求：不走默认 5s 超时 */
-const EXPORT_REQUEST_OPTS = { timeoutMs: 0 } as const
-
-const visible = computed(() => Boolean(crud.getPermission(props.permission)))
-
-const buttonText = computed(
-  () => props.text || crudLabel('export', crud.dict.label),
-)
-
-const exportColumns = computed(() => {
-  void crud.permission.value
-  if (props.columns?.length) return pickExportColumns(props.columns)
-  const fromTable = tableApi?.getColumns()
-  if (fromTable?.length) return pickExportColumns(fromTable)
-  // toolbar 与 table 是兄弟，inject 不到 Table API；须与表格同源合并 EPS + 手写列
-  return pickExportColumns(
-    resolveMergedTableColumns({
-      service: crud.service,
-      tableOpts,
-      tablePlugins: (getCrudStyle().table.plugins || []) as Array<{
-        __plugin?: string
-        ignoreFields?: string[]
-      }>,
-    }),
-  )
-})
-
-function resolveFilename() {
-  const raw = props.filename
-  const name = typeof raw === 'function' ? raw() : raw
-  return name || crudLabel('export')
-}
-
-async function fetchRowsByPage(): Promise<Record<string, unknown>[]> {
-  const svc = crud.service
-  if (!svc.page) {
-    return flattenExportRows(crud.list.value, tableOpts?.tree)
-  }
-
-  const pageKey = crud.dict.pagination.page
-  const sizeKey = crud.dict.pagination.size
-
-  return fetchExportRowsByPage({
-    buildQuery: (extra) => crud.buildListQuery(extra),
-    pageKey,
-    sizeKey,
-    page: (body, opts) => crud.requestPage(body, opts),
-    maxExportLimit: props.maxExportLimit,
-    totalHint: crud.pagination.value.total,
-    requestOpts: EXPORT_REQUEST_OPTS,
-  })
-}
-
-async function fetchRows(): Promise<Record<string, unknown>[]> {
-  if (props.data) {
-    if (typeof props.data === 'function') {
-      return props.data(crud.buildExportQuery())
-    }
-    return props.data
-  }
-
-  return fetchRowsByPage()
-}
-
-async function onExport() {
-  if (submitting.value || props.disabled) return
-  if (!exportColumns.value.length) {
-    toast.error(crudLabel('exportNoCols'))
-    return
-  }
-
-  submitting.value = true
-  try {
-    const rows = await fetchRows()
-    if (!rows.length) {
-      toast.warning(crudLabel('exportNoData'))
-      return
-    }
-    const flat = flattenExportRows(rows, tableOpts?.tree)
-    exportCrudExcel(exportColumns.value, flat, resolveFilename())
-    toast.success(crudFormat(crudLabel('exportSuccess'), flat.length))
-  } catch (e) {
-    toast.error(e instanceof Error ? e.message : crudLabel('exportFail'))
-  } finally {
-    submitting.value = false
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.vm-crud-toolbar__btn {
-  display: inline-flex;
-  height: 36px;
-  align-items: center;
-  gap: 4px;
-  padding: 0 14px;
-  border: none;
-  border-radius: 12px;
-  font-size: 13px;
-  font-weight: 600;
-  cursor: pointer;
-  transition: background 0.15s ease, color 0.15s ease, opacity 0.15s ease;
-
-  &:disabled {
-    cursor: not-allowed;
-    opacity: 0.45;
-  }
-
-  &.is-ghost {
-    background: var(--muted);
-    color: var(--foreground);
-
-    &:hover:not(:disabled) {
-      background: color-mix(in srgb, var(--muted) 70%, var(--foreground) 8%);
-    }
-  }
-}
-</style>
+<template>
+  <button
+    v-if="visible"
+    type="button"
+    class="vm-crud-toolbar__btn is-ghost"
+    :disabled="disabled || submitting"
+    @click="onExport"
+  >
+    <i class="ri-download-2-line" />
+    {{ buttonText }}
+  </button>
+</template>
+
+<script setup lang="ts">
+import { computed, inject, ref } from 'vue'
+import { toast } from 'vue-sonner'
+import {
+  exportCrudExcel,
+  flattenExportRows,
+  pickExportColumns,
+} from '../lib/export-excel'
+import {
+  injectTableOptions,
+  TABLE_API_KEY,
+  type TableApi,
+} from './key'
+import { fetchExportRowsByPage } from './export-fetch'
+import { useCrud } from './useCrud'
+import { crudFormat, crudLabel, getCrudStyle } from './style'
+import { resolveMergedTableColumns } from './auto-fields'
+import type {
+  CrudColumn,
+  CrudPermission,
+} from '../../../typings/admin/comm/crud'
+
+defineOptions({ name: 'vm-export-btn' })
+
+const props = withDefaults(
+  defineProps<{
+    /** 列配置；默认取 Table.getColumns() 或 useTable columns */
+    columns?: CrudColumn[]
+    /** 自定义数据源；默认按当前筛选 POST page 自动翻页拉全量 */
+    data?:
+      | Record<string, unknown>[]
+      | ((params: Record<string, unknown>) => Promise<Record<string, unknown>[]>)
+    filename?: string | (() => string)
+    maxExportLimit?: number
+    disabled?: boolean
+    text?: string
+    /** 权限键，默认 page */
+    permission?: keyof CrudPermission
+  }>(),
+  {
+    filename: undefined,
+    maxExportLimit: 5000,
+    disabled: false,
+    permission: 'page',
+  },
+)
+
+const crud = useCrud()
+const tableOpts = injectTableOptions()
+const tableApi = inject(TABLE_API_KEY, null as TableApi | null)
+const submitting = ref(false)
+
+/** 导出长请求：不走默认 5s 超时 */
+const EXPORT_REQUEST_OPTS = { timeoutMs: 0 } as const
+
+const visible = computed(() => Boolean(crud.getPermission(props.permission)))
+
+const buttonText = computed(
+  () => props.text || crudLabel('export', crud.dict.label),
+)
+
+const exportColumns = computed(() => {
+  void crud.permission.value
+  if (props.columns?.length) return pickExportColumns(props.columns)
+  const fromTable = tableApi?.getColumns()
+  if (fromTable?.length) return pickExportColumns(fromTable)
+  // toolbar 与 table 是兄弟，inject 不到 Table API；须与表格同源合并 EPS + 手写列
+  return pickExportColumns(
+    resolveMergedTableColumns({
+      service: crud.service,
+      tableOpts,
+      tablePlugins: (getCrudStyle().table.plugins || []) as Array<{
+        __plugin?: string
+        ignoreFields?: string[]
+      }>,
+    }),
+  )
+})
+
+function resolveFilename() {
+  const raw = props.filename
+  const name = typeof raw === 'function' ? raw() : raw
+  return name || crudLabel('export')
+}
+
+async function fetchRowsByPage(): Promise<Record<string, unknown>[]> {
+  const svc = crud.service
+  if (!svc.page) {
+    return flattenExportRows(crud.list.value, tableOpts?.tree)
+  }
+
+  const pageKey = crud.dict.pagination.page
+  const sizeKey = crud.dict.pagination.size
+
+  return fetchExportRowsByPage({
+    buildQuery: (extra) => crud.buildListQuery(extra),
+    pageKey,
+    sizeKey,
+    page: (body, opts) => crud.requestPage(body, opts),
+    maxExportLimit: props.maxExportLimit,
+    totalHint: crud.pagination.value.total,
+    requestOpts: EXPORT_REQUEST_OPTS,
+  })
+}
+
+async function fetchRows(): Promise<Record<string, unknown>[]> {
+  if (props.data) {
+    if (typeof props.data === 'function') {
+      return props.data(crud.buildExportQuery())
+    }
+    return props.data
+  }
+
+  return fetchRowsByPage()
+}
+
+async function onExport() {
+  if (submitting.value || props.disabled) return
+  if (!exportColumns.value.length) {
+    toast.error(crudLabel('exportNoCols'))
+    return
+  }
+
+  submitting.value = true
+  try {
+    const rows = await fetchRows()
+    if (!rows.length) {
+      toast.warning(crudLabel('exportNoData'))
+      return
+    }
+    const flat = flattenExportRows(rows, tableOpts?.tree)
+    exportCrudExcel(exportColumns.value, flat, resolveFilename())
+    toast.success(crudFormat(crudLabel('exportSuccess'), flat.length))
+  } catch (e) {
+    toast.error(e instanceof Error ? e.message : crudLabel('exportFail'))
+  } finally {
+    submitting.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.vm-crud-toolbar__btn {
+  display: inline-flex;
+  height: 36px;
+  align-items: center;
+  gap: 4px;
+  padding: 0 14px;
+  border: none;
+  border-radius: 12px;
+  font-size: 13px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: background 0.15s ease, color 0.15s ease, opacity 0.15s ease;
+
+  &:disabled {
+    cursor: not-allowed;
+    opacity: 0.45;
+  }
+
+  &.is-ghost {
+    background: var(--muted);
+    color: var(--foreground);
+
+    &:hover:not(:disabled) {
+      background: color-mix(in srgb, var(--muted) 70%, var(--foreground) 8%);
+    }
+  }
+}
+</style>

package/dist/admin/crud/vm-flex.vue

@@ -1,14 +1,14 @@
-<template>
-  <div class="vm-crud-flex" />
-</template>
-
-<script setup lang="ts">
-defineOptions({ name: 'vm-flex' })
-</script>
-
-<style lang="scss" scoped>
-.vm-crud-flex {
-  flex: 1;
-  min-width: 0;
-}
-</style>
+<template>
+  <div class="vm-crud-flex" />
+</template>
+
+<script setup lang="ts">
+defineOptions({ name: 'vm-flex' })
+</script>
+
+<style lang="scss" scoped>
+.vm-crud-flex {
+  flex: 1;
+  min-width: 0;
+}
+</style>

package/dist/admin/crud/vm-form.vue

@@ -51,7 +51,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, reactive } from 'vue'
+import { ref, computed, watch, reactive, toValue } from 'vue'
 import { resolveCrudComponent } from './registry'
 import { getCrudStyle } from './style'
 import { resolveFormSpan, useFormCols } from './span'
@@ -132,11 +132,22 @@ function resolveField(item: CrudFormItem) {
 }
 
 function fieldProps(item: CrudFormItem) {
+  const raw = toValue(item.component?.props)
+  // props: dict.get('status') → 直接作 options（与 vm-upsert 对齐，供独立 vm-form）
+  if (Array.isArray(raw)) {
+    return {
+      options: raw,
+      placeholder: item.placeholder,
+      refreshOnChange: false,
+    }
+  }
   return {
     options: resolveOptions(item.options),
     placeholder: item.placeholder,
     refreshOnChange: false,
-    ...(item.component?.props || {}),
+    ...(raw && typeof raw === 'object'
+      ? (raw as Record<string, unknown>)
+      : {}),
   }
 }
 
@@ -188,11 +199,6 @@ defineExpose({ form, focus, set, validate, clearValidate, fieldErrors })
 .vm-form__field {
   display: grid;
   gap: 6px;
-
-  &.is-error :deep(.vm-form__control),
-  &.is-error .vm-form__textarea {
-    border-color: var(--destructive, var(--danger, #c45b5e)) !important;
-  }
 }
 
 .vm-form.is-label-left .vm-form__field,
@@ -223,22 +229,34 @@ defineExpose({ form, focus, set, validate, clearValidate, fieldErrors })
   grid-column: 2;
 }
 
-.vm-form__control,
-.vm-form__textarea {
+/* Input 的 class 落在外壳 vm-input-wrap 上：外壳必须无边框/无内边距，边框只留内部 input */
+.vm-form__field :deep(.vm-input-wrap.vm-form__control) {
   width: 100%;
-  border: 1px solid var(--border);
-  border-radius: 12px;
+  height: auto !important;
+  min-height: var(--vm-control-height);
+  padding: 0 !important;
+  border: none !important;
+  border-radius: 0 !important;
+  background: transparent !important;
+  box-shadow: none !important;
+}
+
+.vm-form__field :deep(.vm-input-wrap.vm-form__control input) {
   background: var(--card);
-  font-size: 13px;
 }
 
-.vm-form__control {
-  height: var(--vm-control-height);
-  padding: 0 var(--vm-control-padding-x);
+.vm-form__field.is-error :deep(.vm-input-wrap.vm-form__control input),
+.vm-form__field.is-error .vm-form__textarea {
+  border-color: var(--destructive, var(--danger, #c45b5e)) !important;
 }
 
 .vm-form__textarea {
+  width: 100%;
   min-height: 72px;
   padding: 8px var(--vm-control-padding-x);
+  border: 1px solid var(--border);
+  border-radius: var(--vm-control-radius);
+  background: var(--card);
+  font-size: 13px;
 }
 </style>