annil 1.16.0 → 1.17.0

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.17.0](https://github.com/missannil/annil/compare/v1.16.0...v1.17.0) (2026-06-30)
+
+
+### Features
+
+* 注入配置完善组件覆盖逻辑 ([17b75c4](https://github.com/missannil/annil/commit/17b75c445dc46c39cd30b56ffeece992f88aa722))
+
 ## [1.16.0](https://github.com/missannil/annil/compare/v1.15.1...v1.16.0) (2026-06-18)
 
 

package/dist/api/DefineComponent/normalizeOptions/injectInfoHandler.js

@@ -10,7 +10,7 @@ function mergeOptions(finalOptionsForComponent, injectInfo) {
                     finalOptionsForComponent["behaviors"].push(...injectVal);
                     break;
                 default:
-                    finalOptionsForComponent[renamedKey] = Object.assign(originalVal, injectVal);
+                    finalOptionsForComponent[renamedKey] = Object.assign(injectVal, originalVal);
                     break;
             }
         }

package/dist/api/DefineComponent/normalizeOptions/injectInfoHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectInfoHandler.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/injectInfoHandler.ts"],"names":[],"mappings":"AAYA,SAAS,YAAY,CACnB,wBAAiD,EACjD,UAAuB;IAEvB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,GAAgB,CAAC;QACrC,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QAE1C,IAAI,GAAG,IAAI,wBAAwB,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,GAAoC,CAAC;YACxD,MAAM,WAAW,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;YACzD,QAAQ,WAAW,EAAE,CAAC;gBACpB,KAAK,WAAW;oBACd,wBAAwB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,SAAqB,CAAC,CAAC;oBAErE,MAAM;gBAER;oBAEE,wBAAwB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;oBAE7E,MAAM;YACV,CAAC;QACH,CAAC;aAAM,CAAC;YAEN,wBAAwB,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC;AACD,MAAM,UAAU,iBAAiB,CAC/B,wBAAiD,EACjD,UAAmC;IAEnC,IAAI,CAAC,UAAU;QAAE,OAAO,wBAAwB,CAAC;IAEjD,OAAO,YAAY,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"injectInfoHandler.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/injectInfoHandler.ts"],"names":[],"mappings":"AAYA,SAAS,YAAY,CACnB,wBAAiD,EACjD,UAAuB;IAEvB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,GAAgB,CAAC;QACrC,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QAE1C,IAAI,GAAG,IAAI,wBAAwB,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,GAAoC,CAAC;YACxD,MAAM,WAAW,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;YACzD,QAAQ,WAAW,EAAE,CAAC;gBACpB,KAAK,WAAW;oBACd,wBAAwB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,SAAqB,CAAC,CAAC;oBAErE,MAAM;gBAER;oBAEE,wBAAwB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;oBAE7E,MAAM;YACV,CAAC;QACH,CAAC;aAAM,CAAC;YAEN,wBAAwB,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC;AACD,MAAM,UAAU,iBAAiB,CAC/B,wBAAiD,EACjD,UAAmC;IAEnC,IAAI,CAAC,UAAU;QAAE,OAAO,wBAAwB,CAAC;IAEjD,OAAO,YAAY,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AAC5D,CAAC"}

package/dist/api/InstanceInject/instanceConfig.d.ts

@@ -16,8 +16,8 @@ interface BaseInjectInfo {
 }
 export interface IInjectInfo extends BaseInjectInfo {
 }
-export type IInjectAllData = IfEquals<{}, injectData & IInjectStore, {}, ComputeIntersection<injectData & IInjectStore>>;
-type injectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
+export type InjectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
+export type IInjectAllData = IfEquals<{}, InjectData & IInjectStore, {}, ComputeIntersection<InjectData & IInjectStore>>;
 export type IInjectStore = StoreConstraint extends IInjectInfo["store"] ? {} : ReturnTypeInObject<IInjectInfo["store"]>;
 export type IInjectMethods = MethodsConstraint extends IInjectInfo["methods"] ? {} : IInjectInfo["methods"];
 declare class InstanceConfig {

package/dist/api/InstanceInject/instanceConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"instanceConfig.js","sourceRoot":"","sources":["../../../src/api/InstanceInject/instanceConfig.ts"],"names":[],"mappings":"AAuCA,MAAM,cAAc;IAApB;QACU,SAAI,GAAiC,EAAE,CAAC;IAOlD,CAAC;IANC,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IACM,aAAa,CAAC,IAA6B;QAChD,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACxC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
+{"version":3,"file":"instanceConfig.js","sourceRoot":"","sources":["../../../src/api/InstanceInject/instanceConfig.ts"],"names":[],"mappings":"AAsCA,MAAM,cAAc;IAApB;QACU,SAAI,GAAiC,EAAE,CAAC;IAOlD,CAAC;IANC,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IACM,aAAa,CAAC,IAA6B;QAChD,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACxC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}

package/dist/api/RootComponent/index.d.ts

@@ -6,7 +6,7 @@ import type { ComputeObject } from "../../types/ComputeObject";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { RemoveNullOfRequired } from "../../types/RemoveNullOfRequired";
 import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
-import type { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { IInjectAllData, IInjectMethods, IInjectStore, InjectData } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
 import type { GetComputedDef } from "./Computed/GetComputedDef";
@@ -30,8 +30,8 @@ import type { GetStoreDef } from "./Store/GetStoreDef";
 import type { StoreConstraint } from "./Store/StoreConstraint";
 import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
-type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDef extends object, CustomEventsDef extends object, PropertiesDef extends object, DataDef extends object, StoreDef extends object, ComputedDef extends object> = MethodsOption<TMethods, keyof (EventsDef & CustomEventsDef)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & IfExtends<TIsPage, false, CustomEventsOption<TCustomEvents, keyof EventsDef>, {}> & DataOption<TData, keyof PropertiesDef> & StoreOption<TStore, keyof (PropertiesDef & DataDef)> & ComputedOption<TComputed, keyof (PropertiesDef & DataDef & StoreDef)> & PageLifetimesOption<TIsPage, PropertiesDef> & LifetimesOption & WatchOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDef, DataDef & Required<PropertiesDef> & StoreDef & ComputedDef, CustomEventsDef, StoreDef>>;
-type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <TEvents extends EventsConstraint<TComponentDocList>, TStore extends StoreConstraint<PropertiesDef>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDef extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDef extends object = GetCustomEventsDef<TCustomEvents>, PropertiesDef extends object = GetPropertiesDef<TProperties>, DataDef extends object = TData, StoreDef extends object = StoreConstraint<PropertiesDef> extends TStore ? {} : GetStoreDef<TStore>, ComputedDef extends object = GetComputedDef<TComputed>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDef, CustomEventsDef, PropertiesDef, DataDef, StoreDef, ComputedDef>) => ComputeIntersection<IfExtends<TIsPage, false, {}, {
+type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDef extends object, CustomEventsDef extends object, PropertiesDef extends object, DataDef extends object, StoreDef extends object, ComputedDef extends object, SelfAllDatas extends object, ValidInjectDatas extends object> = MethodsOption<TMethods, keyof (EventsDef & CustomEventsDef)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & IfExtends<TIsPage, false, CustomEventsOption<TCustomEvents, keyof EventsDef>, {}> & DataOption<TData, keyof PropertiesDef> & StoreOption<TStore, keyof (PropertiesDef & DataDef)> & ComputedOption<TComputed, keyof (PropertiesDef & DataDef & StoreDef)> & PageLifetimesOption<TIsPage, PropertiesDef> & LifetimesOption & WatchOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods & Omit<IInjectMethods, keyof TMethods>, DataDef, SelfAllDatas & ValidInjectDatas, CustomEventsDef, StoreDef>>;
+type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <TEvents extends EventsConstraint<TComponentDocList>, TStore extends StoreConstraint<ComputeIntersection<Required<PropertiesDef> & DataDef & Omit<InjectData, keyof (PropertiesDef & DataDef)>>>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDef extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDef extends object = GetCustomEventsDef<TCustomEvents>, PropertiesDef extends object = GetPropertiesDef<TProperties>, DataDef extends object = TData, StoreDef extends object = StoreConstraint<ComputeIntersection<Required<PropertiesDef> & DataDef & Omit<InjectData, keyof (PropertiesDef & DataDef)>>> extends TStore ? {} : GetStoreDef<TStore>, ComputedDef extends object = GetComputedDef<TComputed>, SelfAllDatas extends object = Required<PropertiesDef> & DataDef & StoreDef & ComputedDef, ValidInjectDatas extends object = Omit<IInjectAllData, keyof SelfAllDatas>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDef, CustomEventsDef, PropertiesDef, DataDef, StoreDef, ComputedDef, SelfAllDatas, ValidInjectDatas>) => ComputeIntersection<IfExtends<TIsPage, false, {}, {
     isPage: true;
 }> & IfExtends<EmptyObject, PropertiesDef, {}, {
     properties: IfExtends<false, TIsPage, PropertiesDef, RemoveNullOfRequired<PropertiesDef>>;

package/dist/api/RootComponent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA8IA,MAAM,UAAU,aAAa;IAO3B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC;AACnC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AAyJA,MAAM,UAAU,aAAa;IAO3B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC;AACnC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/api/DefineComponent/normalizeOptions/injectInfoHandler.ts

@@ -29,7 +29,7 @@ function mergeOptions(
 
         default:
           // @ts-ignore
-          finalOptionsForComponent[renamedKey] = Object.assign(originalVal, injectVal);
+          finalOptionsForComponent[renamedKey] = Object.assign(injectVal, originalVal);
 
           break;
       }

package/src/api/InstanceInject/inject.ts

@@ -11,15 +11,20 @@ wx.onThemeChange((Res) => {
 });
 
 // 注入的方法;
-function injectMethod(data: string) {
+function injectMethodA(data: string) {
+  return data;
+}
+function injectMethodB(data: number) {
   return data;
 }
 
 const data = {
   injectStr: "injectStr",
+  injectNum: 123,
 };
 const methods = {
-  injectMethod,
+  injectMethodA,
+  injectMethodB,
 };
 const store = {
   injectTheme: () => themeStore.theme,

package/src/api/InstanceInject/instanceConfig.ts

@@ -19,16 +19,15 @@ interface BaseInjectInfo {
 
 export interface IInjectInfo extends BaseInjectInfo {
 }
+export type InjectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
 
 export type IInjectAllData = IfEquals<
   {},
-  injectData & IInjectStore,
+  InjectData & IInjectStore,
   {},
-  ComputeIntersection<injectData & IInjectStore>
+  ComputeIntersection<InjectData & IInjectStore>
 >;
 
-type injectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
-
 export type IInjectStore = StoreConstraint extends IInjectInfo["store"] ? {}
   : ReturnTypeInObject<IInjectInfo["store"]>;
 

package/src/api/InstanceInject/test/normal.test.ts

@@ -10,7 +10,7 @@ RootComponent()({
 
       Checking<typeof this.data.injectTheme, "dark" | "light" | undefined, Test.Pass>;
 
-      Checking<typeof this.injectMethod, (data: string) => string, Test.Pass>;
+      Checking<typeof this.injectMethodA, (data: string) => string, Test.Pass>;
     },
   },
 });
@@ -18,12 +18,12 @@ RootComponent()({
 // 2. 注入字段重复时,自身覆盖注入类型
 RootComponent()({
   data: {
-    // 覆盖注入的数据类型
+    // 覆盖注入的数据类型,注入的类型为string。
     injectStr: 123,
   },
   store: {
-    // 覆盖注入的数据类型
-    injectTheme: (() => "aaa") as () => "aaa",
+    // 覆盖注入的数据类型,注入的类型为"dark" | "light" | undefined。
+    injectTheme: () => "aaa",
   },
   methods: {
     // 覆盖注入的方法类型
@@ -31,9 +31,10 @@ RootComponent()({
       return 123;
     },
     testInjectTypes() {
+      // 覆盖注入的数据类型,注入的类型为string。
       Checking<typeof this.data.injectStr, number, Test.Pass>;
-
-      Checking<typeof this.data.injectTheme, "aaa", Test.Pass>;
+      // 覆盖注入的数据类型,注入的类型为"dark" | "light" | undefined。
+      Checking<typeof this.data.injectTheme, string, Test.Pass>;
 
       Checking<typeof this.injectMethod, () => 123, Test.Pass>;
     },

package/src/api/RootComponent/Instance/test/datas/mormal.test.ts

@@ -0,0 +1,43 @@
+import { Checking, type Test } from "hry-types";
+import { type DetailedType, RootComponent } from "../../../../..";
+
+// 组件时
+RootComponent()({
+  properties: {
+    obj: Object,
+    optionalObj: {
+      type: Object as DetailedType<{ name: string }>,
+      value: { name: "zhao" },
+    },
+  },
+  data: {
+    dataStr: "dataStr",
+    // 相同字段覆盖注入类型
+    injectStr: 123,
+  },
+  store: {
+    storeData: (data) => {
+      return data.optionalObj.name;
+    },
+  },
+  lifetimes: {
+    attached() {
+      // 组件实例对象格外添加null类型
+      Checking<
+        typeof this.data,
+        {
+          optionalObj: {
+            name: string;
+          };
+          obj: object;
+          dataStr: string;
+          storeData: string;
+          injectTheme: "dark" | "light" | undefined;
+          injectStr: number; // 相同字段覆盖注入类型 injectStr: string -> number
+          injectNum: number;
+        },
+        Test.Pass
+      >();
+    },
+  },
+});

package/src/api/RootComponent/Instance/test/methods/mormal.test.ts

@@ -3,14 +3,23 @@ import { RootComponent } from "../../../../..";
 
 RootComponent()({
   methods: {
+    // 与注入方法同名,会覆盖注入方法
+    injectMethodB(num: string) {
+      return num;
+    },
+
     M1() {
       return 1;
     },
 
     M2(str: string) {
-      void Checking<typeof this.M1, () => 1, Test.Pass>;
+      Checking<typeof this.M1, () => 1, Test.Pass>();
+
+      Checking<typeof this.M2, (str: string) => string, Test.Pass>();
 
-      void Checking<typeof this.M2, (str: string) => string, Test.Pass>;
+      Checking<typeof this.injectMethodA, (str: string) => string, Test.Pass>();
+      // 自身方法会覆盖注入方法,所以类型为自身方法的类型
+      Checking<typeof this.injectMethodB, (num: string) => string, Test.Pass>();
 
       return str;
     },

package/src/api/RootComponent/Store/test/normal.test.ts

@@ -1,3 +1,4 @@
+import { Checking, type Test } from "hry-types";
 import { observable } from "mobx";
 import { typeEqual } from "../../../../utils/_utils";
 import { RootComponent } from "../..";
@@ -9,15 +10,30 @@ const user = observable({
 const storeDoc = RootComponent()({
   properties: {
     condition: Number,
+    optional: {
+      type: Number,
+      value: 10,
+    },
+  },
+  data: {
+    injectStr: 123,
   },
   store: {
-    // normal
+    // 1. 简单的箭头函数写法
     userName: () => user.name,
-    // 条件反应式,当condition>10时,响应式,否则不可响应式(返回undefined),但不报错(有警告).
-    userAge: (props) => {
-      if (props.condition > 10) {
+    // 2. 使用参数 datas
+    userAge: (datas) => {
+      // 参数类型为Required<PropertiesDef> & DataDef & Omit<InjectData, keyof (PropertiesDef & DataDef).
+      Checking<
+        typeof datas,
+        { condition: number; optional: number; injectStr: number; injectNum: number },
+        Test.Pass
+      >();
+
+      if (datas.condition > 10) {
         return user.age;
       }
+      // 返回undefined时字段不会被响应式追踪,不会报错(有警告).
       return undefined;
     },
   },
@@ -25,8 +41,12 @@ const storeDoc = RootComponent()({
 
 type StoreDocExpected = {
   properties: {
+    optional?: number;
     condition: number;
   };
+  data: {
+    injectStr: number;
+  };
   store: {
     userName: string;
     userAge: number | undefined;

package/src/api/RootComponent/index.ts

@@ -6,7 +6,7 @@ import type { ComputeObject } from "../../types/ComputeObject";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { RemoveNullOfRequired } from "../../types/RemoveNullOfRequired";
 import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
-import type { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { IInjectAllData, IInjectMethods, IInjectStore, InjectData } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
 import type { GetComputedDef } from "./Computed/GetComputedDef";
@@ -46,6 +46,8 @@ type RootComponentOptions<
   DataDef extends object,
   StoreDef extends object,
   ComputedDef extends object,
+  SelfAllDatas extends object,
+  ValidInjectDatas extends object,
 > =
   & MethodsOption<TMethods, keyof (EventsDef & CustomEventsDef)>
   & PropertiesOption<TProperties>
@@ -57,7 +59,7 @@ type RootComponentOptions<
   & ComputedOption<
     TComputed,
     keyof (PropertiesDef & DataDef & StoreDef)
-  > // { data: ComputeObject<DataDef & Required<PropertiesDef> & StoreDef & ComputedDef & IInjectAllData> }
+  >
   & PageLifetimesOption<TIsPage, PropertiesDef>
   & LifetimesOption
   & WatchOption<
@@ -78,9 +80,9 @@ type RootComponentOptions<
   & ThisType<
     RootComponentInstance<
       TIsPage,
-      TMethods,
+      TMethods & Omit<IInjectMethods, keyof TMethods>,
       DataDef,
-      DataDef & Required<PropertiesDef> & StoreDef & ComputedDef,
+      SelfAllDatas & ValidInjectDatas,
       CustomEventsDef,
       StoreDef
     >
@@ -88,7 +90,9 @@ type RootComponentOptions<
 
 type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <
   TEvents extends EventsConstraint<TComponentDocList>,
-  TStore extends StoreConstraint<PropertiesDef>,
+  TStore extends StoreConstraint<
+    ComputeIntersection<Required<PropertiesDef> & DataDef & Omit<InjectData, keyof (PropertiesDef & DataDef)>>
+  >,
   TIsPage extends boolean = false,
   const TProperties extends PropertiesConstraint = {},
   TData extends object = {},
@@ -100,8 +104,13 @@ type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <
   CustomEventsDef extends object = GetCustomEventsDef<TCustomEvents>,
   PropertiesDef extends object = GetPropertiesDef<TProperties>,
   DataDef extends object = TData,
-  StoreDef extends object = StoreConstraint<PropertiesDef> extends TStore ? {} : GetStoreDef<TStore>,
+  StoreDef extends object = StoreConstraint<
+    ComputeIntersection<Required<PropertiesDef> & DataDef & Omit<InjectData, keyof (PropertiesDef & DataDef)>>
+  > extends TStore ? {}
+    : GetStoreDef<TStore>,
   ComputedDef extends object = GetComputedDef<TComputed>,
+  SelfAllDatas extends object = Required<PropertiesDef> & DataDef & StoreDef & ComputedDef,
+  ValidInjectDatas extends object = Omit<IInjectAllData, keyof SelfAllDatas>,
 >(
   options: RootComponentOptions<
     TEvents,
@@ -118,7 +127,9 @@ type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <
     PropertiesDef,
     DataDef,
     StoreDef,
-    ComputedDef
+    ComputedDef,
+    SelfAllDatas,
+    ValidInjectDatas
   >,
 ) => // 生成RootComponentDefinition
 ComputeIntersection<
@@ -149,3 +160,5 @@ export function RootComponent<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return (options: any) => options;
 }
+
+// 全局实例增加 有效的注入数据,store字段参数包含 (prop + data + 有效的注入数据)