create-windy 0.2.34 → 0.3.0

package/template/apps/web/src/pages/system/components/SystemResourceEditor.vue

@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import { computed, useTemplateRef } from "vue";
+import type { PermissionDefinition } from "@southwind-ai/shared";
+import FormDialog from "@/components/common/FormDialog.vue";
+import type { SystemRecord } from "@/services/system-api";
+import type { SystemResourceConfig } from "../resource-config";
+import DepartmentOrganizationForm from "./department/DepartmentOrganizationForm.vue";
+import RolePolicyForm from "./role-policy/RolePolicyForm.vue";
+import SystemResourceForm from "./SystemResourceForm.vue";
+import UserAccountForm from "./user-account/UserAccountForm.vue";
+
+const open = defineModel<boolean>("open", { default: false });
+const props = defineProps<{
+  config: SystemResourceConfig;
+  item?: SystemRecord;
+  defaults: Record<string, unknown>;
+  permissions?: PermissionDefinition[];
+  departmentCreateMode?: "create" | "manage";
+  loading?: boolean;
+}>();
+const emit = defineEmits<{
+  submit: [payload: Record<string, unknown>];
+}>();
+
+interface ResourceFormHandle {
+  submit(): void;
+}
+
+const resourceForm = useTemplateRef<ResourceFormHandle>("resourceForm");
+const title = computed(() => (props.item ? "编辑记录" : "新增记录"));
+</script>
+
+<template>
+  <FormDialog
+    v-model:open="open"
+    :title="title"
+    :description="config.description"
+    :loading="loading"
+    :content-class="config.key === 'roles' ? 'sm:max-w-4xl' : undefined"
+    @submit="resourceForm?.submit()"
+  >
+    <RolePolicyForm
+      v-if="config.key === 'roles'"
+      ref="resourceForm"
+      :item="item"
+      :defaults="defaults"
+      :permissions="permissions || []"
+      @submit="emit('submit', $event)"
+    />
+    <UserAccountForm
+      v-else-if="config.key === 'users'"
+      ref="resourceForm"
+      :item="item"
+      :defaults="defaults"
+      :department-create-mode="departmentCreateMode"
+      @submit="emit('submit', $event)"
+    />
+    <DepartmentOrganizationForm
+      v-else-if="config.key === 'departments'"
+      ref="resourceForm"
+      :item="item"
+      :defaults="defaults"
+      @submit="emit('submit', $event)"
+    />
+    <SystemResourceForm
+      v-else
+      ref="resourceForm"
+      :fields="config.fields"
+      :item="item"
+      :defaults="defaults"
+      @submit="emit('submit', $event)"
+    />
+  </FormDialog>
+</template>

package/template/apps/web/src/pages/system/components/SystemResourceFilters.vue

@@ -8,9 +8,11 @@ import AuditLogFilters from "./AuditLogFilters.vue";
 // @windy-module system.audit end
 
 interface AuditLogFilterValue {
+  q?: string;
   actorId?: string;
   action?: string;
   occurredAfter?: string;
+  occurredBefore?: string;
 }
 
 interface AuditExportOptions {
@@ -35,10 +37,7 @@ const emit = defineEmits<{
     @export-options="emit('auditExportOptions', $event)"
   />
   <!-- @windy-module system.audit end -->
-  <div
-    v-if="!config.usesCustomFilters"
-    class="flex flex-col gap-2 md:flex-row"
-  >
+  <div v-if="!config.usesCustomFilters" class="flex flex-col gap-2 md:flex-row">
     <Input
       v-model="keyword"
       :placeholder="config.searchPlaceholder"

package/template/apps/web/src/pages/system/components/SystemResourcePage.vue

@@ -1,27 +1,29 @@
 <script setup lang="ts">
-import { computed, onMounted, shallowRef, useTemplateRef } from "vue";
+import { computed, onMounted, shallowRef } from "vue";
 import type { PermissionDefinition } from "@southwind-ai/shared";
 import ConfirmDialog from "@/components/common/ConfirmDialog.vue";
 import DataPagination from "@/components/common/DataPagination.vue";
-import FormDialog from "@/components/common/FormDialog.vue";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { DownloadIcon, PlusIcon, RefreshCwIcon, UploadIcon } from "@lucide/vue";
 import type { SystemRecord } from "@/services/system-api";
 import { useSystemResource } from "../composables/useSystemResource";
 import { useAppToast } from "@/composables/useAppToast";
 import type { SystemResourceConfig } from "../resource-config";
-import SystemResourceForm from "./SystemResourceForm.vue";
 import SystemResourceTable from "./SystemResourceTable.vue";
 // @windy-module system.bulk-data begin
 import DictionaryBulkPanel from "./dictionary-bulk/DictionaryBulkPanel.vue";
 // @windy-module system.bulk-data end
-import RolePolicyForm from "./role-policy/RolePolicyForm.vue";
-import UserAccountForm from "./user-account/UserAccountForm.vue";
 import FeatureLicensePolicyDialog from "./FeatureLicensePolicyDialog.vue";
 import SystemResourceFilters from "./SystemResourceFilters.vue";
 import { useFeatureLicenseEditor } from "../composables/useFeatureLicenseEditor";
 import { saveUserAccount } from "./user-account/save-user-account";
+import DepartmentTransitionDialog from "./department/DepartmentTransitionDialog.vue";
+import { useDepartmentTransitions } from "../composables/useDepartmentTransitions";
+import SystemResourceActions from "./SystemResourceActions.vue";
+import SystemResourceEditor from "./SystemResourceEditor.vue";
+// @windy-module system.audit begin
+import AuditLogDetailDialog from "./AuditLogDetailDialog.vue";
+// @windy-module system.audit end
 
 const props = withDefaults(
   defineProps<{
@@ -39,6 +41,7 @@ const props = withDefaults(
     // @windy-module system.bulk-data end
   },
 );
+const auditViewable = props.config.apiResource === "audit-logs";
 
 const emit = defineEmits<{
   mutated: [];
@@ -57,10 +60,16 @@ const toast = useAppToast();
 const editorOpen = shallowRef(false);
 const confirmOpen = shallowRef(false);
 const editingItem = shallowRef<SystemRecord | undefined>();
+const viewingItem = shallowRef<SystemRecord | undefined>();
+const detailOpen = shallowRef(false);
 const pendingDelete = shallowRef<SystemRecord | undefined>();
 const keyword = shallowRef("");
 const pendingToggleId = shallowRef("");
 const toggleOverrides = shallowRef<Record<string, boolean>>({});
+const departmentTransitions = useDepartmentTransitions({
+  reload: resource.reload,
+  mutated: () => emit("mutated"),
+});
 const {
   open: licenseEditorOpen,
   item: licenseEditorItem,
@@ -76,17 +85,7 @@ const {
   onFailed: (description) =>
     toast.error("License 范围更新失败", { description }),
 });
-interface ResourceFormHandle {
-  submit(): void;
-}
-
-const resourceForm = useTemplateRef<ResourceFormHandle>("resourceForm");
-const importFileInput = useTemplateRef<HTMLInputElement>("importFileInput");
-
 const formDefaults = computed(() => props.config.createDefaults());
-const dialogTitle = computed(() =>
-  editingItem.value ? "编辑记录" : "新增记录",
-);
 const displayedItems = computed(() =>
   resource.items.value.map((item) => {
     const inlineToggle = props.config.inlineToggle;
@@ -115,16 +114,40 @@ function openDelete(item: SystemRecord) {
   confirmOpen.value = true;
 }
 
+function openDetail(item: SystemRecord) {
+  viewingItem.value = item;
+  detailOpen.value = true;
+}
+
 async function submit(payload: Record<string, unknown>) {
+  if (
+    props.config.key === "departments" &&
+    editingItem.value &&
+    editingItem.value.status === "active" &&
+    payload.status === "disabled"
+  ) {
+    const targetDepartmentId =
+      typeof payload._transitionTargetDepartmentId === "string"
+        ? payload._transitionTargetDepartmentId
+        : undefined;
+    const disabled = await departmentTransitions.disable(
+      editingItem.value,
+      targetDepartmentId,
+    );
+    if (disabled) editorOpen.value = false;
+    return;
+  }
+  const normalizedPayload = { ...payload };
+  delete normalizedPayload._transitionTargetDepartmentId;
   const saved =
     props.config.key === "users"
       ? await saveUserAccount(
-          payload,
+          normalizedPayload,
           editingItem.value?.id,
           resource.save,
           toast,
         )
-      : await resource.save(payload, editingItem.value?.id);
+      : await resource.save(normalizedPayload, editingItem.value?.id);
   if (saved) {
     editorOpen.value = false;
     emit("mutated");
@@ -151,8 +174,19 @@ async function toggleInline(item: SystemRecord, checked: boolean) {
   }
 }
 
-async function confirmDelete() {
+async function confirmDelete(targetDepartmentId?: string) {
   if (!pendingDelete.value) return;
+  if (props.config.key === "departments") {
+    const deleted = await departmentTransitions.remove(
+      pendingDelete.value,
+      targetDepartmentId,
+    );
+    if (deleted) {
+      confirmOpen.value = false;
+      pendingDelete.value = undefined;
+    }
+    return;
+  }
   await resource.remove(pendingDelete.value.id);
   if (!resource.error.value) {
     confirmOpen.value = false;
@@ -170,24 +204,12 @@ function applySearchPreset(value: string) {
   applySearch();
 }
 
-function submitForm() {
-  resourceForm.value?.submit();
-}
-
 function exportData() {
   void resource.exportCurrent(`${props.config.apiResource}.json`);
 }
 
-function openImport() {
-  importFileInput.value?.click();
-}
-
-async function importData(event: Event) {
-  const input = event.target as HTMLInputElement;
-  const file = input.files?.[0];
-  if (!file) return;
+async function importData(file: File) {
   await resource.importFile(file);
-  input.value = "";
 }
 </script>
 
@@ -206,40 +228,15 @@ async function importData(event: Event) {
           class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between"
         >
           <CardTitle class="text-base">数据列表</CardTitle>
-          <div class="flex flex-wrap gap-2">
-            <Button variant="outline" @click="resource.reload">
-              <RefreshCwIcon data-icon="inline-start" />
-              刷新
-            </Button>
-            <Button
-              v-if="!config.replacesNativeTransfer"
-              variant="outline"
-              @click="exportData"
-            >
-              <DownloadIcon data-icon="inline-start" />
-              导出
-            </Button>
-            <Button
-              v-if="resource.canImport.value && !config.replacesNativeTransfer"
-              variant="outline"
-              @click="openImport"
-            >
-              <UploadIcon data-icon="inline-start" />
-              导入
-            </Button>
-            <Button v-if="resource.canCreate.value" @click="openCreate">
-              <PlusIcon data-icon="inline-start" />
-              新增
-            </Button>
-            <input
-              v-if="!config.replacesNativeTransfer"
-              ref="importFileInput"
-              type="file"
-              accept="application/json,.json"
-              class="hidden"
-              @change="importData"
-            />
-          </div>
+          <SystemResourceActions
+            :can-create="resource.canCreate.value"
+            :can-import="resource.canImport.value"
+            :replaces-native-transfer="config.replacesNativeTransfer"
+            @refresh="resource.reload"
+            @export="exportData"
+            @import="importData"
+            @create="openCreate"
+          />
         </div>
         <SystemResourceFilters
           v-model:keyword="keyword"
@@ -270,12 +267,14 @@ async function importData(event: Event) {
           :inline-toggle="config.inlineToggle"
           :toggle-pending-id="pendingToggleId"
           :loading="resource.loading.value"
+          :viewable="auditViewable"
           :page="resource.page.value"
           :page-size="resource.pageSize.value"
           @edit="openEdit"
           @edit-license="openLicenseEditor"
           @remove="openDelete"
           @toggle="toggleInline"
+          @view="openDetail"
         />
         <DataPagination
           :page="resource.page.value"
@@ -305,42 +304,28 @@ async function importData(event: Event) {
       </p>
     </section>
     <!-- @windy-module system.bulk-data end -->
-    <FormDialog
+    <SystemResourceEditor
       v-if="!config.inlineToggle"
       v-model:open="editorOpen"
-      :title="dialogTitle"
-      :description="config.description"
-      :loading="resource.saving.value"
-      :content-class="config.key === 'roles' ? 'sm:max-w-4xl' : undefined"
-      @submit="submitForm"
-    >
-      <RolePolicyForm
-        v-if="config.key === 'roles'"
-        ref="resourceForm"
-        :item="editingItem"
-        :defaults="formDefaults"
-        :permissions="permissions || []"
-        @submit="submit"
-      />
-      <UserAccountForm
-        v-else-if="config.key === 'users'"
-        ref="resourceForm"
-        :item="editingItem"
-        :defaults="formDefaults"
-        :department-create-mode="departmentCreateMode"
-        @submit="submit"
-      />
-      <SystemResourceForm
-        v-else
-        ref="resourceForm"
-        :fields="config.fields"
-        :item="editingItem"
-        :defaults="formDefaults"
-        @submit="submit"
-      />
-    </FormDialog>
+      :config="config"
+      :item="editingItem"
+      :defaults="formDefaults"
+      :permissions="permissions"
+      :department-create-mode="departmentCreateMode"
+      :loading="resource.saving.value || departmentTransitions.loading.value"
+      @submit="submit"
+    />
+
+    <DepartmentTransitionDialog
+      v-if="config.key === 'departments'"
+      v-model:open="confirmOpen"
+      :department="pendingDelete"
+      :loading="departmentTransitions.loading.value"
+      @confirm="confirmDelete"
+    />
 
     <ConfirmDialog
+      v-else
       v-model:open="confirmOpen"
       title="删除记录"
       description="删除后会进入软删除状态，并写入审计事件。"
@@ -356,5 +341,13 @@ async function importData(event: Event) {
       :loading="resource.saving.value"
       @save="saveLicensePolicy"
     />
+
+    <!-- @windy-module system.audit begin -->
+    <AuditLogDetailDialog
+      v-if="config.key === 'auditLogs'"
+      v-model:open="detailOpen"
+      :item="viewingItem"
+    />
+    <!-- @windy-module system.audit end -->
   </div>
 </template>

package/template/apps/web/src/pages/system/components/SystemResourcePage.webtest.ts

@@ -4,11 +4,15 @@ import { systemResourceConfigs } from "../resource-config";
 import SystemResourcePage from "./SystemResourcePage.vue";
 import FeatureLicensePolicyDialog from "./FeatureLicensePolicyDialog.vue";
 import SystemResourceTable from "./SystemResourceTable.vue";
+import DepartmentOrganizationForm from "./department/DepartmentOrganizationForm.vue";
+import DepartmentTransitionDialog from "./department/DepartmentTransitionDialog.vue";
 
 const api = vi.hoisted(() => ({
   list: vi.fn(),
   update: vi.fn(),
   quickCreateDepartment: vi.fn(),
+  transitionDepartment: vi.fn(),
+  loadPasswordPolicy: vi.fn(),
 }));
 
 vi.mock("@/services/system-api", async () => {
@@ -20,12 +24,25 @@ vi.mock("@/services/system-api", async () => {
     listSystemResource: api.list,
     updateSystemResource: api.update,
     quickCreateDepartment: api.quickCreateDepartment,
+    transitionDepartment: api.transitionDepartment,
   };
 });
 
+vi.mock("@/services/auth-api", () => ({
+  loadPasswordPolicy: api.loadPasswordPolicy,
+}));
+
 afterEach(() => vi.clearAllMocks());
 
 describe("SystemResourcePage", () => {
+  api.loadPasswordPolicy.mockResolvedValue({
+    minLength: 8,
+    requireUppercase: true,
+    requireLowercase: true,
+    requireNumber: true,
+    requireSpecial: false,
+  });
+
   test("权限策略使用 Manifest 目录级联勾选而不是手输权限 key", async () => {
     api.list.mockResolvedValue({
       items: [
@@ -260,4 +277,55 @@ describe("SystemResourcePage", () => {
     );
     wrapper.unmount();
   });
+
+  test("部门停用和删除使用显式迁移目标", async () => {
+    const department = {
+      id: "dept_sales",
+      code: "sales",
+      name: "销售部",
+      parentId: "dept_platform",
+      status: "active",
+    };
+    api.list.mockResolvedValue({
+      items: [department],
+      total: 1,
+      page: 1,
+      pageSize: 10,
+    });
+    api.transitionDepartment.mockResolvedValue({
+      department: { ...department, status: "disabled" },
+      movedChildren: 0,
+      movedUsers: 1,
+      updatedRoles: 0,
+    });
+    const wrapper = mount(SystemResourcePage, {
+      props: { config: systemResourceConfigs.departments },
+    });
+    await flushPromises();
+
+    wrapper.getComponent(SystemResourceTable).vm.$emit("edit", department);
+    await flushPromises();
+    wrapper.getComponent(DepartmentOrganizationForm).vm.$emit("submit", {
+      ...department,
+      status: "disabled",
+      _transitionTargetDepartmentId: "dept_platform",
+    });
+    await flushPromises();
+    expect(api.transitionDepartment).toHaveBeenCalledWith("dept_sales", {
+      action: "disable",
+      targetDepartmentId: "dept_platform",
+    });
+
+    wrapper.getComponent(SystemResourceTable).vm.$emit("remove", department);
+    await flushPromises();
+    wrapper
+      .getComponent(DepartmentTransitionDialog)
+      .vm.$emit("confirm", "dept_platform");
+    await flushPromises();
+    expect(api.transitionDepartment).toHaveBeenLastCalledWith("dept_sales", {
+      action: "delete",
+      targetDepartmentId: "dept_platform",
+    });
+    wrapper.unmount();
+  });
 });

package/template/apps/web/src/pages/system/components/SystemResourceTable.vue

@@ -38,6 +38,7 @@ const props = defineProps<{
   inlineToggle?: ResourceInlineToggle;
   togglePendingId?: string;
   loading?: boolean;
+  viewable?: boolean;
   page?: number;
   pageSize?: number;
 }>();
@@ -47,6 +48,7 @@ const emit = defineEmits<{
   editLicense: [item: SystemRecord];
   remove: [item: SystemRecord];
   toggle: [item: SystemRecord, checked: boolean];
+  view: [item: SystemRecord];
 }>();
 
 const hasRows = computed(() => props.items.length > 0);
@@ -54,6 +56,14 @@ const access = useAccessSnapshot();
 
 function formatValue(item: SystemRecord, column: ResourceColumn): string {
   if (column.format === "license-policy") return formatLicensePolicy(item);
+  if (column.format === "audit-ip") {
+    const actor = item.actor;
+    if (!actor || typeof actor !== "object" || Array.isArray(actor)) {
+      return "未记录";
+    }
+    const ip = (actor as Record<string, unknown>).ip;
+    return typeof ip === "string" && ip.trim() ? ip : "未记录";
+  }
   const value = item[column.key];
   if (column.format === "audit-action")
     return auditAction(value)?.label || String(value || "-");
@@ -218,6 +228,15 @@ function licenseVersionLabel(version: string): string {
                 />
               </div>
               <div v-else class="flex justify-end gap-2">
+                <Button
+                  v-if="viewable"
+                  variant="outline"
+                  size="sm"
+                  :aria-label="`查看审计日志 ${String(item.id)} 详情`"
+                  @click="emit('view', item)"
+                >
+                  查看详情
+                </Button>
                 <Button
                   v-if="editable"
                   variant="outline"
@@ -235,7 +254,7 @@ function licenseVersionLabel(version: string): string {
                   删除
                 </Button>
                 <span
-                  v-if="!editable && !deletable"
+                  v-if="!viewable && !editable && !deletable"
                   class="text-sm text-muted-foreground"
                 >
                   只读

package/template/apps/web/src/pages/system/components/SystemResourceTable.webtest.ts

@@ -157,19 +157,40 @@ describe("SystemResourceTable", () => {
   });
 
   // @windy-module system.audit begin
-  test("审计动作显示稳定中文名称和说明而不是内部 code", () => {
+  test("审计表直接显示动作摘要、IP，并从操作列进入详情", async () => {
+    const item = {
+      id: "audit_1",
+      action: "feature.update",
+      actor: { id: "user_1", name: "管理员", ip: "203.0.113.8" },
+      target: { type: "features", id: "system.audit" },
+    };
     const wrapper = mount(SystemResourceTable, {
       props: {
-        columns: [{ key: "action", label: "动作", format: "audit-action" }],
-        items: [{ id: "audit_1", action: "feature.update" }],
+        columns: systemResourceConfigs.auditLogs.columns,
+        items: [item],
+        viewable: true,
       },
     });
 
     expect(wrapper.text()).toContain("功能开关更新");
-    expect(wrapper.text()).not.toContain("feature.update");
-    expect(
-      wrapper.get('button[type="button"]').attributes("title"),
-    ).toBeUndefined();
+    expect(wrapper.text()).toContain("更新 features（system.audit）");
+    expect(wrapper.text()).toContain("203.0.113.8");
+    expect(wrapper.text()).toContain("查看详情");
+    await wrapper
+      .get('[aria-label="查看审计日志 audit_1 详情"]')
+      .trigger("click");
+    expect(wrapper.emitted("view")).toEqual([[item]]);
+  });
+
+  test("历史审计没有 IP 时显示未记录", () => {
+    const wrapper = mount(SystemResourceTable, {
+      props: {
+        columns: [{ key: "ip", label: "IP", format: "audit-ip" }],
+        items: [{ id: "audit_legacy", actor: { id: "user_1" } }],
+      },
+    });
+
+    expect(wrapper.text()).toContain("未记录");
   });
   // @windy-module system.audit end