@gadmin2n/schematics 0.0.68 → 0.0.70

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/enums/audit-log.enum.ts

@@ -1,13 +1,13 @@
 export enum AuditLogActionEnum {
-  create = "create",
-  update = "update",
-  delete = "delete",
-  download = "download",
+  create = 'create',
+  update = 'update',
+  delete = 'delete',
+  download = 'download',
 }
 
 export const auditLogActionOptions = [
-  { label: "Create", value: AuditLogActionEnum.create },
-  { label: "Update", value: AuditLogActionEnum.update },
-  { label: "Delete", value: AuditLogActionEnum.delete },
-  { label: "Download", value: AuditLogActionEnum.download },
+  { label: 'Create', value: AuditLogActionEnum.create },
+  { label: 'Update', value: AuditLogActionEnum.update },
+  { label: 'Delete', value: AuditLogActionEnum.delete },
+  { label: 'Download', value: AuditLogActionEnum.download },
 ];

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/enums/index.ts

@@ -1 +1 @@
-export * from "./audit-log.enum";
+export * from './audit-log.enum';

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/helpers/form.tsx

@@ -6,45 +6,83 @@ import {
   whenIsTrue,
   convertPrismaDecimal,
   isPrismaDecimal,
-} from "@gadmin2n/react-common";
-import { getValueFromEvent } from "@refinedev/antd";
-import { UploadFile } from "antd/lib/upload/interface";
+} from '@gadmin2n/react-common';
+import { getValueFromEvent } from '@refinedev/antd';
+import { useList } from '@refinedev/core';
+import { useMemo } from 'react';
+import { UploadFile } from 'antd/lib/upload/interface';
 import {
   SelectProps,
   Form,
   Upload,
   Select,
   Input,
+  AutoComplete,
   FormInstance,
   InputNumber,
   DatePicker,
   Switch,
   Checkbox,
   Radio,
-} from "antd";
-import VanillaJSONEditor from "../components/VanillaJSONEditor";
-import { agentAttrs } from "../components/agentPanel/agentAttributes";
-import MDEditor from "@uiw/react-md-editor";
-import { DefaultOptionType } from "antd/es/select";
-import { UploadChangeParam } from "antd/es/upload";
-import { ModelConfig } from "generated/types/config.types";
-import dayjs from "dayjs";
+} from 'antd';
+import VanillaJSONEditor from '../components/VanillaJSONEditor';
 
-function getDependanceFields(config: ModelConfig["form"]["reaction"] = {}) {
+function DynamicAutoComplete({
+  resourceName,
+  fieldName,
+  disabled,
+}: {
+  resourceName: string;
+  fieldName: string;
+  disabled?: boolean;
+}) {
+  const { data } = useList({
+    resource: resourceName,
+    pagination: { pageSize: 1000 },
+    meta: { select: { [fieldName]: true } },
+  });
+
+  const options = useMemo(() => {
+    const values = (data?.data ?? [])
+      .map((item: any) => item[fieldName])
+      .filter((v: any) => v !== undefined && v !== null && v !== '');
+    return Array.from(new Set(values)).map((v) => ({ value: v as string }));
+  }, [data, fieldName]);
+
+  return (
+    <AutoComplete
+      options={options}
+      filterOption={(input, option) =>
+        (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+      }
+      allowClear
+      disabled={disabled}
+    />
+  );
+}
+
+import { agentAttrs } from '../components/agentPanel/agentAttributes';
+import MDEditor from '@uiw/react-md-editor';
+import { DefaultOptionType } from 'antd/es/select';
+import { UploadChangeParam } from 'antd/es/upload';
+import { ModelConfig } from 'generated/types/config.types';
+import dayjs from 'dayjs';
+
+function getDependanceFields(config: ModelConfig['form']['reaction'] = {}) {
   const dependencies: string[] = [];
   Object.values(config).forEach(({ toggle }) =>
-    toggle.forEach(({ when }) => dependencies.push(...Object.keys(when)))
+    toggle.forEach(({ when }) => dependencies.push(...Object.keys(when))),
   );
   return dependencies;
 }
 export function onFormValuesChange(
   form: any,
-  config: ModelConfig["form"]["reaction"] = {}
+  config: ModelConfig['form']['reaction'] = {},
 ) {
   const dependencies = getDependanceFields(config);
   return (
     changedValues: Record<string, any>,
-    allValues: Record<string, any>
+    allValues: Record<string, any>,
   ) => {
     if (Object.keys(changedValues).some((key) => dependencies.includes(key))) {
       Object.entries(config).forEach(([k, v]) => {
@@ -52,7 +90,7 @@ export function onFormValuesChange(
         v.toggle.forEach(({ props, when }) => {
           if (whenIsTrue(when, allValues)) {
             matched = true;
-            if (props?.hasOwnProperty?.("value")) {
+            if (props?.hasOwnProperty?.('value')) {
               form.setFieldValue(k, props.value);
             }
             if (props.hidden) {
@@ -64,7 +102,7 @@ export function onFormValuesChange(
           }
         });
         if (!matched && v.defaultProps) {
-          if (v.defaultProps?.hasOwnProperty?.("value")) {
+          if (v.defaultProps?.hasOwnProperty?.('value')) {
             form.setFieldValue(k, v.defaultProps.value);
           }
           if (v.defaultProps.hidden) {
@@ -82,7 +120,7 @@ export function onFormValuesChange(
 function getConfigProperty(
   fieldName: string,
   form: FormInstance<any>,
-  config: ModelConfig["form"]["reaction"] = {}
+  config: ModelConfig['form']['reaction'] = {},
 ) {
   if (!config[fieldName]) {
     return {};
@@ -90,7 +128,7 @@ function getConfigProperty(
 
   const values = form.getFieldsValue();
   const toggle = config[fieldName].toggle.find(({ when }) =>
-    whenIsTrue(when, values)
+    whenIsTrue(when, values),
   );
   if (toggle) {
     return toggle.props;
@@ -103,7 +141,7 @@ function getElement(
   resourceName: string,
   t: I18N_T,
   form: FormInstance<any>,
-  config: ModelConfig["form"]["reaction"],
+  config: ModelConfig['form']['reaction'],
   modelsEnum: Record<string, Record<string, string>>,
   model: ModelType,
   apiUrl: string,
@@ -117,7 +155,7 @@ function getElement(
       DefaultOptionType
     >
   >,
-  onUploadFileStateChange: (info: UploadChangeParam<UploadFile<any>>) => void
+  onUploadFileStateChange: (info: UploadChangeParam<UploadFile<any>>) => void,
 ) {
   const { type: fieldType, args } = field.uiType.formItem;
   const fieldName = field.name;
@@ -131,20 +169,21 @@ function getElement(
   const itemProps = {
     label: t(
       `resources.${resourceName}.fields.${fieldName}`,
-      fieldName.endsWith(".connect")
+      fieldName.endsWith('.connect')
         ? t(
-          `resources.${model[fieldName.split(".")[0]]?.type?.toLowerCase() || ""
-          }.name`,
-          model[fieldName.split(".")[0]]?.type
-        )
-        : fieldName
+            `resources.${
+              model[fieldName.split('.')[0]]?.type?.toLowerCase() || ''
+            }.name`,
+            model[fieldName.split('.')[0]]?.type,
+          )
+        : fieldName,
     ),
 
     ...field,
 
     key: fieldName,
-    name: fieldName.endsWith(".connect")
-      ? [fieldName.split(".")[0], field.isList ? "ids" : "id"]
+    name: fieldName.endsWith('.connect')
+      ? [fieldName.split('.')[0], field.isList ? 'ids' : 'id']
       : fieldName,
     rules: [
       {
@@ -158,9 +197,9 @@ function getElement(
   };
   if (field.component) {
     element = <Form.Item {...itemProps}>{field.component}</Form.Item>;
-  } else if ("File" === fieldType || "Image" === fieldType) {
+  } else if ('File' === fieldType || 'Image' === fieldType) {
     element = (
-      <Form.Item {...omit(itemProps, ["name"])}>
+      <Form.Item {...omit(itemProps, ['name'])}>
         <Form.Item
           name={itemProps.name}
           valuePropName="fileList"
@@ -171,48 +210,50 @@ function getElement(
             disabled={readonly}
             name="file"
             action={apiUrl + `/${resourceName}/upload`}
-            listType={fieldType === "Image" ? "picture" : "text"}
+            listType={fieldType === 'Image' ? 'picture' : 'text'}
             maxCount={args.maxCount || 1}
             multiple={(args.maxCount || 1) > 1}
-            accept={args.accept || "*"}
+            accept={args.accept || '*'}
             onChange={onUploadFileStateChange}
           >
             <p className="ant-upload-text">
-              {t("form.uploadPlaceholder", "Drag & drop a file in this area")}
+              {t('form.uploadPlaceholder', 'Drag & drop a file in this area')}
             </p>
           </Upload.Dragger>
         </Form.Item>
       </Form.Item>
     );
-  } else if ("Email" === fieldType) {
+  } else if ('Email' === fieldType) {
     element = (
-      <Form.Item {...itemProps} rules={[{ type: "email" }, ...itemProps.rules]}>
+      <Form.Item {...itemProps} rules={[{ type: 'email' }, ...itemProps.rules]}>
         <Input disabled={readonly} />
       </Form.Item>
     );
-  } else if ("Url" === fieldType) {
+  } else if ('Url' === fieldType) {
     element = (
-      <Form.Item {...itemProps} rules={[{ type: "url" }, ...itemProps.rules]}>
+      <Form.Item {...itemProps} rules={[{ type: 'url' }, ...itemProps.rules]}>
         <Input disabled={readonly} />
       </Form.Item>
     );
-  } else if (fieldName.endsWith(".connect")) {
+  } else if (fieldName.endsWith('.connect')) {
     element = (
       <Form.Item {...itemProps}>
         <Select
-          {...(relationSelectProps as any)[fieldName.split(".")[0]]}
-          mode={field.isList ? "multiple" : undefined}
+          {...(relationSelectProps as any)[fieldName.split('.')[0]]}
+          mode={field.isList ? 'multiple' : undefined}
           disabled={readonly}
         />
       </Form.Item>
     );
-  } else if (field.kind === "enum") {
+  } else if (field.kind === 'enum') {
     element = (
       <Form.Item {...itemProps}>
         <Select
           showSearch
           options={Object.entries((modelsEnum as any)[field.type])
-            .filter(([k, v]) => !showOptions || showOptions.includes(v as string))
+            .filter(
+              ([k, v]) => !showOptions || showOptions.includes(v as string),
+            )
             .map(([k, v]) => ({
               value: v,
               label: t(`resources.${resourceName}.enums.${fieldName}.${k}`, k),
@@ -221,7 +262,7 @@ function getElement(
         />
       </Form.Item>
     );
-  } else if (fieldType === "Select") {
+  } else if (fieldType === 'Select') {
     element = (
       <Form.Item {...itemProps}>
         <Select
@@ -231,14 +272,24 @@ function getElement(
             value,
             label: t(
               `resources.${resourceName}.enums.${fieldName}.${value}`,
-              value
+              value,
             ),
           }))}
           disabled={readonly}
         />
       </Form.Item>
     );
-  } else if (fieldType === "CheckBox") {
+  } else if (fieldType === 'AutoComplete') {
+    element = (
+      <Form.Item {...itemProps}>
+        <DynamicAutoComplete
+          resourceName={resourceName}
+          fieldName={fieldName}
+          disabled={readonly}
+        />
+      </Form.Item>
+    );
+  } else if (fieldType === 'CheckBox') {
     element = (
       <Form.Item {...itemProps}>
         <Checkbox.Group
@@ -246,14 +297,14 @@ function getElement(
             value,
             label: t(
               `resources.${resourceName}.enums.${fieldName}.${value}`,
-              value
+              value,
             ),
           }))}
           disabled={readonly}
         />
       </Form.Item>
     );
-  } else if (fieldType === "Radio") {
+  } else if (fieldType === 'Radio') {
     element = (
       <Form.Item {...itemProps}>
         <Radio.Group
@@ -261,73 +312,72 @@ function getElement(
             value,
             label: t(
               `resources.${resourceName}.enums.${fieldName}.${value}`,
-              value
+              value,
             ),
           }))}
           disabled={readonly}
         />
       </Form.Item>
     );
-  } else if (fieldType === "Markdown") {
+  } else if (fieldType === 'Markdown') {
     element = (
       <Form.Item {...itemProps}>
         <MDEditor data-color-mode="light" />
       </Form.Item>
     );
-  } else if ((fieldType as any) === "JSON") {
+  } else if ((fieldType as any) === 'JSON') {
     element = (
       <Form.Item {...itemProps}>
-        <VanillaJSONEditor
-          readOnly={readonly}
-          validator={field.ajvValidator}
-        />
+        <VanillaJSONEditor readOnly={readonly} validator={field.ajvValidator} />
       </Form.Item>
     );
-  } else if (fieldType === "Int" || fieldType === "BigInt") {
+  } else if (fieldType === 'Int' || fieldType === 'BigInt') {
     element = (
       <Form.Item
         {...itemProps}
-        rules={[{ type: "integer" }, ...itemProps.rules]}
+        rules={[{ type: 'integer' }, ...itemProps.rules]}
       >
         <InputNumber disabled={readonly} />
       </Form.Item>
     );
-  } else if (fieldType === "Float" || fieldType === "Decimal") {
+  } else if (fieldType === 'Float' || fieldType === 'Decimal') {
     element = (
       <Form.Item
         {...itemProps}
-        rules={[{ type: "number" }, ...itemProps.rules]}
+        rules={[{ type: 'number' }, ...itemProps.rules]}
         getValueProps={(value) => ({
-          value: isPrismaDecimal(value) ? Number(convertPrismaDecimal(value)) : value,
+          value: isPrismaDecimal(value)
+            ? Number(convertPrismaDecimal(value))
+            : value,
         })}
       >
         <InputNumber disabled={readonly} />
       </Form.Item>
     );
-  } else if (fieldType === "Boolean") {
+  } else if (fieldType === 'Boolean') {
     element = (
       <Form.Item {...itemProps} valuePropName="checked">
         <Switch disabled={readonly} />
       </Form.Item>
     );
-  } else if (fieldType === "DateTime") {
+  } else if (fieldType === 'DateTime') {
     element = (
       <Form.Item
         {...itemProps}
         getValueProps={(value) => ({
-          value: value ? dayjs(value) : "",
+          value: value ? dayjs(value) : '',
         })}
         rules={[
           {
             required: field.isRequired || required,
           },
-          { type: "date" },
+          { type: 'date' },
         ]}
       >
         <DatePicker showTime disabled={readonly} />
       </Form.Item>
     );
-  } else if (fieldType === "Text") {
+  } else if (fieldType === 'Text') {
     element = (
       <Form.Item {...itemProps}>
         <Input.TextArea rows={args.rows || 5} disabled={readonly} />
@@ -349,7 +399,7 @@ export function getFormItem(
   resourceName: string,
   t: I18N_T,
   form: FormInstance<any>,
-  config: ModelConfig["form"]["reaction"],
+  config: ModelConfig['form']['reaction'],
   modelsEnum: Record<string, Record<string, string>>,
   model: ModelType,
   apiUrl: string,
@@ -363,7 +413,7 @@ export function getFormItem(
       DefaultOptionType
     >
   >,
-  onUploadFileStateChange: (info: UploadChangeParam<UploadFile<any>>) => void
+  onUploadFileStateChange: (info: UploadChangeParam<UploadFile<any>>) => void,
 ) {
   const fieldAgentAttrs = agentAttrs({
     type: 'form-field',
@@ -377,7 +427,7 @@ export function getFormItem(
       config[field.name].toggle.reduce((acc: {}, { when }) => {
         Object.assign(acc, when);
         return acc;
-      }, {})
+      }, {}),
     );
 
     return (
@@ -394,7 +444,7 @@ export function getFormItem(
               model,
               apiUrl,
               relationSelectProps,
-              onUploadFileStateChange
+              onUploadFileStateChange,
             );
           }}
         </Form.Item>
@@ -413,7 +463,7 @@ export function getFormItem(
           model,
           apiUrl,
           relationSelectProps,
-          onUploadFileStateChange
+          onUploadFileStateChange,
         )}
       </div>
     );

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/helpers/get-name-initials.ts

@@ -1,8 +1,8 @@
 export const getNameInitials = (name: string, count = 2) => {
   const initials = name
-    .split(" ")
+    .split(' ')
     .map((n) => n[0])
-    .join("");
-  const filtered = initials.replace(/[^a-zA-Z]/g, "");
+    .join('');
+  const filtered = initials.replace(/[^a-zA-Z]/g, '');
   return filtered.slice(0, count).toUpperCase();
 };

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/helpers/get-random-color.ts

@@ -3,17 +3,17 @@
  */
 export const getRandomColorFromString = (text: string) => {
   const colors = [
-    "#ff9c6e",
-    "#ff7875",
-    "#ffc069",
-    "#ffd666",
-    "#fadb14",
-    "#95de64",
-    "#5cdbd3",
-    "#69c0ff",
-    "#85a5ff",
-    "#b37feb",
-    "#ff85c0",
+    '#ff9c6e',
+    '#ff7875',
+    '#ffc069',
+    '#ffd666',
+    '#fadb14',
+    '#95de64',
+    '#5cdbd3',
+    '#69c0ff',
+    '#85a5ff',
+    '#b37feb',
+    '#ff85c0',
   ];
 
   let hash = 0;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/helpers/http.ts

@@ -1,13 +1,13 @@
-import axios from "axios";
+import axios from 'axios';
 import {
   GadminCrud as gadminDataProvider,
   applyErrorInterceptor,
   customRequest as baseCustomRequest,
-} from "@gadmin2n/react-common";
-import { login, requestHeaders } from "./login";
-import { getApiUrl } from "config/http";
+} from '@gadmin2n/react-common';
+import { login, requestHeaders } from './login';
+import { getApiUrl } from 'config/http';
 // Re-export Prisma helpers from react-common for backward compatibility
-export { convertPrismaDecimal, isPrismaDecimal } from "@gadmin2n/react-common";
+export { convertPrismaDecimal, isPrismaDecimal } from '@gadmin2n/react-common';
 
 const apiUrl = getApiUrl();
 
@@ -21,7 +21,7 @@ axiosInstance.interceptors.request.use(
     }
     return config;
   },
-  (error) => Promise.reject(error)
+  (error) => Promise.reject(error),
 );
 
 // 处理 401 跳转登录、403 跳权限页（app 层特有逻辑，须在 applyErrorInterceptor 之前注册）
@@ -29,27 +29,25 @@ axiosInstance.interceptors.response.use(
   (response) => response,
   (error) => {
     if (error?.response?.status === 401) {
-      console.log("login expired");
+      console.log('login expired');
       login();
       // 返回pending状态的promise，以免后续代码出错
       return new Promise(() => {});
     }
     if (error?.response?.status === 403) {
       // 已经在 /403 页面则不再跳转，防止死循环
-      if (!window.location.pathname.endsWith("/403")) {
-        window.location.href = "/403";
+      if (!window.location.pathname.endsWith('/403')) {
+        window.location.href = '/403';
       }
       return new Promise(() => {});
     }
     return Promise.reject(error);
-  }
+  },
 );
 
 // 统一错误格式化（复用公共库逻辑，消除重复代码）
 applyErrorInterceptor(axiosInstance);
 
-
-
 export const gadminCrudProvider = gadminDataProvider(apiUrl, axiosInstance);
 
 /**
@@ -57,19 +55,20 @@ export const gadminCrudProvider = gadminDataProvider(apiUrl, axiosInstance);
  */
 export async function findMany<T>(
   resource: string,
-  params: Record<string, any>
+  params: Record<string, any>,
 ): Promise<T[]> {
   const url = `${apiUrl}/${resource}/findMany`;
   const res = await fetch(url, {
-    method: "POST",
+    method: 'POST',
     headers: {
-      "Content-Type": "application/json",
+      'Content-Type': 'application/json',
       ...requestHeaders(),
     },
     body: JSON.stringify(params),
   });
+  if (!res.ok) throw new Error(`findMany ${resource} failed: ${res.status}`);
   const data = await res.json();
-  return data.data as T[];
+  return (data.data ?? []) as T[];
 }
 
 /**
@@ -79,9 +78,7 @@ export async function findMany<T>(
 export async function customRequest<T>(
   urlPath: string,
   method: string,
-  params?: Record<string, any>
+  params?: Record<string, any>,
 ) {
   return baseCustomRequest<T>(axiosInstance, apiUrl, urlPath, method, params);
 }
-
-

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/helpers/index.tsx

@@ -5,4 +5,4 @@ export * from './login';
 export * from './utils';
 export * from './http';
 export * from './get-name-initials';
-export * from './get-random-color';
+export * from './get-random-color';