@_tc/template-core 0.0.1-bate.43 → 0.0.1-bate.45

package/fe/frontend/typing/scalability.d.ts

@@ -0,0 +1,47 @@
+import type { FrameComponentPropsMap, FrameComponentsMap } from '../extended/SchemaForm/data';
+import type { SelectProps } from '../../packages/ui/react';
+/**
+ * 扩展 SchemaForm 字段类型
+ *
+ * 框架业务侧可以在这里扩展业务特定的表单组件类型。
+ * 消费方也可以在自己的项目中创建类似的声明文件继续扩展。
+ */
+declare module '../../packages/ui/react' {
+    namespace SchemaFormNamespace {
+        /**
+         * 扩展字段类型
+         *
+         * 示例：
+         * interface FieldTypes {
+         *     businessSelect: true
+         *     userPicker: true
+         * }
+         */
+        interface FieldTypes extends FrameComponentsMap {
+        }
+        /**
+         * 扩展字段 Props 映射
+         *
+         * 示例：
+         * interface PropsMap {
+         *     businessSelect: SelectProps & {
+         *         requestUrl?: string
+         *         valueField?: string
+         *         labelField?: string
+         *     }
+         *     userPicker: {
+         *         multiple?: boolean
+         *         departmentId?: string
+         *     }
+         * }
+         */
+        interface PropsMap extends FrameComponentPropsMap {
+        }
+    }
+}
+export type SchemaFormFrameSelectProps = SelectProps & {
+    requestUrl?: string;
+    valueField?: string;
+    labelField?: string;
+};
+//# sourceMappingURL=scalability.d.ts.map

package/fe/frontend/typing/scalability.js

@@ -0,0 +1 @@
+export {};

package/fe/frontend/widgets/api/baseInfo.d.ts

@@ -26,6 +26,6 @@ export type ProjectInfo = {
     key: string;
     modelKey: string;
 };
-export declare const getProjeckData: (key: string) => Promise<ProjectInfo | null>;
+export declare const getProjectData: (key: string) => Promise<ProjectInfo | null>;
 export {};
 //# sourceMappingURL=baseInfo.d.ts.map

package/fe/frontend/widgets/api/baseInfo.js

@@ -6,7 +6,7 @@ export const getModelList = async () => {
     }
     return [];
 };
-export const getProjeckData = async (key) => {
+export const getProjectData = async (key) => {
     const res = await get(`/project/${key}`);
     if (res.data.code === 0) {
         return res.data.data;

package/fe/frontend/widgets/common/menu.js

@@ -31,7 +31,7 @@ export const serializationUrl = (url, data) => `${url}?${new URLSearchParams(dat
 const generateMenuItem = (item) => {
     let data = undefined;
     if (item.menuType === "module") {
-        const pk = modeStore.getState().projestInfo?.key;
+        const pk = modeStore.getState().projectInfo?.key;
         const query = {
             [QK.pk]: pk,
         };

package/fe/frontend/widgets/defaultPages/Schema/stores/schemaStore.d.ts

@@ -42,6 +42,6 @@ interface SchemaStoreActions {
     }) => void;
 }
 export declare const schemaStore: import("zustand").StoreApi<SchemaStoreState & SchemaStoreActions>;
-export declare const useSchemaStore: import("../../../../../packages/ui/react/index").StoreHook<import("zustand").StoreApi<SchemaStoreState & SchemaStoreActions>>;
+export declare const useSchemaStore: import("../../../../../packages/ui/react").StoreHook<import("zustand").StoreApi<SchemaStoreState & SchemaStoreActions>>;
 export {};
 //# sourceMappingURL=schemaStore.d.ts.map

package/fe/frontend/widgets/defaultPages/SidebarSlotPageTmp.js

@@ -5,7 +5,7 @@ import { leftSidebarBasePath } from "../../widgets/common/menu";
 import { useModeStore } from "../../widgets/store/mode";
 import { generateMenuItemData } from "../../widgets/common/generateMenuData";
 const SidebarSlotPageTmp = () => {
-    const projInfo = useModeStore((s) => s.projestInfo);
+    const projInfo = useModeStore((s) => s.projectInfo);
     const [menuItems, rawMenuData] = useMemo(() => {
         if (projInfo) {
             return [generateMenuItemData(projInfo.menu), projInfo.menu];

package/fe/frontend/widgets/hooks/useCurrentMenuData.js

@@ -12,17 +12,17 @@ import { useParams } from "react-router-dom";
  */
 const useCurrentMenuData = (useSibe = false) => {
     const params = useParams();
-    const projestInfo = useModeStore((s) => s.projestInfo);
+    const projectInfo = useModeStore((s) => s.projectInfo);
     const menu = useMemo(() => {
         const isSide = params[QK.sk];
         const menuTypeIsTop = !!params[QK.k];
-        const menu = findMenuItem(projestInfo?.menu, menuTypeIsTop ? params[QK.k] : params[QK.sk]);
+        const menu = findMenuItem(projectInfo?.menu, menuTypeIsTop ? params[QK.k] : params[QK.sk]);
         if (isSide && useSibe && menuTypeIsTop) {
             const sMenu = findMenuItem(menu.sidebarConfig?.menu ?? [], params[QK.sk]);
             return sMenu;
         }
         return menu;
-    }, [projestInfo?.menu, params]);
+    }, [projectInfo?.menu, params]);
     return { menu: menu };
 };
 export default useCurrentMenuData;

package/fe/frontend/widgets/store/mode.d.ts

@@ -1,7 +1,7 @@
 import { type ModelInfo, type ProjectInfo } from '../../widgets/api/baseInfo';
 interface ModeState {
     modeList: ModelInfo[];
-    projestInfo: ProjectInfo | null;
+    projectInfo: ProjectInfo | null;
     /**
      * 是否初始化过
      */
@@ -9,11 +9,11 @@ interface ModeState {
 }
 interface ModeAction {
     setModeList: (data: ModeState['modeList']) => void;
-    setProjestInfo: (data: ModeState['projestInfo']) => void;
+    setProjectInfo: (data: ModeState['projectInfo']) => void;
     initModeData: () => void;
 }
 type IStore = ModeState & ModeAction;
 export declare const modeStore: import("zustand").StoreApi<IStore>;
-export declare const useModeStore: import("../../../packages/ui/react/index").StoreHook<import("zustand").StoreApi<IStore>>;
+export declare const useModeStore: import("../../../packages/ui/react").StoreHook<import("zustand").StoreApi<IStore>>;
 export {};
 //# sourceMappingURL=mode.d.ts.map

package/fe/frontend/widgets/store/mode.js

@@ -1,4 +1,4 @@
-import { getModelList, getProjeckData } from '../../widgets/api/baseInfo';
+import { getModelList, getProjectData } from '../../widgets/api/baseInfo';
 import { deserializationUrlSearch } from '../../widgets/common/menu';
 import { createStoreHook } from '../../../packages/ui/react/lib/createStoreHook';
 import { createStore } from 'zustand';
@@ -6,30 +6,30 @@ import { setApiAuth } from '../common/auth';
 // create Store 可在任意地方使用
 export const modeStore = createStore((set, get) => ({
     modeList: [],
-    projestInfo: null,
+    projectInfo: null,
     initData: false,
     setModeList(modeList) {
         set({ modeList });
     },
-    setProjestInfo(projestInfo) {
-        set({ projestInfo });
+    setProjectInfo(projectInfo) {
+        set({ projectInfo });
     },
     async initModeData() {
         const fetchModeData = async () => {
             const data = await getModelList();
             return data;
         };
-        const featchProjeckData = async () => {
+        const fetchProjectData = async () => {
             const urls = deserializationUrlSearch(window.location.search);
             const key = urls['projk'];
             setApiAuth(key);
-            const data = await getProjeckData(key);
+            const data = await getProjectData(key);
             return data;
         };
-        const [modeList, projestInfo] = await Promise.all([fetchModeData(), featchProjeckData()]);
+        const [modeList, projectInfo] = await Promise.all([fetchModeData(), fetchProjectData()]);
         set({
             modeList,
-            projestInfo,
+            projectInfo,
             initData: true,
         });
     },

package/fe/model/types/data/search.d.ts

@@ -1,7 +1,7 @@
-import type { SchemaFormComponentPropsMap, SchemaFormFieldType } from '../../../packages/ui/react';
+import type { SchemaFormAllPropsMap, FormFieldType } from '../../../packages/ui/react';
 export type SearchOption = {
-    [K in SchemaFormFieldType]: {
+    [K in FormFieldType]: {
         comType: K;
-    } & SchemaFormComponentPropsMap[K];
-}[SchemaFormFieldType];
+    } & (K extends keyof SchemaFormAllPropsMap ? SchemaFormAllPropsMap[K] : unknown);
+}[FormFieldType];
 //# sourceMappingURL=search.d.ts.map

package/fe/packages/ui/react/components/Form/SchemaForm/data.d.ts

@@ -25,20 +25,15 @@ export declare namespace SchemaFormNamespace {
 export type ExtendedFieldType = Extract<keyof SchemaFormNamespace.FieldTypes | keyof SchemaFormNamespace.PropsMap, string>;
 export type SchemaFormAllFieldType = SchemaFormFieldType | ExtendedFieldType;
 export type SchemaFormAllPropsMap = SchemaFormComponentPropsMap & SchemaFormNamespace.PropsMap;
-export type SchemaFormComponent = React.LazyExoticComponent<React.ComponentType<any>>;
+export type SchemaFormComponent = React.ComponentType<any> | React.LazyExoticComponent<React.ComponentType<any>>;
 export declare const componentsMap: Record<SchemaFormAllFieldType, SchemaFormComponent>;
-export type SchemaFormBusinessComponentsMap = Partial<Record<ExtendedFieldType, SchemaFormComponent>>;
+export type SchemaFormComponentsMap = Partial<Record<ExtendedFieldType, SchemaFormComponent>>;
 export type FieldProps = {
-    [K in SchemaFormFieldType]: {
+    [K in SchemaFormAllFieldType]: {
         type: K;
-        fieldProps?: SchemaFormComponentPropsMap[K];
+        fieldProps?: K extends keyof SchemaFormAllPropsMap ? SchemaFormAllPropsMap[K] : unknown;
     };
-}[SchemaFormFieldType] | {
-    [K in ExtendedFieldType]: {
-        type: K;
-        fieldProps?: K extends keyof SchemaFormNamespace.PropsMap ? SchemaFormNamespace.PropsMap[K] : unknown;
-    };
-}[ExtendedFieldType] | {
+}[SchemaFormAllFieldType] | {
     type?: 'input';
     fieldProps?: InputProps;
 };

package/fe/packages/ui/react/components/Form/SchemaForm/data.js

@@ -1,4 +1,5 @@
-import businessComponentsMap from '$business/SchemaForm/data';
+import consumerComponentsMap from '@tc/scalability/SchemaForm/data';
+import frameComponentsMap from '@tc/scalability/SchemaForm/frameData';
 import React from 'react';
 const baseComponentsMap = {
     input: React.lazy(async () => ({ default: (await import('../../Input')).Input })),
@@ -12,5 +13,6 @@ const baseComponentsMap = {
 // componentsMap 合并内置 + 业务层扩展，支持动态注册新字段类型
 export const componentsMap = {
     ...baseComponentsMap,
-    ...businessComponentsMap,
+    ...frameComponentsMap,
+    ...consumerComponentsMap,
 };

package/fe/packages/ui/react/components/Form/SchemaForm/index.d.ts

@@ -6,7 +6,7 @@ import { type FormProps } from '..';
 import { type ButtonElementProps } from '../../Button';
 import type { LabelLayout } from '../../Label';
 import { type FieldProps, type SchemaFormAllFieldType } from './data';
-export type { FieldProps, SchemaFormComponentPropsMap, SchemaFormFieldType, SchemaFormNamespace, SchemaFormAllFieldType, SchemaFormAllPropsMap, SchemaFormBusinessComponentsMap, SchemaFormComponent } from './data';
+export type { FieldProps, SchemaFormAllFieldType, SchemaFormAllPropsMap, SchemaFormComponent, SchemaFormComponentsMap, SchemaFormComponentPropsMap, SchemaFormFieldType, SchemaFormNamespace, } from './data';
 export type FormFieldType = SchemaFormAllFieldType;
 type BaseField<T> = {
     [K in keyof T]: {

package/fe/packages/ui/react/hooks/useLanguage.d.ts

@@ -1,2 +1,2 @@
-export declare function useLanguage(): import("../../../common/index.js").I18nStore;
+export declare function useLanguage(): import("..").I18nStore;
 //# sourceMappingURL=useLanguage.d.ts.map

package/fe/packages/ui/react/i18n/useI18n.d.ts

@@ -1,9 +1,9 @@
 import type { I18nInterpolationValues, I18nTranslateOptions } from '../../../common/i18n';
 export declare const useI18nStore: import("..").StoreHook<{
-    getState: () => import("../../../common/index.js").I18nStore;
-    getInitialState: () => import("../../../common/index.js").I18nStore;
-    setState: (partial: Partial<import("../../../common/index.js").I18nStore> | ((state: import("../../../common/index.js").I18nStore) => Partial<import("../../../common/index.js").I18nStore>)) => void;
-    subscribe: (listener: import("../../../common/index.js").I18nStoreListener) => () => void;
+    getState: () => import("..").I18nStore;
+    getInitialState: () => import("..").I18nStore;
+    setState: (partial: Partial<import("..").I18nStore> | ((state: import("..").I18nStore) => Partial<import("..").I18nStore>)) => void;
+    subscribe: (listener: import("..").I18nStoreListener) => () => void;
 }>;
 /**
  * React 组件内使用的翻译 hook。

package/fe/typings/type.d.ts

@@ -1,5 +1,4 @@
 export type MOmit<T, K extends keyof T> = Omit<T, K>;
-export type UnionToTuple<T> = [
-    T
-] extends [never] ? [] : ((t: T) => T) extends ((t: infer U) => infer U) ? [...UnionToTuple<Exclude<T, U>>, U] : never;
+export type UnionToTuple<T> = [T] extends [never] ? [] : ((t: T) => T) extends (t: infer U) => infer U ? [...UnionToTuple<Exclude<T, U>>, U] : never;
+export type MergeType<T extends unknown[]> = T extends [infer F, ...infer R] ? F & (R extends [] ? MergeType<R> : {}) : {};
 //# sourceMappingURL=type.d.ts.map

package/model/types/data/search.d.ts

@@ -1,7 +1,7 @@
-import type { SchemaFormComponentPropsMap, SchemaFormFieldType } from '../../../fe/packages/ui/react';
+import type { SchemaFormAllPropsMap, FormFieldType } from '../../../fe/packages/ui/react';
 export type SearchOption = {
-    [K in SchemaFormFieldType]: {
+    [K in FormFieldType]: {
         comType: K;
-    } & SchemaFormComponentPropsMap[K];
-}[SchemaFormFieldType];
+    } & (K extends keyof SchemaFormAllPropsMap ? SchemaFormAllPropsMap[K] : unknown);
+}[FormFieldType];
 //# sourceMappingURL=search.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_tc/template-core",
-  "version": "0.0.1-bate.43",
+  "version": "0.0.1-bate.45",
   "description": "A TypeScript Koa framework template - Monorepo root",
   "main": "./index.js",
   "types": "./index.d.ts",

package/types/typings/type.d.ts

@@ -1,4 +1,3 @@
 export type MOmit<T, K extends keyof T> = Omit<T, K>;
-export type UnionToTuple<T> = [
-    T
-] extends [never] ? [] : ((t: T) => T) extends ((t: infer U) => infer U) ? [...UnionToTuple<Exclude<T, U>>, U] : never;
+export type UnionToTuple<T> = [T] extends [never] ? [] : ((t: T) => T) extends (t: infer U) => infer U ? [...UnionToTuple<Exclude<T, U>>, U] : never;
+export type MergeType<T extends unknown[]> = T extends [infer F, ...infer R] ? F & (R extends [] ? MergeType<R> : {}) : {};