vome-core 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vome-core",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Vome framework — shared + Bun/Elysia server + Vue admin",
   "license": "MIT",
   "type": "module",
@@ -48,7 +48,9 @@
     "vue-sonner": ">=2.0.0",
     "@vueuse/core": ">=10.0.0",
     "clsx": ">=2.0.0",
-    "tailwind-merge": ">=2.0.0"
+    "tailwind-merge": ">=2.0.0",
+    "dompurify": ">=3.0.0",
+    "marked": ">=9.0.0"
   },
   "peerDependenciesMeta": {
     "drizzle-orm": {
@@ -77,6 +79,12 @@
     },
     "tailwind-merge": {
       "optional": true
+    },
+    "dompurify": {
+      "optional": true
+    },
+    "marked": {
+      "optional": true
     }
   },
   "devDependencies": {

package/src/admin/components/vm-auto-perm-dialog.vue

@@ -71,6 +71,9 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch } from 'vue'
+import { api } from '../api/client'
+import { toast } from 'vue-sonner'
 import { isDialogFloatTarget } from '../lib/dialog-float'
 
 defineOptions({ name: 'vm-auto-perm-dialog' })

package/src/admin/components/vm-check-tree.vue

@@ -42,6 +42,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch } from 'vue'
 import type { CheckTreeNode } from '../../../typings/admin/comm/check-tree'
 
 defineOptions({ name: 'vm-check-tree' })

package/src/admin/components/vm-dept-tree.vue

@@ -101,6 +101,9 @@
 </template>
 
 <script setup lang="ts">
+import { useVome } from '../hooks/useVome'
+import { ref, computed, watch, onMounted } from 'vue'
+import { toast } from 'vue-sonner'
 import { deepTree } from '../crud'
 import { vmConfirm } from '../crud/confirm'
 

package/src/admin/components/vm-empty.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { computed } from 'vue'
 defineOptions({ name: 'vm-empty' })
 
 const scarceModules = import.meta.glob('../static/scarce/*.svg', {

package/src/admin/components/vm-eps-perm-picker.vue

@@ -19,6 +19,8 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch, onMounted } from 'vue'
+import { api } from '../api/client'
 import type { EpsSide } from '../lib/eps'
 
 defineOptions({ name: 'vm-eps-perm-picker' })

package/src/admin/components/vm-group-cascader.vue

@@ -90,6 +90,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch, nextTick, onMounted, onUnmounted } from 'vue'
 defineOptions({ name: 'vm-group-cascader' })
 
 const props = withDefaults(

package/src/admin/components/vm-icon-picker.vue

@@ -107,6 +107,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch, nextTick, onMounted, onUnmounted } from 'vue'
 import { FocusScope } from 'reka-ui'
 import allIcons from '../data/remixicon-all.json'
 

package/src/admin/components/vm-markdown.vue

@@ -3,6 +3,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import DOMPurify from 'dompurify'
 import { marked } from 'marked'
 

package/src/admin/components/vm-ri-icon.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { computed } from 'vue'
+import { cn } from '../lib/cn'
 defineOptions({ name: 'vm-ri-icon' })
 
 const props = withDefaults(

package/src/admin/components/vm-role-picker.vue

@@ -48,6 +48,8 @@
 </template>
 
 <script setup lang="ts">
+import { useVome } from '../hooks/useVome'
+import { ref, computed, watch, nextTick, onMounted, onUnmounted } from 'vue'
 defineOptions({ name: 'vm-role-picker' })
 
 const props = withDefaults(

package/src/admin/components/vm-view-path-picker.vue

@@ -11,6 +11,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, onMounted, onUnmounted } from 'vue'
 import {
   listViewsTree,
   VIEWS_RESCAN_EVENT,

package/src/admin/crud/components/vm-column-custom.vue

@@ -40,6 +40,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, watch, inject } from 'vue'
 import { injectTableOptions, TABLE_API_KEY } from '../key'
 defineOptions({ name: 'vm-column-custom' })
 

package/src/admin/crud/components/vm-context-menu.vue

@@ -21,6 +21,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, onMounted, onUnmounted } from 'vue'
 defineOptions({ name: 'vm-context-menu' })
 
 const props = defineProps<{

package/src/admin/crud/components/vm-date-picker.vue

@@ -10,6 +10,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import { useCrud } from '../useCrud'
 
 defineOptions({ name: 'vm-date-picker' })

package/src/admin/crud/components/vm-date-range.vue

@@ -45,6 +45,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed } from 'vue'
 defineOptions({ name: 'vm-date-range' })
 
 const props = withDefaults(

package/src/admin/crud/components/vm-date-text.vue

@@ -3,6 +3,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 defineOptions({ name: 'vm-date-text' })
 
 const props = withDefaults(

package/src/admin/crud/components/vm-dict-tag.vue

@@ -4,6 +4,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import { getCrudStyle } from '../style'
 
 defineOptions({ name: 'vm-dict-tag' })

package/src/admin/crud/components/vm-file-icon.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { computed, onMounted } from 'vue'
 import { extname } from '../../lib/upload'
 
 defineOptions({ name: 'vm-file-icon' })

package/src/admin/crud/components/vm-multi-select.vue

@@ -30,6 +30,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
 defineOptions({ name: 'vm-multi-select' })
 
 const props = withDefaults(

package/src/admin/crud/components/vm-select.vue

@@ -24,6 +24,8 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch } from 'vue'
+import { api } from '../../api/client'
 import { useCrud } from '../useCrud'
 
 defineOptions({ name: 'vm-select' })

package/src/admin/crud/components/vm-switch.vue

@@ -13,6 +13,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch } from 'vue'
 import { toast } from 'vue-sonner'
 import { vmConfirm } from '../confirm'
 import { useCrud } from '../useCrud'

package/src/admin/crud/components/vm-tree-select.vue

@@ -53,6 +53,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch, nextTick, onMounted, onUnmounted } from 'vue'
 type FlatRow = {
   key: string
   label: string

package/src/admin/crud/components/vm-upload-item.vue

@@ -61,6 +61,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch } from 'vue'
 import { extname, getUploadRule } from '../../lib/upload'
 import type { UploadItem } from '../../../../typings/admin/comm/upload'
 

package/src/admin/crud/components/vm-upload.vue

@@ -73,6 +73,8 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch } from 'vue'
+import { toast } from 'vue-sonner'
 import { useUpload } from '../../hooks/useUpload'
 import { getFileType, getUrls, uploadUid } from '../../lib/upload'
 import type { UploadItem } from '../../../../typings/admin/comm/upload'

package/src/admin/crud/components/vm-user-select.vue

@@ -48,6 +48,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch } from 'vue'
 import { service } from '../../service'
 
 defineOptions({ name: 'vm-user-select' })

package/src/admin/crud/vm-add-btn.vue

@@ -11,6 +11,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import { useCrud } from './useCrud'
 
 defineOptions({ name: 'vm-add-btn' })

package/src/admin/crud/vm-adv-search.vue

@@ -19,6 +19,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref } from 'vue'
 import { useCrud } from './useCrud'
 defineOptions({ name: 'vm-adv-search' })
 

package/src/admin/crud/vm-crud.vue

@@ -5,6 +5,8 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch, shallowRef, provide } from 'vue'
+import { service } from '../service/index'
 import { toast } from 'vue-sonner'
 import { resolveService } from '../service'
 import { deepTree } from '../lib/tree'

package/src/admin/crud/vm-dialog.vue

@@ -44,6 +44,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed, getCurrentInstance, useSlots } from 'vue'
 import { isDialogFloatTarget } from '../lib/dialog-float'
 
 defineOptions({ name: 'vm-dialog' })

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

@@ -48,6 +48,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch, reactive } from 'vue'
 import { resolveCrudComponent } from './registry'
 import { getCrudStyle } from './style'
 import { resolveFormSpan, useFormCols } from './span'

package/src/admin/crud/vm-pagination.vue

@@ -40,6 +40,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import { useCrud } from './useCrud'
 
 defineOptions({ name: 'vm-pagination' })

package/src/admin/crud/vm-search-key.vue

@@ -14,6 +14,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref } from 'vue'
 import { useCrud } from './useCrud'
 
 defineOptions({ name: 'vm-search-key' })

package/src/admin/crud/vm-search.vue

@@ -48,6 +48,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch, reactive, onMounted } from 'vue'
 import { onBeforeUnmount } from 'vue'
 import { useCrud } from './useCrud'
 import { injectSearchOptions } from './key'

package/src/admin/crud/vm-table.vue

@@ -224,6 +224,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch, onMounted, onBeforeUnmount, provide, useSlots } from 'vue'
 import { useCrud } from './useCrud'
 import { injectTableOptions, TABLE_API_KEY } from './key'
 import { flattenTree } from '../lib/tree'

package/src/admin/crud/vm-toolbar.vue

@@ -55,6 +55,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import { useCrud } from './useCrud'
 defineOptions({ name: 'vm-toolbar' })
 

package/src/admin/crud/vm-upsert.vue

@@ -113,6 +113,8 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, watch, useSlots } from 'vue'
+import { toast } from 'vue-sonner'
 import { useCrud } from './useCrud'
 import { injectUpsertOptions } from './key'
 import { getCrudStyle } from './style'

package/src/admin/lib/eps.ts

@@ -12,10 +12,11 @@ const cache: Record<EpsSide, EpsModuleMap | null> = {
   app: null,
 }
 
-/** 拉取 EPS（默认 admin） */
+/** 拉取 EPS（默认 admin）；公开接口失败不弹 toast */
 export async function loadEps(force = false, side: EpsSide = 'admin') {
   if (cache[side] && !force) return cache[side]
-  cache[side] = (await request<EpsModuleMap>(EPS_URL[side])) || {}
+  cache[side] =
+    (await request<EpsModuleMap>(EPS_URL[side], { toast: false })) || {}
   return cache[side]
 }
 

package/src/admin/service/index.ts

@@ -1,7 +1,57 @@
 import { loadEps } from '../lib/eps'
 import { BaseService } from './base'
+
 const SIDE_ID = 'admin'
 
+/** 标准 CRUD 之外的常用接口（EPS 未就绪时也可用） */
+const FALLBACK_EXTRA_APIS: Record<
+  string,
+  Array<{ method: string; path: string; perms?: string[] }>
+> = {
+  '/admin/base/department': [{ method: 'get', path: '/tree' }],
+  '/admin/base/menu': [{ method: 'get', path: '/tree' }],
+  '/admin/base/role': [
+    { method: 'get', path: '/menus' },
+    { method: 'post', path: '/setMenus' },
+    { method: 'get', path: '/departments' },
+    { method: 'post', path: '/setDepartments' },
+  ],
+  '/admin/base/user': [
+    { method: 'get', path: '/roles' },
+    { method: 'get', path: '/roleMap' },
+    { method: 'post', path: '/setRoles' },
+    { method: 'post', path: '/transferSuper' },
+    { method: 'post', path: '/moveDepartment' },
+  ],
+  '/admin/base/task': [
+    { method: 'post', path: '/start' },
+    { method: 'post', path: '/stop' },
+    { method: 'post', path: '/once' },
+    { method: 'get', path: '/log' },
+  ],
+  '/admin/base/log': [
+    { method: 'post', path: '/clear' },
+    { method: 'post', path: '/setKeep' },
+    { method: 'post', path: '/getKeep' },
+  ],
+  '/admin/base/dict/info': [
+    { method: 'get', path: '/types' },
+    { method: 'post', path: '/data' },
+    { method: 'post', path: '/get' },
+    { method: 'post', path: '/find' },
+    { method: 'post', path: '/getValues' },
+    { method: 'post', path: '/pathValue' },
+    { method: 'post', path: '/childValue' },
+  ],
+  '/admin/base/module': [{ method: 'post', path: '/install' }],
+  '/admin/base/comm': [{ method: 'post', path: '/upload' }],
+  '/admin/user/info': [
+    { method: 'get', path: '/roles' },
+    { method: 'get', path: '/roleMap' },
+    { method: 'post', path: '/setRoles' },
+  ],
+}
+
 /** EPS 不可用时仍保证业务页链式可调 */
 const FALLBACK_PREFIXES = [
   '/admin/base/menu',
@@ -11,8 +61,13 @@ const FALLBACK_PREFIXES = [
   '/admin/base/tenant',
   '/admin/base/task',
   '/admin/base/log',
-  '/admin/base/plugin-info',
-  '/admin/user/user-role',
+  '/admin/base/plugin',
+  '/admin/base/dict/info',
+  '/admin/base/dict/type',
+  '/admin/base/module',
+  '/admin/base/comm',
+  '/admin/user/info',
+  '/admin/user/role',
 ]
 
 function toCamel(str: string) {
@@ -30,7 +85,6 @@ function isValidName(name: string) {
 /** 无 EPS perms 时生成权限码 */
 function resolvePermCode(prefix: string, action: string) {
   const parts = prefix.replace(/^\//, '').split('/').filter(Boolean)
-  // admin / module / resource...
   const module = parts[1] || parts[0] || 'base'
   let resource = parts.slice(2).join(':')
   if (resource === module) {
@@ -51,14 +105,7 @@ function getMethodKeys(leaf: Record<string, unknown>) {
   )
 }
 
-function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
-  const base = new BaseService(namespace)
-  const leaf = base as unknown as ServiceLeaf
-  leaf.namespace = namespace.replace(/^\//, '')
-  leaf.permission = {}
-  leaf._permission = {}
-
-  // 挂到实例自身，避免业务侧 `...leaf` 丢失原型方法
+function bindCrud(leaf: ServiceLeaf, base: BaseService) {
   const proto = BaseService.prototype as unknown as Record<string, unknown>
   for (const name of [
     'request',
@@ -72,15 +119,31 @@ function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
   ]) {
     const fn = proto[name]
     if (typeof fn === 'function') {
-      ;(leaf as Record<string, unknown>)[name] = (fn as (...a: unknown[]) => unknown).bind(base)
+      ;(leaf as Record<string, unknown>)[name] = (
+        fn as (...a: unknown[]) => unknown
+      ).bind(base)
     }
   }
+}
 
+function bindApis(leaf: ServiceLeaf, base: BaseService, apis: EpsApiItem[]) {
+  leaf.permission ||= {}
   for (const api of apis) {
     const name = methodName(api.path)
     if (!isValidName(name) || /[-:]/g.test(name)) continue
     const method = (api.method || 'get').toLowerCase()
-    leaf[name] = function (this: BaseService, data?: unknown) {
+    // 已有同名方法则保留（避免 fallback 覆盖 EPS 绑定）
+    if (typeof (leaf as Record<string, unknown>)[name] === 'function') {
+      if (!leaf.permission[name]) {
+        leaf.permission[name] =
+          api.perms?.[0] || resolvePermCode(`/${leaf.namespace}`, name)
+      }
+      continue
+    }
+    ;(leaf as Record<string, unknown>)[name] = function (
+      this: BaseService,
+      data?: unknown,
+    ) {
       return this.request({
         url: api.path.startsWith('/') ? api.path : `/${api.path}`,
         method,
@@ -90,8 +153,18 @@ function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
     leaf.permission[name] =
       api.perms?.[0] || resolvePermCode(`/${leaf.namespace}`, name)
   }
+}
+
+function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
+  const base = new BaseService(namespace)
+  const leaf = base as unknown as ServiceLeaf
+  leaf.namespace = namespace.replace(/^\//, '')
+  leaf.permission = {}
+  leaf._permission = {}
+
+  bindCrud(leaf, base)
+  bindApis(leaf, base, apis)
 
-  // 标准 CRUD 权限兜底（EPS 未列时仍有码）
   for (const name of getMethodKeys(leaf as unknown as Record<string, unknown>)) {
     if (!leaf.permission[name]) {
       leaf.permission[name] = resolvePermCode(`/${leaf.namespace}`, name)
@@ -101,7 +174,28 @@ function createLeaf(namespace: string, apis: EpsApiItem[] = []): ServiceLeaf {
   return leaf
 }
 
-function attachLeaf(tree: ServiceTree | Eps.Service, prefix: string, apis: EpsApiItem[] = []) {
+/** 合并到已有叶子：补方法，不抹掉已有自定义 API */
+function mergeLeaf(existing: ServiceLeaf, namespace: string, apis: EpsApiItem[]) {
+  const base = new BaseService(namespace)
+  // 确保 CRUD 在实例上（兼容旧 fallback）
+  bindCrud(existing, base)
+  bindApis(existing, base, apis)
+  existing.namespace = namespace.replace(/^\//, '')
+  existing.permission ||= {}
+  existing._permission ||= {}
+  for (const name of getMethodKeys(existing as unknown as Record<string, unknown>)) {
+    if (!existing.permission[name]) {
+      existing.permission[name] = resolvePermCode(`/${existing.namespace}`, name)
+    }
+  }
+  return existing
+}
+
+function attachLeaf(
+  tree: ServiceTree | Eps.Service,
+  prefix: string,
+  apis: EpsApiItem[] = [],
+) {
   const raw = prefix.replace(/^\//, '')
   const arr = raw
     .replace(new RegExp(`^${SIDE_ID}/?`), '')
@@ -122,10 +216,7 @@ function attachLeaf(tree: ServiceTree | Eps.Service, prefix: string, apis: EpsAp
     }
     const existing = node[key] as ServiceLeaf | undefined
     if (existing?.namespace) {
-      // 已有叶子：补方法
-      const next = createLeaf(raw, apis)
-      Object.assign(existing, next)
-      return existing
+      return mergeLeaf(existing, raw, apis)
     }
     const leaf = createLeaf(raw, apis)
     node[key] = leaf
@@ -156,39 +247,41 @@ function buildFromEps(map: EpsModuleMap) {
 
 function buildFallback() {
   for (const prefix of FALLBACK_PREFIXES) {
-    const path = prefix.replace(/^\//, '')
-    const arr = path
-      .replace(new RegExp(`^${SIDE_ID}/?`), '')
-      .split('/')
-      .filter(Boolean)
-      .map(toCamel)
-    let node: Record<string, unknown> = service as unknown as Record<string, unknown>
-    let exists = true
-    for (let i = 0; i < arr.length; i++) {
-      const key = arr[i]!
-      if (!node[key]) {
-        exists = false
-        break
-      }
-      node = node[key] as Record<string, unknown>
-    }
-    if (!exists || !(node as ServiceLeaf).namespace) {
-      attachLeaf(service, prefix)
-    }
+    const extra = FALLBACK_EXTRA_APIS[prefix] || []
+    const apis = extra.map(
+      (a) =>
+        ({
+          method: a.method,
+          path: a.path,
+          perms: a.perms,
+        }) as EpsApiItem,
+    )
+    attachLeaf(service, prefix, apis)
   }
 }
 
-const root = new BaseService()
+type ServiceRoot = Eps.Service & { request: BaseService['request'] }
+
+/**
+ * 全局单例：npm 包经多路径解析时避免出现两份 service（一份有 tree、一份没有）。
+ */
+const g = globalThis as typeof globalThis & { __vome_admin_service__?: ServiceRoot }
+
+function createServiceRoot(): ServiceRoot {
+  const root = new BaseService()
+  return {
+    request: root.request.bind(root),
+  } as ServiceRoot
+}
 
 /** 全局链式 service（service.base.user.page()） */
-export const service = {
-  request: root.request.bind(root),
-} as unknown as Eps.Service
+export const service: ServiceRoot =
+  g.__vome_admin_service__ ?? (g.__vome_admin_service__ = createServiceRoot())
 
-// 同步兜底，保证页面 import 时即可 service.base.xxx
+// 同步兜底（含 tree / menus 等），页面 import 时即可调用
 buildFallback()
 
-/** 从 EPS 构建/刷新 service 树；失败时用兜底 prefix */
+/** 从 EPS 构建/刷新 service 树；失败时用兜底 prefix + 自定义 API */
 export async function createEps(force = false) {
   try {
     const map = (await loadEps(force)) || {}
@@ -200,7 +293,6 @@ export async function createEps(force = false) {
   return service
 }
 
-// Vite 保存源码 / 刷新时：插件重拉 EPS 后通知客户端热更新 service 树
 if (import.meta.hot) {
   import.meta.hot.on('eps-update', () => {
     void createEps(true).then(() => {
@@ -269,7 +361,12 @@ export function serviceOf(prefix: string): ServiceLeaf {
     .join('.')
   const hit = resolveService(path)
   if (hit) return hit
-  return attachLeaf(service, raw) as ServiceLeaf
+  const extra = FALLBACK_EXTRA_APIS[raw.startsWith('/') ? raw : `/${raw}`] || []
+  return attachLeaf(
+    service,
+    raw,
+    extra.map((a) => ({ method: a.method, path: a.path, perms: a.perms }) as EpsApiItem),
+  ) as ServiceLeaf
 }
 
 /** @deprecated 请用 service.base.xxx */