@cloudbase/cals 0.5.11 → 0.5.12-aplph.1

package/lib/utils/dts/auto-generated.d.ts

@@ -1,2 +1,2 @@
-export declare const wedaDTS = "\ndeclare class UserWidget {\n  // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n  // \u5185\u7F6E\u547D\u540D\u7A7A\u95F4\n  // get sys(): {\n  //   readonly id: string;\n  //   readonly module: string;\n  //   readonly component: string;\n  //   readonly parent: UserWidget;\n  //   readonly children: UserWidget[];\n\n  //   closest(filter?: (parentWidget: UserWidget) => boolean): UserWidget | null;\n  // };\n\n  // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n  // \u81EA\u5B9A\u4E49\u547D\u540D\u7A7A\u95F4\n  // get custom(): { [key: string]: any };\n\n  // ========== \u5FEB\u6377\u8BBF\u95EE\u65B9\u5F0F ========== //\n\n  /**\n   * \u7EC4\u4EF6 id\n   */\n  readonly id: string;\n  /**\n   * \u7EC4\u4EF6\u5E93\u540D\u79F0\n   */\n  readonly module: string;\n  /**\n   * \u7EC4\u4EF6\u540D\u79F0\n   */\n  readonly component: string;\n  // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n  // readonly parent: UserWidget;\n  // readonly children: UserWidget[];\n\n  // closest(filter?: (parentWidget: UserWidget) => boolean): UserWidget | null;\n}\n\n// Used Components Inner Begin\n// Used Components - Don't touch me\n// Used Components Inner End\n\ndeclare namespace $app {\n  namespace dataset {\n\n    const state: {\n      // Global State Inner Begin\n      // Global State \u5168\u5C40\u53D8\u91CF - Don't touch me\n      // Global State Inner End\n    }\n\n  }\n\n  namespace utils {\n     function ABS(num: number): number;\n function Min(...args: number[]): number;\n function Max(...args: number[]): number;\n function Average(...args: number[]): number;\n function Floor(num: number): number;\n function Ceiling(num: number): number;\n function Round(num: number): number;\n function Sum(...args: number[]): number;\n function Rand(num: number): number;\n\n function If(condition: boolean, val1: any, val2: any): any;\n function IsEmpty(text: string | string[]): boolean;\n function NotNull(val: any): boolean;\n function And(...args: boolean[]): boolean;\n function Or(...args: boolean[]): boolean;\n\n function Len(text: string): number;\n function Contains(text1: string, text2: string): boolean;\n function Split(text1: string, text2: string): string[];\n function Trim(text: string): string;\n function Upper(text: string): string;\n function Lower(text: string): string;\n function Concat(...text: string[]): string;\n\n function Now(): number;\n function Timestamp(arg: number | string | Date): number;\n function Second(arg: number | string | Date): number;\n function Minute(arg: number | string | Date): number;\n function Hour(arg: number | string | Date): number;\n function Day(arg: number | string | Date): number;\n function DayOfWeek(arg: number | string | Date): number;\n function Month(arg: number | string | Date): number;\n function Year(arg: number | string | Date): number;\n function GetDate(year: number, month: number, day: number): number;\n function DateTimeValue(arg: string, val: string): number;\n function Age(arg: number | string | Date, val: number | string | Date): number;\n function AgeOfNow(arg: number | string | Date): number;\n function DateAdd(arg: number | string | Date, day: number): number;\n function MonthAdd(arg: number | string | Date, month: number): number;\n function YearAdd(arg: number | string | Date, year: number): number;\n function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function DateText(createdTime: number | string | Date, text: string): string;\n function IsToday(date: number | string | Date): boolean;\n\n  }\n\n  namespace common {\n    // Global Common Inner Begin\n    // Global Common \u5168\u5C40\u65B9\u6CD5 - Don't touch me\n    // Global Common Inner End\n  }\n\n  namespace auth {\n    const currentUser: {\n  userId?: string\n  phone?: string\n  type?: number\n  relatedRoles?: {\n    id?: string\n    envId?: string\n    name?: string\n    roleIdentity?: string\n  }[]\n  openId?: string\n  name?: string\n  nickName?: string\n  email?: string\n  mainOrg?: {\n    id?: string\n    name?: string\n  }\n  orgs?: {\n    id?: string\n    name?: string\n  }[]\n}\n\n  }\n\n  \n\ninterface navigatorOptions {\n  packageName: string;\n  pageId: string;\n  data?: Record<string, any>;\n  params?: Record<string, any>;\n  events?: Record<string, (data: any) => void>;\n  success(res: any);\n  fail(res: any);\n  complete(res: any);\n}\n\ninterface navigateBackOptions {\n  delta: number;\n}\n\n// \u8BBE\u7F6E\u72B6\u6001\nfunction setState(userSetState: Record<string, any>): void\n\n// \u7279\u5236\u8DEF\u7531\nfunction navigateTo(options: navigatorOptions)\nfunction redirectTo(options: navigatorOptions)\nfunction reLaunch(options: navigatorOptions)\nfunction navigateBack(options: navigateBackOptions)\n\n// \u663E\u793A\u63D0\u793A\nfunction showToast(options);\n\n// \u663E\u793A\u6A21\u6001\u63D0\u793A\nfunction showModal(options);\n\n// \u663E\u793A loading \u63D0\u793A\nfunction showLoading(options);\n\n// \u9690\u85CF loading \u63D0\u793A\nfunction hideLoading(options);\n\n// \u9690\u85CF\u63D0\u793A\nfunction hideToast(options);\n\n// sacnCode\nfunction scanCode(options: {\n  onlyFromCamera?: boolean;\n  enableDefaultBehavior?: boolean;\n  scanType?: ('barCode' | 'qrCode')[];\n  success?: (res: { result: string; scanType: string }) => void;\n  fail?: (err: Error) => void;\n  complete?: () => void;\n}): Promise<ScanCodeResult> | ScanCodeResult;\n\n\n}\n\ndeclare const app = $app\n\ndeclare namespace $w {\n   function ABS(num: number): number;\n function Min(...args: number[]): number;\n function Max(...args: number[]): number;\n function Average(...args: number[]): number;\n function Floor(num: number): number;\n function Ceiling(num: number): number;\n function Round(num: number): number;\n function Sum(...args: number[]): number;\n function Rand(num: number): number;\n\n function If(condition: boolean, val1: any, val2: any): any;\n function IsEmpty(text: string | string[]): boolean;\n function NotNull(val: any): boolean;\n function And(...args: boolean[]): boolean;\n function Or(...args: boolean[]): boolean;\n\n function Len(text: string): number;\n function Contains(text1: string, text2: string): boolean;\n function Split(text1: string, text2: string): string[];\n function Trim(text: string): string;\n function Upper(text: string): string;\n function Lower(text: string): string;\n function Concat(...text: string[]): string;\n\n function Now(): number;\n function Timestamp(arg: number | string | Date): number;\n function Second(arg: number | string | Date): number;\n function Minute(arg: number | string | Date): number;\n function Hour(arg: number | string | Date): number;\n function Day(arg: number | string | Date): number;\n function DayOfWeek(arg: number | string | Date): number;\n function Month(arg: number | string | Date): number;\n function Year(arg: number | string | Date): number;\n function GetDate(year: number, month: number, day: number): number;\n function DateTimeValue(arg: string, val: string): number;\n function Age(arg: number | string | Date, val: number | string | Date): number;\n function AgeOfNow(arg: number | string | Date): number;\n function DateAdd(arg: number | string | Date, day: number): number;\n function MonthAdd(arg: number | string | Date, month: number): number;\n function YearAdd(arg: number | string | Date, year: number): number;\n function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function DateText(createdTime: number | string | Date, text: string): string;\n function IsToday(date: number | string | Date): boolean;\n\n\n  // used widgets Inner Begin\n  // used widgets - Don't touch me\n  // used widgets Inner End\n\n  // repeater scope Inner Begin\n  // repeater scope - Don't touch me\n  // repeater scope Inner End\n}\n\n// Global For Begin\ndeclare const $for: {\n  // Global For Inner Begin\n  // For \u5FAA\u73AF\u53D8\u91CF - Don't touch me\n  // Global For Inner End\n}\ndeclare const forItems = $for\n// Global For End\n\n// $page Begin\ndeclare namespace $page {\n  namespace dataset {\n\n    const state: {\n      // Page State Inner Begin\n      // Page State \u9875\u9762\u53D8\u91CF - Don't touch me\n      // Page State Inner End\n    }\n\n    const params: {\n      // Page Param Inner Begin\n      // Page Param \u9875\u9762\u53C2\u6570 - Don't touch me\n      // Page Param Inner End\n    }\n\n  }\n\n  namespace handler {\n    // Page Handler Inner Begin\n    // Page Handler \u9875\u9762\u65B9\u6CD5 - Don't touch me\n    // Page Handler Inner End\n  }\n\n  \n\n// \u8BBE\u7F6E\u72B6\u6001\nfunction setState(userSetState: Record<string, any>): void\n\n\n}\n// $page End\n\n// $comp Begin\ndeclare namespace $comp {\n\n  namespace props {\n\n    const data: {\n      // Comp Prop Data Inner Begin\n      // Comp Prop Data \u7EC4\u4EF6\u5C5E\u6027 - Don't touch me\n      // Comp Prop Data Inner End\n    }\n\n    namespace events {\n      // Comp Prop Events Inner Begin\n      // Comp Prop Events \u7EC4\u4EF6\u4E8B\u4EF6 - Don't touch me\n      // Comp Prop Events Inner End\n    }\n\n  }\n\n  namespace dataset {\n\n    const state: {\n      // Comp State Inner Begin\n      // Comp State \u7EC4\u4EF6\u53D8\u91CF - Don't touch me\n      // Comp State Inner End\n    }\n\n  }\n\n  namespace handler {\n    // Comp Handler Inner Begin\n    // Comp Handler \u7EC4\u4EF6\u65B9\u6CD5 - Don't touch me\n    // Comp Handler Inner End\n  }\n\n}\n// $comp End\n\n// Global Formula Begin\n\ndeclare function ABS(num: number): number;\ndeclare function Min(...args: number[]): number;\ndeclare function Max(...args: number[]): number;\ndeclare function Average(...args: number[]): number;\ndeclare function Floor(num: number): number;\ndeclare function Ceiling(num: number): number;\ndeclare function Round(num: number): number;\ndeclare function Sum(...args: number[]): number;\ndeclare function Rand(num: number): number;\n\ndeclare function If(condition: boolean, val1: any, val2: any): any;\ndeclare function IsEmpty(text: string | string[]): boolean;\ndeclare function NotNull(val: any): boolean;\ndeclare function And(...args: boolean[]): boolean;\ndeclare function Or(...args: boolean[]): boolean;\n\ndeclare function Len(text: string): number;\ndeclare function Contains(text1: string, text2: string): boolean;\ndeclare function Split(text1: string, text2: string): string[];\ndeclare function Trim(text: string): string;\ndeclare function Upper(text: string): string;\ndeclare function Lower(text: string): string;\ndeclare function Concat(...text: string[]): string;\n\ndeclare function Now(): number;\ndeclare function Timestamp(arg: number | string | Date): number;\ndeclare function Second(arg: number | string | Date): number;\ndeclare function Minute(arg: number | string | Date): number;\ndeclare function Hour(arg: number | string | Date): number;\ndeclare function Day(arg: number | string | Date): number;\ndeclare function DayOfWeek(arg: number | string | Date): number;\ndeclare function Month(arg: number | string | Date): number;\ndeclare function Year(arg: number | string | Date): number;\ndeclare function GetDate(year: number, month: number, day: number): number;\ndeclare function DateTimeValue(arg: string, val: string): number;\ndeclare function Age(arg: number | string | Date, val: number | string | Date): number;\ndeclare function AgeOfNow(arg: number | string | Date): number;\ndeclare function DateAdd(arg: number | string | Date, day: number): number;\ndeclare function MonthAdd(arg: number | string | Date, month: number): number;\ndeclare function YearAdd(arg: number | string | Date, year: number): number;\ndeclare function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function DateText(createdTime: number | string | Date, text: string): string;\ndeclare function IsToday(date: number | string | Date): boolean;\n\n\n// Global Formula End\n";
+export declare const wedaDTS = "declare class UserWidget {\n  // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n  // \u5185\u7F6E\u547D\u540D\u7A7A\u95F4\n  // get sys(): {\n  //   readonly id: string;\n  //   readonly module: string;\n  //   readonly component: string;\n  //   readonly parent: UserWidget;\n  //   readonly children: UserWidget[];\n\n  //   closest(filter?: (parentWidget: UserWidget) => boolean): UserWidget | null;\n  // };\n\n  // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n  // \u81EA\u5B9A\u4E49\u547D\u540D\u7A7A\u95F4\n  // get custom(): { [key: string]: any };\n\n  // ========== \u5FEB\u6377\u8BBF\u95EE\u65B9\u5F0F ========== //\n\n  /**\n   * \u7EC4\u4EF6 id\n   */\n  readonly id: string;\n  /**\n   * \u7EC4\u4EF6\u5E93\u540D\u79F0\n   */\n  readonly module: string;\n  /**\n   * \u7EC4\u4EF6\u540D\u79F0\n   */\n  readonly component: string;\n  // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n  // readonly parent: UserWidget;\n  // readonly children: UserWidget[];\n\n  // closest(filter?: (parentWidget: UserWidget) => boolean): UserWidget | null;\n}\n\n// Used Components Inner Begin\n// Used Components - Don't touch me\n// Used Components Inner End\n\ndeclare namespace $app {\n  namespace dataset {\n\n    const state: {\n      // Global State Inner Begin\n      // Global State \u5168\u5C40\u53D8\u91CF - Don't touch me\n      // Global State Inner End\n    }\n\n  }\n\n  namespace utils {\n     function ABS(num: number): number;\n function Min(...args: number[]): number;\n function Max(...args: number[]): number;\n function Average(...args: number[]): number;\n function Floor(num: number): number;\n function Ceiling(num: number): number;\n function Round(num: number): number;\n function Sum(...args: number[]): number;\n function Rand(num: number): number;\n\n function If(condition: boolean, val1: any, val2: any): any;\n function IsEmpty(text: string | string[]): boolean;\n function NotNull(val: any): boolean;\n function And(...args: boolean[]): boolean;\n function Or(...args: boolean[]): boolean;\n\n function Len(text: string): number;\n function Contains(text1: string, text2: string): boolean;\n function Split(text1: string, text2: string): string[];\n function Trim(text: string): string;\n function Upper(text: string): string;\n function Lower(text: string): string;\n function Concat(...text: string[]): string;\n\n function Now(): number;\n function Timestamp(arg: number | string | Date): number;\n function Second(arg: number | string | Date): number;\n function Minute(arg: number | string | Date): number;\n function Hour(arg: number | string | Date): number;\n function Day(arg: number | string | Date): number;\n function DayOfWeek(arg: number | string | Date): number;\n function Month(arg: number | string | Date): number;\n function Year(arg: number | string | Date): number;\n function GetDate(year: number, month: number, day: number): number;\n function DateTimeValue(arg: string, val: string): number;\n function Age(arg: number | string | Date, val: number | string | Date): number;\n function AgeOfNow(arg: number | string | Date): number;\n function DateAdd(arg: number | string | Date, day: number): number;\n function MonthAdd(arg: number | string | Date, month: number): number;\n function YearAdd(arg: number | string | Date, year: number): number;\n function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function DateText(createdTime: number | string | Date, text: string): string;\n function IsToday(date: number | string | Date): boolean;\n\n  }\n\n  namespace common {\n    // Global Common Inner Begin\n    // Global Common \u5168\u5C40\u65B9\u6CD5 - Don't touch me\n    // Global Common Inner End\n  }\n\n  // $w.auth\n  interface CurrentUserInfo {\n  userId?: string;\n  phone?: string;\n  type?: number;\n  relatedRoles?: {\n    id?: string;\n    envId?: string;\n    name?: string;\n    roleIdentity?: string;\n  }[];\n  openId?: string;\n  name?: string;\n  nickName?: string;\n  email?: string;\n  mainOrg?: {\n    id?: string;\n    name?: string;\n  };\n  orgs?: {\n    id?: string;\n    name?: string;\n  }[];\n}\n namespace auth {\n  function getUserInfo(): CurrentUserInfo;\n  const currentUser: CurrentUserInfo;\n}\n\n\n  // \u8BBE\u7F6E\u72B6\u6001\n  \n  function setState(userSetState: Record<string, any>): void;\n  \n\n  \n  interface navigatorOptions {\n    packageName: string;\n    pageId: string;\n    data?: Record<string, any>;\n    params?: Record<string, any>;\n    events?: Record<string, (data: any) => void>;\n    success(res: any);\n    fail(res: any);\n    complete(res: any);\n  }\n\n  interface navigateBackOptions {\n    delta: number;\n  }\n\n  // \u663E\u793A\u63D0\u793A\n  function showToast(options);\n\n  // \u663E\u793A loading \u63D0\u793A\n  function showLoading(options);\n\n  // \u9690\u85CF loading \u63D0\u793A\n  function hideLoading(options);\n\n  // \u663E\u793A\u6A21\u6001\u63D0\u793A\n  function showModal(options);\n\n  // \u62E8\u6253\u7535\u8BDD\n  function callPhone(options);\n\n  // sacnCode\n  function scanCode(options: {\n    onlyFromCamera?: boolean;\n    enableDefaultBehavior?: boolean;\n    scanType?: ('barCode' | 'qrCode')[];\n    success?: (res: { result: string; scanType: string }) => void;\n    fail?: (err: Error) => void;\n    complete?: () => void;\n  }): Promise<ScanCodeResult> | ScanCodeResult;\n\n  // \u7279\u5236\u8DEF\u7531\n  function navigateTo(options: navigatorOptions);\n\n  function redirectTo(options: navigatorOptions);\n\n  function reLaunch(options: navigatorOptions);\n\n  function relaunchHome();\n\n  function navigateBack(options: navigateBackOptions);\n\n  \n}\n\ndeclare const app = $app\n\n\ndeclare namespace $w {\n   function ABS(num: number): number;\n function Min(...args: number[]): number;\n function Max(...args: number[]): number;\n function Average(...args: number[]): number;\n function Floor(num: number): number;\n function Ceiling(num: number): number;\n function Round(num: number): number;\n function Sum(...args: number[]): number;\n function Rand(num: number): number;\n\n function If(condition: boolean, val1: any, val2: any): any;\n function IsEmpty(text: string | string[]): boolean;\n function NotNull(val: any): boolean;\n function And(...args: boolean[]): boolean;\n function Or(...args: boolean[]): boolean;\n\n function Len(text: string): number;\n function Contains(text1: string, text2: string): boolean;\n function Split(text1: string, text2: string): string[];\n function Trim(text: string): string;\n function Upper(text: string): string;\n function Lower(text: string): string;\n function Concat(...text: string[]): string;\n\n function Now(): number;\n function Timestamp(arg: number | string | Date): number;\n function Second(arg: number | string | Date): number;\n function Minute(arg: number | string | Date): number;\n function Hour(arg: number | string | Date): number;\n function Day(arg: number | string | Date): number;\n function DayOfWeek(arg: number | string | Date): number;\n function Month(arg: number | string | Date): number;\n function Year(arg: number | string | Date): number;\n function GetDate(year: number, month: number, day: number): number;\n function DateTimeValue(arg: string, val: string): number;\n function Age(arg: number | string | Date, val: number | string | Date): number;\n function AgeOfNow(arg: number | string | Date): number;\n function DateAdd(arg: number | string | Date, day: number): number;\n function MonthAdd(arg: number | string | Date, month: number): number;\n function YearAdd(arg: number | string | Date, year: number): number;\n function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function DateText(createdTime: number | string | Date, text: string): string;\n function IsToday(date: number | string | Date): boolean;\n\n\n  // used widgets Inner Begin\n  // used widgets - Don't touch me\n  // used widgets Inner End\n\n  // repeater scope Inner Begin\n  // repeater scope - Don't touch me\n  // repeater scope Inner End\n\n  // $w.app\n   namespace app {\n  namespace dataset {\n    const state: {\n      // wGlobal State Inner Begin\n      // Global State \u5168\u5C40\u53D8\u91CF - Don't touch me\n      // wGlobal State Inner End\n    };\n  }\n\n  namespace common {\n    // wGlobal Common Inner Begin\n    // Global Common \u5168\u5C40\u65B9\u6CD5 - Don't touch me\n    // wGlobal Common Inner End\n  }\n\n  function setState(data: Object): void;\n}\n\n\n  // $w.page\n   namespace page {\n  const id: string;\n\n  namespace dataset {\n    const state: {\n      // wPage State Inner Begin\n      // Page State \u9875\u9762\u53D8\u91CF - Don't touch me\n      // wPage State Inner End\n    }\n    const params: {\n      // wPage Param Inner Begin\n      // Page Param \u9875\u9762\u53C2\u6570 - Don't touch me\n      // wPage Param Inner End\n    }\n  }\n  namespace handler {\n    // wPage Handler Inner Begin\n    // Page Handler \u9875\u9762\u65B9\u6CD5 - Don't touch me\n    // wPage Handler Inner End\n  }\n\n  // ============ setState API Inner Begin ============\n  function setState(userSetState: Record<string, any>): void;\n  // ============ setState API Inner Begin ============\n}\n\n\n  // $w.auth\n  interface CurrentUserInfo {\n  userId?: string;\n  phone?: string;\n  type?: number;\n  relatedRoles?: {\n    id?: string;\n    envId?: string;\n    name?: string;\n    roleIdentity?: string;\n  }[];\n  openId?: string;\n  name?: string;\n  nickName?: string;\n  email?: string;\n  mainOrg?: {\n    id?: string;\n    name?: string;\n  };\n  orgs?: {\n    id?: string;\n    name?: string;\n  }[];\n}\n namespace auth {\n  function getUserInfo(): CurrentUserInfo;\n  const currentUser: CurrentUserInfo;\n}\n\n\n  // $w.cloud\n  interface ICallDataSourceParams {\n  dataSourceName: string;\n  methodName: string;\n  params: Object;\n}\ninterface ICallFunctionParams {\n  name: string;\n  data?: any;\n}\ninterface IParseOptions {\n  unwrapResult?: boolean;\n  parseBusinessInfo?: boolean;\n}\ninterface ICallWorkflowParams {\n  action: string;\n  data?: Record<string, any>;\n  capitalizeDataKey?: boolean;\n}\n namespace cloud {\n  function callDataSource(params: ICallDataSourceParams): any;\n  function getTempFileURL(params: string | string[]): Promise<string | string[]>;\n  function callWorkflow(action: ICallWorkflowParams): Promise<any>;\n  function callFunction(params: ICallFunctionParams, parseOptions?: IParseOptions): Promise<any>;\n  function getCloudInstance(): Promise<CloudInstance>;\n}\n\n\n  // $w.utils\n   namespace utils {\n  // ============ utils API Inner Begin ============\n  interface navigatorOptions {\n    packageName: string;\n    pageId: string;\n    data?: Record<string, any>;\n    params?: Record<string, any>;\n    events?: Record<string, (data: any) => void>;\n    success(res: any);\n    fail(res: any);\n    complete(res: any);\n  }\n\n  interface navigateBackOptions {\n    delta: number;\n  }\n\n  // \u663E\u793A\u63D0\u793A\n  function showToast(options);\n\n  // \u663E\u793A loading \u63D0\u793A\n  function showLoading(options);\n\n  // \u9690\u85CF loading \u63D0\u793A\n  function hideLoading(options);\n\n  // \u663E\u793A\u6A21\u6001\u63D0\u793A\n  function showModal(options);\n\n  // \u62E8\u6253\u7535\u8BDD\n  function callPhone(options);\n\n  // sacnCode\n  function scanCode(options: {\n    onlyFromCamera?: boolean;\n    enableDefaultBehavior?: boolean;\n    scanType?: ('barCode' | 'qrCode')[];\n    success?: (res: { result: string; scanType: string }) => void;\n    fail?: (err: Error) => void;\n    complete?: () => void;\n  }): Promise<ScanCodeResult> | ScanCodeResult;\n\n  // \u7279\u5236\u8DEF\u7531\n  function navigateTo(options: navigatorOptions);\n\n  function redirectTo(options: navigatorOptions);\n\n  function reLaunch(options: navigatorOptions);\n\n  function relaunchHome();\n\n  function navigateBack(options: navigateBackOptions);\n\n  // ============ utils API Inner Begin ============\n}\n\n\n}\n\n// Global For Begin\ndeclare const $for: {\n  // Global For Inner Begin\n  // For \u5FAA\u73AF\u53D8\u91CF - Don't touch me\n  // Global For Inner End\n}\ndeclare const forItems = $for\n// Global For End\n\n// $page Begin\ndeclare namespace $page {\n  namespace dataset {\n\n    const state: {\n      // Page State Inner Begin\n      // Page State \u9875\u9762\u53D8\u91CF - Don't touch me\n      // Page State Inner End\n    }\n\n    const params: {\n      // Page Param Inner Begin\n      // Page Param \u9875\u9762\u53C2\u6570 - Don't touch me\n      // Page Param Inner End\n    }\n\n  }\n\n  namespace handler {\n    // Page Handler Inner Begin\n    // Page Handler \u9875\u9762\u65B9\u6CD5 - Don't touch me\n    // Page Handler Inner End\n  }\n\n  // \u8BBE\u7F6E\u72B6\u6001\n  \n  function setState(userSetState: Record<string, any>): void;\n  \n}\n// $page End\n\n// $comp Begin\ndeclare namespace $comp {\n\n  namespace props {\n\n    const data: {\n      // Comp Prop Data Inner Begin\n      // Comp Prop Data \u7EC4\u4EF6\u5C5E\u6027 - Don't touch me\n      // Comp Prop Data Inner End\n    }\n\n    namespace events {\n      // Comp Prop Events Inner Begin\n      // Comp Prop Events \u7EC4\u4EF6\u4E8B\u4EF6 - Don't touch me\n      // Comp Prop Events Inner End\n    }\n\n  }\n\n  namespace dataset {\n\n    const state: {\n      // Comp State Inner Begin\n      // Comp State \u7EC4\u4EF6\u53D8\u91CF - Don't touch me\n      // Comp State Inner End\n    }\n\n  }\n\n  namespace handler {\n    // Comp Handler Inner Begin\n    // Comp Handler \u7EC4\u4EF6\u65B9\u6CD5 - Don't touch me\n    // Comp Handler Inner End\n  }\n\n}\n// $comp End\n\n// Global Formula Begin\n\ndeclare function ABS(num: number): number;\ndeclare function Min(...args: number[]): number;\ndeclare function Max(...args: number[]): number;\ndeclare function Average(...args: number[]): number;\ndeclare function Floor(num: number): number;\ndeclare function Ceiling(num: number): number;\ndeclare function Round(num: number): number;\ndeclare function Sum(...args: number[]): number;\ndeclare function Rand(num: number): number;\n\ndeclare function If(condition: boolean, val1: any, val2: any): any;\ndeclare function IsEmpty(text: string | string[]): boolean;\ndeclare function NotNull(val: any): boolean;\ndeclare function And(...args: boolean[]): boolean;\ndeclare function Or(...args: boolean[]): boolean;\n\ndeclare function Len(text: string): number;\ndeclare function Contains(text1: string, text2: string): boolean;\ndeclare function Split(text1: string, text2: string): string[];\ndeclare function Trim(text: string): string;\ndeclare function Upper(text: string): string;\ndeclare function Lower(text: string): string;\ndeclare function Concat(...text: string[]): string;\n\ndeclare function Now(): number;\ndeclare function Timestamp(arg: number | string | Date): number;\ndeclare function Second(arg: number | string | Date): number;\ndeclare function Minute(arg: number | string | Date): number;\ndeclare function Hour(arg: number | string | Date): number;\ndeclare function Day(arg: number | string | Date): number;\ndeclare function DayOfWeek(arg: number | string | Date): number;\ndeclare function Month(arg: number | string | Date): number;\ndeclare function Year(arg: number | string | Date): number;\ndeclare function GetDate(year: number, month: number, day: number): number;\ndeclare function DateTimeValue(arg: string, val: string): number;\ndeclare function Age(arg: number | string | Date, val: number | string | Date): number;\ndeclare function AgeOfNow(arg: number | string | Date): number;\ndeclare function DateAdd(arg: number | string | Date, day: number): number;\ndeclare function MonthAdd(arg: number | string | Date, month: number): number;\ndeclare function YearAdd(arg: number | string | Date, year: number): number;\ndeclare function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function DateText(createdTime: number | string | Date, text: string): string;\ndeclare function IsToday(date: number | string | Date): boolean;\n\n\n// Global Formula End\n";
 //# sourceMappingURL=auto-generated.d.ts.map

package/lib/utils/dts/auto-generated.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-generated.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/auto-generated.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,+maAoYnB,CAAA"}
+{"version":3,"file":"auto-generated.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/auto-generated.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,muiBAgjBnB,CAAA"}

package/lib/utils/dts/auto-generated.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wedaDTS = void 0;
-exports.wedaDTS = `
-declare class UserWidget {
+exports.wedaDTS = `declare class UserWidget {
   // FIXME: 暂时不对外暴露
   // 内置命名空间
   // get sys(): {
@@ -113,89 +112,99 @@ declare namespace $app {
     // Global Common Inner End
   }
 
-  namespace auth {
-    const currentUser: {
-  userId?: string
-  phone?: string
-  type?: number
+  // $w.auth
+  interface CurrentUserInfo {
+  userId?: string;
+  phone?: string;
+  type?: number;
   relatedRoles?: {
-    id?: string
-    envId?: string
-    name?: string
-    roleIdentity?: string
-  }[]
-  openId?: string
-  name?: string
-  nickName?: string
-  email?: string
+    id?: string;
+    envId?: string;
+    name?: string;
+    roleIdentity?: string;
+  }[];
+  openId?: string;
+  name?: string;
+  nickName?: string;
+  email?: string;
   mainOrg?: {
-    id?: string
-    name?: string
-  }
+    id?: string;
+    name?: string;
+  };
   orgs?: {
-    id?: string
-    name?: string
-  }[]
+    id?: string;
+    name?: string;
+  }[];
+}
+ namespace auth {
+  function getUserInfo(): CurrentUserInfo;
+  const currentUser: CurrentUserInfo;
 }
 
-  }
 
+  // 设置状态
+  
+  function setState(userSetState: Record<string, any>): void;
   
 
-interface navigatorOptions {
-  packageName: string;
-  pageId: string;
-  data?: Record<string, any>;
-  params?: Record<string, any>;
-  events?: Record<string, (data: any) => void>;
-  success(res: any);
-  fail(res: any);
-  complete(res: any);
-}
+  
+  interface navigatorOptions {
+    packageName: string;
+    pageId: string;
+    data?: Record<string, any>;
+    params?: Record<string, any>;
+    events?: Record<string, (data: any) => void>;
+    success(res: any);
+    fail(res: any);
+    complete(res: any);
+  }
 
-interface navigateBackOptions {
-  delta: number;
-}
+  interface navigateBackOptions {
+    delta: number;
+  }
 
-// 设置状态
-function setState(userSetState: Record<string, any>): void
+  // 显示提示
+  function showToast(options);
 
-// 特制路由
-function navigateTo(options: navigatorOptions)
-function redirectTo(options: navigatorOptions)
-function reLaunch(options: navigatorOptions)
-function navigateBack(options: navigateBackOptions)
+  // 显示 loading 提示
+  function showLoading(options);
 
-// 显示提示
-function showToast(options);
+  // 隐藏 loading 提示
+  function hideLoading(options);
 
-// 显示模态提示
-function showModal(options);
+  // 显示模态提示
+  function showModal(options);
 
-// 显示 loading 提示
-function showLoading(options);
+  // 拨打电话
+  function callPhone(options);
 
-// 隐藏 loading 提示
-function hideLoading(options);
+  // sacnCode
+  function scanCode(options: {
+    onlyFromCamera?: boolean;
+    enableDefaultBehavior?: boolean;
+    scanType?: ('barCode' | 'qrCode')[];
+    success?: (res: { result: string; scanType: string }) => void;
+    fail?: (err: Error) => void;
+    complete?: () => void;
+  }): Promise<ScanCodeResult> | ScanCodeResult;
 
-// 隐藏提示
-function hideToast(options);
+  // 特制路由
+  function navigateTo(options: navigatorOptions);
 
-// sacnCode
-function scanCode(options: {
-  onlyFromCamera?: boolean;
-  enableDefaultBehavior?: boolean;
-  scanType?: ('barCode' | 'qrCode')[];
-  success?: (res: { result: string; scanType: string }) => void;
-  fail?: (err: Error) => void;
-  complete?: () => void;
-}): Promise<ScanCodeResult> | ScanCodeResult;
+  function redirectTo(options: navigatorOptions);
 
+  function reLaunch(options: navigatorOptions);
 
+  function relaunchHome();
+
+  function navigateBack(options: navigateBackOptions);
+
+  
 }
 
 declare const app = $app
 
+
 declare namespace $w {
    function ABS(num: number): number;
  function Min(...args: number[]): number;
@@ -254,6 +263,171 @@ declare namespace $w {
   // repeater scope Inner Begin
   // repeater scope - Don't touch me
   // repeater scope Inner End
+
+  // $w.app
+   namespace app {
+  namespace dataset {
+    const state: {
+      // wGlobal State Inner Begin
+      // Global State 全局变量 - Don't touch me
+      // wGlobal State Inner End
+    };
+  }
+
+  namespace common {
+    // wGlobal Common Inner Begin
+    // Global Common 全局方法 - Don't touch me
+    // wGlobal Common Inner End
+  }
+
+  function setState(data: Object): void;
+}
+
+
+  // $w.page
+   namespace page {
+  const id: string;
+
+  namespace dataset {
+    const state: {
+      // wPage State Inner Begin
+      // Page State 页面变量 - Don't touch me
+      // wPage State Inner End
+    }
+    const params: {
+      // wPage Param Inner Begin
+      // Page Param 页面参数 - Don't touch me
+      // wPage Param Inner End
+    }
+  }
+  namespace handler {
+    // wPage Handler Inner Begin
+    // Page Handler 页面方法 - Don't touch me
+    // wPage Handler Inner End
+  }
+
+  // ============ setState API Inner Begin ============
+  function setState(userSetState: Record<string, any>): void;
+  // ============ setState API Inner Begin ============
+}
+
+
+  // $w.auth
+  interface CurrentUserInfo {
+  userId?: string;
+  phone?: string;
+  type?: number;
+  relatedRoles?: {
+    id?: string;
+    envId?: string;
+    name?: string;
+    roleIdentity?: string;
+  }[];
+  openId?: string;
+  name?: string;
+  nickName?: string;
+  email?: string;
+  mainOrg?: {
+    id?: string;
+    name?: string;
+  };
+  orgs?: {
+    id?: string;
+    name?: string;
+  }[];
+}
+ namespace auth {
+  function getUserInfo(): CurrentUserInfo;
+  const currentUser: CurrentUserInfo;
+}
+
+
+  // $w.cloud
+  interface ICallDataSourceParams {
+  dataSourceName: string;
+  methodName: string;
+  params: Object;
+}
+interface ICallFunctionParams {
+  name: string;
+  data?: any;
+}
+interface IParseOptions {
+  unwrapResult?: boolean;
+  parseBusinessInfo?: boolean;
+}
+interface ICallWorkflowParams {
+  action: string;
+  data?: Record<string, any>;
+  capitalizeDataKey?: boolean;
+}
+ namespace cloud {
+  function callDataSource(params: ICallDataSourceParams): any;
+  function getTempFileURL(params: string | string[]): Promise<string | string[]>;
+  function callWorkflow(action: ICallWorkflowParams): Promise<any>;
+  function callFunction(params: ICallFunctionParams, parseOptions?: IParseOptions): Promise<any>;
+  function getCloudInstance(): Promise<CloudInstance>;
+}
+
+
+  // $w.utils
+   namespace utils {
+  // ============ utils API Inner Begin ============
+  interface navigatorOptions {
+    packageName: string;
+    pageId: string;
+    data?: Record<string, any>;
+    params?: Record<string, any>;
+    events?: Record<string, (data: any) => void>;
+    success(res: any);
+    fail(res: any);
+    complete(res: any);
+  }
+
+  interface navigateBackOptions {
+    delta: number;
+  }
+
+  // 显示提示
+  function showToast(options);
+
+  // 显示 loading 提示
+  function showLoading(options);
+
+  // 隐藏 loading 提示
+  function hideLoading(options);
+
+  // 显示模态提示
+  function showModal(options);
+
+  // 拨打电话
+  function callPhone(options);
+
+  // sacnCode
+  function scanCode(options: {
+    onlyFromCamera?: boolean;
+    enableDefaultBehavior?: boolean;
+    scanType?: ('barCode' | 'qrCode')[];
+    success?: (res: { result: string; scanType: string }) => void;
+    fail?: (err: Error) => void;
+    complete?: () => void;
+  }): Promise<ScanCodeResult> | ScanCodeResult;
+
+  // 特制路由
+  function navigateTo(options: navigatorOptions);
+
+  function redirectTo(options: navigatorOptions);
+
+  function reLaunch(options: navigatorOptions);
+
+  function relaunchHome();
+
+  function navigateBack(options: navigateBackOptions);
+
+  // ============ utils API Inner Begin ============
+}
+
+
 }
 
 // Global For Begin
@@ -289,12 +463,10 @@ declare namespace $page {
     // Page Handler Inner End
   }
 
+  // 设置状态
+  
+  function setState(userSetState: Record<string, any>): void;
   
-
-// 设置状态
-function setState(userSetState: Record<string, any>): void
-
-
 }
 // $page End
 

package/lib/utils/dts/build.js

@@ -56,13 +56,25 @@ function genWeDaAPPDTS() {
          * 获取所有的 DTS
          */
         const wedaFrameworkDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-framework.d.ts'), 'utf8'); // 低码框架
-        const wedaAPIDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-api.d.ts'), 'utf8'); // 低码 API
-        const wedaAuthDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-auth.d.ts'), 'utf8'); // Auth 信息
+        // const wedaAPIDTS = await fs.readFile(path.resolve(__dirname, 'framework', 'weda-api.d.ts'), 'utf8') // 低码 API
+        const wedaAppDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-app.d.ts'), 'utf-8'); // app对象
+        const wedaPageDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-page.d.ts'), 'utf-8'); // page对象
+        const wedaAuthDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-auth.d.ts'), 'utf8'); // auth对象
+        const wedaCloudDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-cloud.d.ts'), 'utf-8'); // cloud对象
+        const wedaUtilsDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-utils.d.ts'), 'utf-8'); // page对象
         const formulaDTS = yield buildFormulaDTS(); // 函数公式
         /**
          * 聚合 DTS
          */
-        const wedaDTS = groupDTSs({ wedaFrameworkDTS, wedaAPIDTS, wedaAuthDTS, formulaDTS });
+        const wedaDTS = groupDTSs({
+            wedaFrameworkDTS,
+            wedaAppDTS,
+            wedaPageDTS,
+            wedaAuthDTS,
+            wedaCloudDTS,
+            wedaUtilsDTS,
+            formulaDTS,
+        });
         /**
          * 将聚合结果保存在 auto-generated.ts
          */
@@ -73,21 +85,30 @@ function genWeDaAPPDTS() {
 /**
  * 聚合所有的 DTS（不包括动态生成的）
  */
-function groupDTSs({ wedaFrameworkDTS = '', wedaAPIDTS = '', wedaAuthDTS = '', formulaDTS = '' }) {
+function groupDTSs({ wedaFrameworkDTS = '', wedaAppDTS = '', wedaPageDTS = '', wedaAuthDTS = '', wedaCloudDTS = '', wedaUtilsDTS = '', formulaDTS = '', }) {
     let resultDts = wedaFrameworkDTS;
+    // $w.app
+    resultDts = resultDts.replaceAll("// $w.app - Don't touch me", wedaAppDTS.replace(/declare/g, ''));
+    // $w.page
+    resultDts = resultDts.replaceAll("// $w.page - Don't touch me", wedaPageDTS.replace(/declare/g, ''));
+    // $w.auth
+    resultDts = resultDts.replaceAll("// $w.auth - Don't touch me", wedaAuthDTS.replace(/declare/g, ''));
+    // $w.cloud
+    resultDts = resultDts.replaceAll("// $w.cloud - Don't touch me", wedaCloudDTS.replace(/declare/g, ''));
+    // $w.utils
+    resultDts = resultDts.replaceAll("// $w.utils - Don't touch me", wedaUtilsDTS.replace(/declare/g, ''));
     // 函数公式：$app.utils.xxx
-    resultDts = resultDts.replace("// Formula 函数公式 - Don't touch me", formulaDTS.replace(/export/g, ''));
+    resultDts = resultDts.replaceAll("// Formula 函数公式 - Don't touch me", formulaDTS.replace(/export/g, ''));
     // 函数公式：全局变量提示
     resultDts = resultDts.replace("// Global Formula 全局函数公式- Don't touch me", formulaDTS.replace(/export/g, 'declare'));
     // 函数公式：$w.xxx
     resultDts = resultDts.replace("// $w global APIs - Don't touch me", formulaDTS.replace(/export/g, ''));
-    // 增加 API
-    const appAPIDTS = wedaAPIDTS.replace(/[\s\S]*\/\/ ============ App API Begin ============ \/\/([\s\S]*?)\/\/ ============ App API End ============ \/\/[\s\S]*/, '$1');
-    resultDts = resultDts.replace("// App API - Don't touch me", appAPIDTS);
-    const pageAPIDTS = wedaAPIDTS.replace(/[\s\S]*\/\/ ============ Page API Begin ============ \/\/([\s\S]*?)\/\/ ============ Page API End ============ \/\/[\s\S]*/, '$1');
-    resultDts = resultDts.replace("// Page API - Don't touch me", pageAPIDTS);
-    // 增加 Auth 信息
-    resultDts = resultDts.replace("// Auth 认证 - Don't touch me", wedaAuthDTS);
+    // 添加$app.setState、$app.navigateTo等
+    const utilsAPI = wedaUtilsDTS.replace(/[\s\S]*\/\/ ============ utils API Inner Begin ============([\s\S]*?)\/\/ ============ utils API Inner Begin ============[\s\S]*/, '$1');
+    resultDts = resultDts.replace("// utils API - Don't touch me", utilsAPI);
+    // 添加setState API
+    const setStateAPI = wedaPageDTS.replace(/[\s\S]*\/\/ ============ setState API Inner Begin ============([\s\S]*?)\/\/ ============ setState API Inner Begin ============[\s\S]*/, '$1');
+    resultDts = resultDts.replaceAll("// setState API - Don't touch me", setStateAPI);
     return resultDts;
 }
 function main() {
@@ -97,8 +118,11 @@ function main() {
         if (watchArgv === '--watch') {
             console.log('Start watching mode');
             (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-framework.d.ts'), genWeDaAPPDTS);
-            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-api.d.ts'), genWeDaAPPDTS);
+            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-app.d.ts'), genWeDaAPPDTS);
+            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-page.d.ts'), genWeDaAPPDTS);
             (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-auth.d.ts'), genWeDaAPPDTS);
+            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-cloud.d.ts'), genWeDaAPPDTS);
+            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-utils.d.ts'), genWeDaAPPDTS);
         }
     });
 }

package/lib/utils/dts/index.d.ts

@@ -31,12 +31,17 @@ export interface IOptions {
 }
 export declare enum IInputDataType {
     globalState = "globalState",
+    wGlobalState = "wGlobalState",
     pageState = "pageState",
+    wPageState = "wPageState",
     compState = "compState",
     pageParams = "pageParams",
+    wPageParams = "wPageParams",
     forState = "forState",
     globalCommonCodes = "globalCommonCodes",
+    wGlobalCommonCodes = "wGlobalCommonCodes",
     pageHandlerCodes = "pageHandlerCodes",
+    wPageHandlerCodes = "wPageHandlerCodes",
     compHandlerCodes = "compHandlerCodes",
     compPropData = "compPropData",
     compPropEvents = "compPropEvents",

package/lib/utils/dts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/index.ts"],"names":[],"mappings":"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"}

package/lib/utils/dts/index.js

@@ -14,12 +14,17 @@ const auto_generated_1 = require("./auto-generated");
 var IInputDataType;
 (function (IInputDataType) {
     IInputDataType["globalState"] = "globalState";
+    IInputDataType["wGlobalState"] = "wGlobalState";
     IInputDataType["pageState"] = "pageState";
+    IInputDataType["wPageState"] = "wPageState";
     IInputDataType["compState"] = "compState";
     IInputDataType["pageParams"] = "pageParams";
+    IInputDataType["wPageParams"] = "wPageParams";
     IInputDataType["forState"] = "forState";
     IInputDataType["globalCommonCodes"] = "globalCommonCodes";
+    IInputDataType["wGlobalCommonCodes"] = "wGlobalCommonCodes";
     IInputDataType["pageHandlerCodes"] = "pageHandlerCodes";
+    IInputDataType["wPageHandlerCodes"] = "wPageHandlerCodes";
     IInputDataType["compHandlerCodes"] = "compHandlerCodes";
     IInputDataType["compPropData"] = "compPropData";
     IInputDataType["compPropEvents"] = "compPropEvents";
@@ -44,12 +49,17 @@ const DtsPlaceholder = {
 };
 const DtsInnerSign = {
     [IInputDataType.globalState]: "Global State Inner",
+    [IInputDataType.wGlobalState]: "wGlobal State Inner",
     [IInputDataType.pageState]: "Page State Inner",
+    [IInputDataType.wPageState]: "wPage State Inner",
     [IInputDataType.compState]: "Comp State Inner",
     [IInputDataType.pageParams]: "Page Param Inner",
+    [IInputDataType.wPageParams]: "wPage Param Inner",
     [IInputDataType.forState]: "Global For Inner",
     [IInputDataType.globalCommonCodes]: "Global Common Inner",
+    [IInputDataType.wGlobalCommonCodes]: "wGlobal Common Inner",
     [IInputDataType.pageHandlerCodes]: "Page Handler Inner",
+    [IInputDataType.wPageHandlerCodes]: "wPage Handler Inner",
     [IInputDataType.compHandlerCodes]: "Comp Handler Inner",
     [IInputDataType.compPropData]: "Comp Prop Data Inner",
     [IInputDataType.compPropEvents]: "Comp Prop Events Inner",
@@ -76,13 +86,30 @@ class WeDaDTS {
     static updateDTSPartial(inputData, itemType, options = { setEmptyIfError: false }) {
         return __awaiter(this, void 0, void 0, function* () {
             let dts = '';
+            // 必须区分$w下的和$page、$app下的，否则replace Inner Begin和Inner End的时候会有问题
+            const DTSMap = {
+                [DtsInnerSign[IInputDataType.globalState]]: DtsInnerSign[IInputDataType.wGlobalState],
+                [DtsInnerSign[IInputDataType.pageState]]: DtsInnerSign[IInputDataType.wPageState],
+                [DtsInnerSign[IInputDataType.pageParams]]: DtsInnerSign[IInputDataType.wPageParams],
+                [DtsInnerSign[IInputDataType.globalCommonCodes]]: DtsInnerSign[IInputDataType.wGlobalCommonCodes],
+                [DtsInnerSign[IInputDataType.pageHandlerCodes]]: DtsInnerSign[IInputDataType.wPageHandlerCodes],
+            };
+            const reg = new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm');
             try {
                 dts = yield _generateOneItemDTS(inputData, itemType);
-                WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${dts}\n$2`);
+                WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
+                if (DTSMap[DtsInnerSign[itemType]]) {
+                    const reg = new RegExp(`^(\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} End)`, 'm');
+                    WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
+                }
             }
             catch (e) {
                 if (options.setEmptyIfError) {
-                    WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${dts}\n$2`);
+                    WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
+                    if (DTSMap[DtsInnerSign[itemType]]) {
+                        const reg = new RegExp(`^(\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} End)`, 'm');
+                        WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
+                    }
                 }
             }
         });
@@ -115,7 +142,7 @@ function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needG
                 // 防止某项错误导致全部都错误
                 try {
                     const dts = yield _generateOneItemDTS(inputData[key], key);
-                    resultDts = resultDts.replace(placeholder, dts + placeholder);
+                    resultDts = resultDts.replaceAll(placeholder, dts + placeholder);
                 }
                 catch (e) {
                     console.error(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "0.5.11",
+  "version": "0.5.12-aplph.1",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",
@@ -53,4 +53,4 @@
     "typescript": "^4.7.4",
     "typescript-json-schema": "^0.53.0"
   }
-}
+}