@creekjs/umi-plugins 1.0.3 → 1.0.5

package/dist/creek-layout/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/creek-layout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAkC,MAAM,YAAY,CAAC;8BA8E7C,IAAI;AAAzB,wBA+HE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/creek-layout/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAkC,MAAM,YAAY,CAAC;8BA8E7C,IAAI;AAAzB,wBAiIE"}

package/dist/creek-layout/index.js

@@ -128,7 +128,8 @@ var creek_layout_default = (api) => {
   });
   api.onGenerateFiles(() => {
     var _a, _b;
-    const hasInitialStatePlugin = api.config.initialState;
+    const hasInitialStatePlugin = !!api.config.initialState;
+    const hasLocalePlugin = !!api.config.locale;
     const iconsInfo = getIconsInfoForRoutes(api);
     const iconFontCNs = Array.isArray((_a = api.userConfig.creekLayout) == null ? void 0 : _a.iconFontCNs) ? (_b = api.userConfig.creekLayout) == null ? void 0 : _b.iconFontCNs : [];
     api.writeTmpFile({
@@ -137,6 +138,7 @@ var creek_layout_default = (api) => {
       context: {
         creekWebComponentsPath,
         hasInitialStatePlugin,
+        hasLocalePlugin,
         access: api.config.access,
         creekLocaleConfig: api.config.creekLocaleConfig ? JSON.stringify(api.config.glocale, null, 2) : "undefined",
         userConfig: JSON.stringify(api.config.creekLayout, null, 2)

package/dist/creek-layout/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-layout/index.tsx"],
-  "sourcesContent": ["import { IApi, IRoute, RUNTIME_TYPE_FILE_NAME } from '@umijs/max';\nimport { lodash, winPath } from '@umijs/max/plugin-utils';\nimport { existsSync, readFileSync } from 'fs';\nimport { dirname, join } from 'path';\n\nimport { withTmpPath } from '../utils';\n\nconst getPkgHasDep = (api: IApi, depList: string[]) => {\n  const hasDependency = (pkg: Record<string, any>, dep: string) => pkg.dependencies?.[dep] || pkg.devDependencies?.[dep];\n  const { pkg } = api;\n  return depList.find((dep) => hasDependency(pkg, dep));\n};\n\nconst getPkgPath = (api: IApi, pkgName: string, depList?: string[]) => {\n  const _depList = depList && depList.length ? depList : [pkgName];\n  const pkgHasDep = getPkgHasDep(api, _depList);\n\n  if (pkgHasDep) {\n    const nodeModulesPath = join(api.cwd, 'node_modules', pkgHasDep, 'package.json');\n\n    if (existsSync(nodeModulesPath)) {\n      return join(api.cwd, 'node_modules', pkgHasDep);\n    }\n\n    const cwd = process.cwd();\n    if (api.cwd !== cwd) {\n      const altNodeModulesPath = join(cwd, 'node_modules', pkgHasDep, 'package.json');\n      if (existsSync(altNodeModulesPath)) {\n        return join(cwd, 'node_modules', pkgHasDep);\n      }\n    }\n  }\n\n  // 如果项目中没有去找插件依赖的\n  return dirname(require.resolve(`${pkgName}/package.json`));\n};\n\nconst getIconsInfoForRoutes = (api: IApi) => {\n  // 获取所有 icons\n  const antIconsPath = winPath(getPkgPath(api, '@ant-design/icons'));\n\n  const getAllIcons = () => {\n    // 读取 index.d.ts\n    const iconTypePath = join(antIconsPath, './lib/icons/index.d.ts');\n    const iconTypeContent = readFileSync(iconTypePath, 'utf-8');\n\n    // 截取 default as ${iconName}, 然后获取 iconName 转换为 map\n    return [...iconTypeContent.matchAll(/default as (\\w+)/g)].reduce((memo: Record<string, boolean>, cur) => {\n      memo[cur[1]] = true;\n      return memo;\n    }, {});\n  };\n\n  const allIcons: Record<string, boolean> = getAllIcons();\n\n  const iconsMap = Object.keys(api.appData.routes).reduce<Record<string, boolean>>((memo, id) => {\n    const { icon } = api.appData.routes[id];\n    if (icon) {\n      const upperIcon = lodash.upperFirst(lodash.camelCase(icon));\n      // @ts-ignore\n      if (allIcons[upperIcon]) {\n        memo[upperIcon] = true;\n      }\n      // @ts-ignore\n      if (allIcons[`${upperIcon}Outlined`]) {\n        memo[`${upperIcon}Outlined`] = true;\n      }\n    }\n    return memo;\n  }, {});\n  const icons = Object.keys(iconsMap);\n\n  return {\n    icons,\n    antIconsPath,\n  };\n};\n\nexport default (api: IApi) => {\n  const TEMPLATE_DIR = join(__dirname, 'template');\n\n  const creekWebComponentsPath = winPath(getPkgPath(api, '@creekjs/web-components'));\n  const creekIconPath = require.resolve(`${creekWebComponentsPath}/dist/creek-icon`);\n\n  api.describe({\n    key: 'creekLayout',\n    config: {\n      schema({ zod }) {\n        return zod\n          .object({\n            title: zod.string(),\n            iconFontCNs: zod.string().array(),\n          })\n          .partial();\n      }, \n      onChange: api.ConfigChangeType.regenerateTmpFiles,\n    },\n    enableBy: api.EnableBy.config,\n  });\n\n  api.modifyAppData((memo) => {\n    const version = require(`${creekWebComponentsPath}/package.json`).version;\n    memo.pluginLayout = {\n      creekWebComponentsPath,\n      version,\n    };\n    return memo;\n  });\n\n  // 新增404页面\n  api.modifyConfig((memo) => {\n    const name = require(`${creekWebComponentsPath}/package.json`).name;\n    memo.alias[name] = creekWebComponentsPath;\n\n    const routes = memo.routes as IRoute[];\n    const hasNotFoundPage = routes?.find((item) => [item.name, item.path].includes('404'));\n    const defaultRoutes = [\n      {\n        name: '404',\n        path: '*',\n        hideInMenu: true,\n        component: require.resolve(`${creekWebComponentsPath}/dist/creek-layout/Exception/NotFoundPage`),\n      },\n    ];\n\n    if (!hasNotFoundPage) {\n      memo.routes = [...routes, ...defaultRoutes];\n    }\n\n    return memo;\n  });\n\n  api.onGenerateFiles(() => {\n    const hasInitialStatePlugin = api.config.initialState;\n    const iconsInfo = getIconsInfoForRoutes(api);\n\n    const iconFontCNs = Array.isArray(api.userConfig.creekLayout?.iconFontCNs) ? api.userConfig.creekLayout?.iconFontCNs : [];\n\n    api.writeTmpFile({\n      path: 'Layout.tsx',\n      tplPath: join(TEMPLATE_DIR, '/layout.tpl'),\n      context: {\n        creekWebComponentsPath,\n        hasInitialStatePlugin,\n        access: api.config.access,\n        creekLocaleConfig: api.config.creekLocaleConfig ? JSON.stringify(api.config.glocale, null, 2) : 'undefined',\n        userConfig: JSON.stringify(api.config.creekLayout, null, 2),\n      },\n    });\n    // 写入类型, RunTimeLayoutConfig 是 app.tsx 中 layout 配置的类型\n    api.writeTmpFile({\n      path: 'types.d.ts',\n      tplPath: join(TEMPLATE_DIR, '/type.tpl'),\n      context: {\n        creekWebComponentsPath,\n        hasInitialStatePlugin,\n        access: api.config.access,\n      },\n    });\n\n    api.writeTmpFile({\n      path: RUNTIME_TYPE_FILE_NAME,\n      tplPath: join(TEMPLATE_DIR, '/runtime-config.type.tpl'),\n      context: {},\n    });\n\n    api.writeTmpFile({\n      path: 'icons.tsx',\n      tplPath: join(TEMPLATE_DIR, '/icons.tpl'),\n      context: {\n        icons: iconsInfo.icons,\n        antIconsPath: iconsInfo.antIconsPath,\n        creekIconPath,\n      },\n    });\n\n    // runtime.tsx\n    api.writeTmpFile({\n      path: 'runtime.tsx',\n      tplPath: join(TEMPLATE_DIR, '/runtime.tpl'),\n      context: {\n        creekWebComponentsPath,\n        hasIconFontCNs: iconFontCNs.length > 0,\n        iconFontCNs: JSON.stringify(iconFontCNs),\n      },\n    });\n  });\n\n  api.addLayouts(() => {\n    return [\n      {\n        id: 'ant-design-pro-layout',\n        file: withTmpPath({ api, path: 'Layout.tsx' }),\n        test: (route: any) => {\n          return route.layout !== false;\n        },\n      },\n    ];\n  });\n\n  api.addRuntimePluginKey(() => ['layout']);\n\n  api.addRuntimePlugin(() => {\n    return [withTmpPath({ api, path: 'runtime.tsx' })];\n  });\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,iBAAqD;AACrD,0BAAgC;AAChC,gBAAyC;AACzC,kBAA8B;AAE9B,mBAA4B;AAE5B,IAAM,eAAe,CAAC,KAAW,YAAsB;AACrD,QAAM,gBAAgB,CAACA,MAA0B,QAAa;AARhE;AAQmE,kBAAAA,KAAI,iBAAJ,mBAAmB,WAAQ,KAAAA,KAAI,oBAAJ,mBAAsB;AAAA;AAClH,QAAM,EAAE,IAAI,IAAI;AAChB,SAAO,QAAQ,KAAK,CAAC,QAAQ,cAAc,KAAK,GAAG,CAAC;AACtD;AAEA,IAAM,aAAa,CAAC,KAAW,SAAiB,YAAuB;AACrE,QAAM,WAAW,WAAW,QAAQ,SAAS,UAAU,CAAC,OAAO;AAC/D,QAAM,YAAY,aAAa,KAAK,QAAQ;AAE5C,MAAI,WAAW;AACb,UAAM,sBAAkB,kBAAK,IAAI,KAAK,gBAAgB,WAAW,cAAc;AAE/E,YAAI,sBAAW,eAAe,GAAG;AAC/B,iBAAO,kBAAK,IAAI,KAAK,gBAAgB,SAAS;AAAA,IAChD;AAEA,UAAM,MAAM,QAAQ,IAAI;AACxB,QAAI,IAAI,QAAQ,KAAK;AACnB,YAAM,yBAAqB,kBAAK,KAAK,gBAAgB,WAAW,cAAc;AAC9E,cAAI,sBAAW,kBAAkB,GAAG;AAClC,mBAAO,kBAAK,KAAK,gBAAgB,SAAS;AAAA,MAC5C;AAAA,IACF;AAAA,EACF;AAGA,aAAO,qBAAQ,QAAQ,QAAQ,GAAG,sBAAsB,CAAC;AAC3D;AAEA,IAAM,wBAAwB,CAAC,QAAc;AAE3C,QAAM,mBAAe,6BAAQ,WAAW,KAAK,mBAAmB,CAAC;AAEjE,QAAM,cAAc,MAAM;AAExB,UAAM,mBAAe,kBAAK,cAAc,wBAAwB;AAChE,UAAM,sBAAkB,wBAAa,cAAc,OAAO;AAG1D,WAAO,CAAC,GAAG,gBAAgB,SAAS,mBAAmB,CAAC,EAAE,OAAO,CAAC,MAA+B,QAAQ;AACvG,WAAK,IAAI,CAAC,CAAC,IAAI;AACf,aAAO;AAAA,IACT,GAAG,CAAC,CAAC;AAAA,EACP;AAEA,QAAM,WAAoC,YAAY;AAEtD,QAAM,WAAW,OAAO,KAAK,IAAI,QAAQ,MAAM,EAAE,OAAgC,CAAC,MAAM,OAAO;AAC7F,UAAM,EAAE,KAAK,IAAI,IAAI,QAAQ,OAAO,EAAE;AACtC,QAAI,MAAM;AACR,YAAM,YAAY,2BAAO,WAAW,2BAAO,UAAU,IAAI,CAAC;AAE1D,UAAI,SAAS,SAAS,GAAG;AACvB,aAAK,SAAS,IAAI;AAAA,MACpB;AAEA,UAAI,SAAS,GAAG,mBAAmB,GAAG;AACpC,aAAK,GAAG,mBAAmB,IAAI;AAAA,MACjC;AAAA,IACF;AACA,WAAO;AAAA,EACT,GAAG,CAAC,CAAC;AACL,QAAM,QAAQ,OAAO,KAAK,QAAQ;AAElC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AAEA,IAAO,uBAAQ,CAAC,QAAc;AAC5B,QAAM,mBAAe,kBAAK,WAAW,UAAU;AAE/C,QAAM,6BAAyB,6BAAQ,WAAW,KAAK,yBAAyB,CAAC;AACjF,QAAM,gBAAgB,QAAQ,QAAQ,GAAG,wCAAwC;AAEjF,MAAI,SAAS;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,MACN,OAAO,EAAE,IAAI,GAAG;AACd,eAAO,IACJ,OAAO;AAAA,UACN,OAAO,IAAI,OAAO;AAAA,UAClB,aAAa,IAAI,OAAO,EAAE,MAAM;AAAA,QAClC,CAAC,EACA,QAAQ;AAAA,MACb;AAAA,MACA,UAAU,IAAI,iBAAiB;AAAA,IACjC;AAAA,IACA,UAAU,IAAI,SAAS;AAAA,EACzB,CAAC;AAED,MAAI,cAAc,CAAC,SAAS;AAC1B,UAAM,UAAU,QAAQ,GAAG,qCAAqC,EAAE;AAClE,SAAK,eAAe;AAAA,MAClB;AAAA,MACA;AAAA,IACF;AACA,WAAO;AAAA,EACT,CAAC;AAGD,MAAI,aAAa,CAAC,SAAS;AACzB,UAAM,OAAO,QAAQ,GAAG,qCAAqC,EAAE;AAC/D,SAAK,MAAM,IAAI,IAAI;AAEnB,UAAM,SAAS,KAAK;AACpB,UAAM,kBAAkB,iCAAQ,KAAK,CAAC,SAAS,CAAC,KAAK,MAAM,KAAK,IAAI,EAAE,SAAS,KAAK;AACpF,UAAM,gBAAgB;AAAA,MACpB;AAAA,QACE,MAAM;AAAA,QACN,MAAM;AAAA,QACN,YAAY;AAAA,QACZ,WAAW,QAAQ,QAAQ,GAAG,iEAAiE;AAAA,MACjG;AAAA,IACF;AAEA,QAAI,CAAC,iBAAiB;AACpB,WAAK,SAAS,CAAC,GAAG,QAAQ,GAAG,aAAa;AAAA,IAC5C;AAEA,WAAO;AAAA,EACT,CAAC;AAED,MAAI,gBAAgB,MAAM;AApI5B;AAqII,UAAM,wBAAwB,IAAI,OAAO;AACzC,UAAM,YAAY,sBAAsB,GAAG;AAE3C,UAAM,cAAc,MAAM,SAAQ,SAAI,WAAW,gBAAf,mBAA4B,WAAW,KAAI,SAAI,WAAW,gBAAf,mBAA4B,cAAc,CAAC;AAExH,QAAI,aAAa;AAAA,MACf,MAAM;AAAA,MACN,aAAS,kBAAK,cAAc,aAAa;AAAA,MACzC,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA,QAAQ,IAAI,OAAO;AAAA,QACnB,mBAAmB,IAAI,OAAO,oBAAoB,KAAK,UAAU,IAAI,OAAO,SAAS,MAAM,CAAC,IAAI;AAAA,QAChG,YAAY,KAAK,UAAU,IAAI,OAAO,aAAa,MAAM,CAAC;AAAA,MAC5D;AAAA,IACF,CAAC;AAED,QAAI,aAAa;AAAA,MACf,MAAM;AAAA,MACN,aAAS,kBAAK,cAAc,WAAW;AAAA,MACvC,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA,QAAQ,IAAI,OAAO;AAAA,MACrB;AAAA,IACF,CAAC;AAED,QAAI,aAAa;AAAA,MACf,MAAM;AAAA,MACN,aAAS,kBAAK,cAAc,0BAA0B;AAAA,MACtD,SAAS,CAAC;AAAA,IACZ,CAAC;AAED,QAAI,aAAa;AAAA,MACf,MAAM;AAAA,MACN,aAAS,kBAAK,cAAc,YAAY;AAAA,MACxC,SAAS;AAAA,QACP,OAAO,UAAU;AAAA,QACjB,cAAc,UAAU;AAAA,QACxB;AAAA,MACF;AAAA,IACF,CAAC;AAGD,QAAI,aAAa;AAAA,MACf,MAAM;AAAA,MACN,aAAS,kBAAK,cAAc,cAAc;AAAA,MAC1C,SAAS;AAAA,QACP;AAAA,QACA,gBAAgB,YAAY,SAAS;AAAA,QACrC,aAAa,KAAK,UAAU,WAAW;AAAA,MACzC;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AAED,MAAI,WAAW,MAAM;AACnB,WAAO;AAAA,MACL;AAAA,QACE,IAAI;AAAA,QACJ,UAAM,0BAAY,EAAE,KAAK,MAAM,aAAa,CAAC;AAAA,QAC7C,MAAM,CAAC,UAAe;AACpB,iBAAO,MAAM,WAAW;AAAA,QAC1B;AAAA,MACF;AAAA,IACF;AAAA,EACF,CAAC;AAED,MAAI,oBAAoB,MAAM,CAAC,QAAQ,CAAC;AAExC,MAAI,iBAAiB,MAAM;AACzB,WAAO,KAAC,0BAAY,EAAE,KAAK,MAAM,cAAc,CAAC,CAAC;AAAA,EACnD,CAAC;AACH;",
+  "sourcesContent": ["import { IApi, IRoute, RUNTIME_TYPE_FILE_NAME } from '@umijs/max';\nimport { lodash, winPath } from '@umijs/max/plugin-utils';\nimport { existsSync, readFileSync } from 'fs';\nimport { dirname, join } from 'path';\n\nimport { withTmpPath } from '../utils';\n\nconst getPkgHasDep = (api: IApi, depList: string[]) => {\n  const hasDependency = (pkg: Record<string, any>, dep: string) => pkg.dependencies?.[dep] || pkg.devDependencies?.[dep];\n  const { pkg } = api;\n  return depList.find((dep) => hasDependency(pkg, dep));\n};\n\nconst getPkgPath = (api: IApi, pkgName: string, depList?: string[]) => {\n  const _depList = depList && depList.length ? depList : [pkgName];\n  const pkgHasDep = getPkgHasDep(api, _depList);\n\n  if (pkgHasDep) {\n    const nodeModulesPath = join(api.cwd, 'node_modules', pkgHasDep, 'package.json');\n\n    if (existsSync(nodeModulesPath)) {\n      return join(api.cwd, 'node_modules', pkgHasDep);\n    }\n\n    const cwd = process.cwd();\n    if (api.cwd !== cwd) {\n      const altNodeModulesPath = join(cwd, 'node_modules', pkgHasDep, 'package.json');\n      if (existsSync(altNodeModulesPath)) {\n        return join(cwd, 'node_modules', pkgHasDep);\n      }\n    }\n  }\n\n  // 如果项目中没有去找插件依赖的\n  return dirname(require.resolve(`${pkgName}/package.json`));\n};\n\nconst getIconsInfoForRoutes = (api: IApi) => {\n  // 获取所有 icons\n  const antIconsPath = winPath(getPkgPath(api, '@ant-design/icons'));\n\n  const getAllIcons = () => {\n    // 读取 index.d.ts\n    const iconTypePath = join(antIconsPath, './lib/icons/index.d.ts');\n    const iconTypeContent = readFileSync(iconTypePath, 'utf-8');\n\n    // 截取 default as ${iconName}, 然后获取 iconName 转换为 map\n    return [...iconTypeContent.matchAll(/default as (\\w+)/g)].reduce((memo: Record<string, boolean>, cur) => {\n      memo[cur[1]] = true;\n      return memo;\n    }, {});\n  };\n\n  const allIcons: Record<string, boolean> = getAllIcons();\n\n  const iconsMap = Object.keys(api.appData.routes).reduce<Record<string, boolean>>((memo, id) => {\n    const { icon } = api.appData.routes[id];\n    if (icon) {\n      const upperIcon = lodash.upperFirst(lodash.camelCase(icon));\n      // @ts-ignore\n      if (allIcons[upperIcon]) {\n        memo[upperIcon] = true;\n      }\n      // @ts-ignore\n      if (allIcons[`${upperIcon}Outlined`]) {\n        memo[`${upperIcon}Outlined`] = true;\n      }\n    }\n    return memo;\n  }, {});\n  const icons = Object.keys(iconsMap);\n\n  return {\n    icons,\n    antIconsPath,\n  };\n};\n\nexport default (api: IApi) => {\n  const TEMPLATE_DIR = join(__dirname, 'template');\n\n  const creekWebComponentsPath = winPath(getPkgPath(api, '@creekjs/web-components'));\n  const creekIconPath = require.resolve(`${creekWebComponentsPath}/dist/creek-icon`);\n\n  api.describe({\n    key: 'creekLayout',\n    config: {\n      schema({ zod }) {\n        return zod\n          .object({\n            title: zod.string(),\n            iconFontCNs: zod.string().array(),\n          })\n          .partial();\n      }, \n      onChange: api.ConfigChangeType.regenerateTmpFiles,\n    },\n    enableBy: api.EnableBy.config,\n  });\n\n  api.modifyAppData((memo) => {\n    const version = require(`${creekWebComponentsPath}/package.json`).version;\n    memo.pluginLayout = {\n      creekWebComponentsPath,\n      version,\n    };\n    return memo;\n  });\n\n  // 新增404页面\n  api.modifyConfig((memo) => {\n    const name = require(`${creekWebComponentsPath}/package.json`).name;\n    memo.alias[name] = creekWebComponentsPath;\n\n    const routes = memo.routes as IRoute[];\n    const hasNotFoundPage = routes?.find((item) => [item.name, item.path].includes('404'));\n    const defaultRoutes = [\n      {\n        name: '404',\n        path: '*',\n        hideInMenu: true,\n        component: require.resolve(`${creekWebComponentsPath}/dist/creek-layout/Exception/NotFoundPage`),\n      },\n    ];\n\n    if (!hasNotFoundPage) {\n      memo.routes = [...routes, ...defaultRoutes];\n    }\n\n    return memo;\n  });\n\n  api.onGenerateFiles(() => {\n    const hasInitialStatePlugin = !!api.config.initialState;\n    const hasLocalePlugin = !!api.config.locale;\n    const iconsInfo = getIconsInfoForRoutes(api);\n\n    const iconFontCNs = Array.isArray(api.userConfig.creekLayout?.iconFontCNs) ? api.userConfig.creekLayout?.iconFontCNs : [];\n\n    api.writeTmpFile({\n      path: 'Layout.tsx',\n      tplPath: join(TEMPLATE_DIR, '/layout.tpl'),\n      context: {\n        creekWebComponentsPath,\n        hasInitialStatePlugin,\n        hasLocalePlugin,\n        access: api.config.access,\n        creekLocaleConfig: api.config.creekLocaleConfig ? JSON.stringify(api.config.glocale, null, 2) : 'undefined',\n        userConfig: JSON.stringify(api.config.creekLayout, null, 2),\n      },\n    });\n    // 写入类型, RunTimeLayoutConfig 是 app.tsx 中 layout 配置的类型\n    api.writeTmpFile({\n      path: 'types.d.ts',\n      tplPath: join(TEMPLATE_DIR, '/type.tpl'),\n      context: {\n        creekWebComponentsPath,\n        hasInitialStatePlugin,\n        access: api.config.access,\n      },\n    });\n\n    api.writeTmpFile({\n      path: RUNTIME_TYPE_FILE_NAME,\n      tplPath: join(TEMPLATE_DIR, '/runtime-config.type.tpl'),\n      context: {},\n    });\n\n    api.writeTmpFile({\n      path: 'icons.tsx',\n      tplPath: join(TEMPLATE_DIR, '/icons.tpl'),\n      context: {\n        icons: iconsInfo.icons,\n        antIconsPath: iconsInfo.antIconsPath,\n        creekIconPath,\n      },\n    });\n\n    // runtime.tsx\n    api.writeTmpFile({\n      path: 'runtime.tsx',\n      tplPath: join(TEMPLATE_DIR, '/runtime.tpl'),\n      context: {\n        creekWebComponentsPath,\n        hasIconFontCNs: iconFontCNs.length > 0,\n        iconFontCNs: JSON.stringify(iconFontCNs),\n      },\n    });\n  });\n\n  api.addLayouts(() => {\n    return [\n      {\n        id: 'ant-design-pro-layout',\n        file: withTmpPath({ api, path: 'Layout.tsx' }),\n        test: (route: any) => {\n          return route.layout !== false;\n        },\n      },\n    ];\n  });\n\n  api.addRuntimePluginKey(() => ['layout']);\n\n  api.addRuntimePlugin(() => {\n    return [withTmpPath({ api, path: 'runtime.tsx' })];\n  });\n};\n"],
+  "mappings": "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",
   "names": ["pkg"]
 }

package/dist/creek-layout/template/layout.tpl

@@ -3,6 +3,13 @@ import { useMemo } from 'react';
 import _ from 'lodash';
 import { CreekLayout, CreekLayoutProps } from '{{{creekWebComponentsPath}}}';
 
+{{#hasLocalePlugin}}
+import { useIntl } from 'umi';
+{{/hasLocalePlugin}}
+{{^hasLocalePlugin}}
+const useIntl = () => ({ formatMessage: undefined });
+{{/hasLocalePlugin}}
+
 {{#hasInitialStatePlugin}}
 import { useModel } from '@@/plugin-model';
 {{/hasInitialStatePlugin}}
@@ -74,6 +81,7 @@ const Layout = (props: CreekLayoutProps) => {
     loading: false,
     setInitialState: null,
   };
+  const { formatMessage } = useIntl();
   const userConfig = {{{userConfig}}};
   const creekLocaleConfig = {{{creekLocaleConfig}}};
   const runtimeConfig = pluginManager.applyPlugins({
@@ -114,6 +122,7 @@ const Layout = (props: CreekLayoutProps) => {
         navigate={navigate}
         userConfig={userConfig}
         route={route}
+        formatMessage={formatMessage}
         initialInfo={initialInfo}
         {...layoutRestProps}
         children={

package/dist/creek-layout/template/type.tpl

@@ -13,24 +13,16 @@
      type InitDataType = any;
     {{/hasInitialStatePlugin}}
     import type { IConfigFromPlugins } from '@@/core/pluginConfig';
+    import { CreekKeepAliveProps } from '{{{creekWebComponentsPath}}}';
 
     export type RunTimeLayoutConfig = (initData: InitDataType) => ProLayoutProps & {
-      dropdownProps?: DropDownProps;
       showDarkButton?: boolean;
-      showFooter?: boolean;
       provider?:  React.ReactNode;
-      userName?: string;
-      hideKeepalive?: boolean;
-      rightContentExtra?: React.ReactNode;
-      childrenRender?: (dom: JSX.Element, props: ProLayoutProps) => React.ReactNode;
+      keepAlive?: boolean | CreekKeepAliveProps;
+      showSettingsButton?: boolean;
+      extraActions?: React.ReactNode[];
+      showLocaleButton?: boolean;
       unAccessible?: JSX.Element;
-      logout?: (initialState: InitDataType['initialState']) => Promise<void> | void;
       iconFontCNs?: string[];
-      rightRender?: (
-        initialState: InitDataType['initialState'],
-        setInitialState: InitDataType['setInitialState'],
-        runtimeConfig: RunTimeLayoutConfig,
-      ) => JSX.Element;
-      
     };
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@creekjs/umi-plugins",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "keywords": [],
   "license": "ISC",
@@ -10,14 +10,14 @@
   "files": [
     "dist"
   ],
+  "devDependencies": {
+    "umi": "^4.6.25",
+    "@creekjs/web-components": "^1.0.7",
+    "@creekjs/request": "^1.0.3",
+    "@creekjs/openapi": "^0.0.4"
+  },
   "scripts": {
     "father:build": "father build",
     "father:dev": "father dev --no-clean"
-  },
-  "devDependencies": {
-    "@creekjs/openapi": "workspace:^",
-    "@creekjs/request": "workspace:^",
-    "@creekjs/web-components": "workspace:^",
-    "umi": "^4.6.25"
   }
-}
+}

package/dist/template/locale/i18N-package.tpl

@@ -1,16 +0,0 @@
-import KiwiIntl from "{{{kiwiIntlPath}}}";
-
-import { languageStorage, LANGUAGE_LIST,  CURRENT_LANGUAGE_KEY,  IS_EN_US,
-  IS_ZH_CN, LanguageEnum  } from "{{{constantsPath}}}";
-
-import en_US from "{{{en_US}}}";
-import zh_CN from "{{{zh_CN}}}";
-
-let I18N = KiwiIntl.init(languageStorage.get() || "zh-CN", {
-  "en-US": en_US,
-  "zh-CN": zh_CN,
-});
-
-window.{{{packageName}}} = I18N;
-export { I18N, languageStorage, LANGUAGE_LIST,  CURRENT_LANGUAGE_KEY,  IS_EN_US,
-  IS_ZH_CN, LanguageEnum };

package/dist/template/locale/i18N.tpl

@@ -1,15 +0,0 @@
-import KiwiIntl from "{{{kiwiIntlPath}}}";
-
-import { languageStorage, LANGUAGE_LIST,  CURRENT_LANGUAGE_KEY,  IS_EN_US,
-  IS_ZH_CN, LanguageEnum  } from "{{{constantsPath}}}";
-
-import en_US from "{{{en_US}}}";
-import zh_CN from "{{{zh_CN}}}";
-
-let I18N = KiwiIntl.init(languageStorage.get() || "zh-CN", {
-  "en-US": en_US,
-  "zh-CN": zh_CN,
-});
-
-export { I18N, languageStorage, LANGUAGE_LIST,  CURRENT_LANGUAGE_KEY,  IS_EN_US,
-  IS_ZH_CN, LanguageEnum };

package/dist/template/locale/index.tpl

@@ -1,2 +0,0 @@
- export { I18N, languageStorage, LANGUAGE_LIST,  CURRENT_LANGUAGE_KEY,IS_EN_US,
-  IS_ZH_CN, LanguageEnum } from './i18N';

package/dist/template/request/index.tpl

@@ -1,8 +0,0 @@
- export {
-  useRequest,
-  request,
-  getRequestInstance,
-  sortFilterProTable,
-  HttpStatusEnum,
-  HttpMessageEnum
-} from './request';

package/dist/template/request/request.tpl

@@ -1,580 +0,0 @@
-// @ts-nocheck
-import { notification } from 'antd';
-import { ApplyPluginsType } from 'umi';
-import { ICacheLike, cacheAdapterEnhancer } from '{{{axiosExtensionsPath}}}';
-import {CURRENT_LANGUAGE_KEY, LanguageEnum} from '{{{constantsPath}}}'
-import axios, {
-  type AxiosError,
-  type AxiosInstance,
-  type AxiosRequestConfig,
-  type AxiosResponse,
-} from '{{{axiosPath}}}';
-import { useRequest as useUmiRequest } from '{{{umiRequestPath}}}';
-import { getPluginManager } from '../core/plugin';
-
-import {
-  Options,
-  Service,
-  Result
-} from '{{{umiRequestPath}}}/es/useRequest/src/types';
-
-type  OptionsWithNoFullApiData<TData, TParams> =  Options<TData, TParams> & {
-  formatResult?: (data: TData['result'], params: TParams) =>  TData['result'],
-}
-
-type  OptionsWithFullApiData<TData, TParams> =  Options<TData, TParams> & {
-  formatResult?: (data: TData, params: TParams) =>  TData,
-  needFullApiData: true;
-}
-
-function useRequest<
-  TData,
-  TParams extends any[]
->(
-  service:Service<TData, TParams>,
-  options?: OptionsWithFullApiData<TData, TParams>,
-  plugins?: Plugin<TData, TParams>[]
-):Result<TData, TParams>;
-
-function useRequest<
-  TData,
-  TParams extends any[]
->(
-  service:Service<TData, TParams>,
-  options?: OptionsWithNoFullApiData<TData, TParams>,
-  plugins?: Plugin<TData, TParams>[]
-):Result<TData{{{resultDataField}}}, TParams>;
-
-function useRequest<TData,  TParams extends any[]>(  service: Service<TData, TParams>,options?: Options<TData, TParams> = {}) {
-  const  resquestResult =  useUmiRequest(service, {
-    ...options,
-  });
-  let needFullApiData =  options['needFullApiData'] ;
-  if(options['formatResult']){
-    resquestResult.data = options['formatResult'](resquestResult.data, options);
-  }
-  if(needFullApiData){
-   resquestResult.data =  resquestResult.data;
-  }else{
-     resquestResult.data = resquestResult.data? resquestResult.data['result'] :   resquestResult.data  ;
-    }
-
-  return resquestResult;
-}
-
-interface IRequestOptions extends AxiosRequestConfig {
-  skipErrorHandler?: boolean;
-  requestInterceptors?: IRequestInterceptorTuple[];
-  responseInterceptors?: IResponseInterceptorTuple[];
-  closeMessage?: boolean;
-  setCustomMessage?: (error?: AxiosResponse<any, any> & {message: string}, opts?: IRequestOptions) => string;
-  cache?: boolean | {maxCount?: number, maxAge?: number};
-  [key: string]: any;
-}
-
-interface IRequestOptionsWithResponse extends IRequestOptions {
-  getResponse: true;
-}
-
-interface IRequestOptionsWithoutResponse extends IRequestOptions{
-  getResponse: false;
-}
-
-export interface ApiResponse<T> {
-  code: string,
-  msg: string,
-  totalRows?: number;
-  totalPages?: number;
-  result?: T,
-  records?: T,
-  pageSize?: number,
-  currentPage?: number
-  success: boolean,
-  data: T{{{resultDataField}}} & T{{{resultDataField}}}['records'] & T['records'] & T,
-  total: number
-}
-
-export interface AntdApiResponse<T> {
-  success: boolean,
-  data: T,
-  total: number
-}
-
-
-interface IRequest{
-   <T = any>(url: string, opts: IRequestOptionsWithResponse): Promise<AxiosResponse<ApiResponse<T>>>;
-   <T = any>(url: string, opts: IRequestOptionsWithoutResponse): Promise<ApiResponse<T>>;
-   <T = any>(url: string, opts: IRequestOptions): Promise<ApiResponse<T>>;
-   <T = any>(url: string): Promise<ApiResponse<T>>; 
-}
-
-type RequestError = AxiosError | Error
-
-interface IErrorHandler {
-  (error: AxiosResponse<any, any> & {message: string}, opts: IRequestOptions): void;
-}
-type IRequestInterceptorAxios = (config: IRequestOptions) => IRequestOptions | Promise<IRequestOptions>;
-type IRequestInterceptorUmiRequest = (url: string, config : IRequestOptions) => { url: string, options: RequestOptions } | Promise<{ url: string, options: RequestOptions }>;
-type IRequestInterceptor = IRequestInterceptorAxios | IRequestInterceptorUmiRequest;
-type IErrorInterceptor = (error: Error) => Promise<Error>;
-type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosResponse<T> ;
-type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor;
-type IResponseInterceptorTuple = [IResponseInterceptor, IErrorInterceptor] | [IResponseInterceptor] | IResponseInterceptor;
-
- enum HttpStatusEnum {
-  CONTINUE = 100,
-  SWITCHING_PROTOCOLS = 101,
-  PROCESSING = 102,
-  SUCCESS = 200,
-  CREATED = 201,
-  ACCEPTED = 202,
-  NON_AUTHORITATIVE_INFORMATION = 203,
-  NO_CONTENT = 204,
-  RESET_CONTENT = 205,
-  PARTIAL_CONTENT = 206,
-  AMBIGUOUS = 300,
-  MOVED_PERMANENTLY = 301,
-  FOUND = 302,
-  SEE_OTHER = 303,
-  NOT_MODIFIED = 304,
-  TEMPORARY_REDIRECT = 307,
-  PERMANENT_REDIRECT = 308,
-  BAD_REQUEST = 400,
-  UNAUTHORIZED = 401,
-  PAYMENT_REQUIRED = 402,
-  FORBIDDEN = 403,
-  NOT_FOUND = 404,
-  METHOD_NOT_ALLOWED = 405,
-  NOT_ACCEPTABLE = 406,
-  PROXY_AUTHENTICATION_REQUIRED = 407,
-  REQUEST_TIMEOUT = 408,
-  CONFLICT = 409,
-  GONE = 410,
-  LENGTH_REQUIRED = 411,
-  PRECONDITION_FAILED = 412,
-  PAYLOAD_TOO_LARGE = 413,
-  URI_TOO_LONG = 414,
-  UNSUPPORTED_MEDIA_TYPE = 415,
-  REQUESTED_RANGE_NOT_SATISFIABLE = 416,
-  EXPECTATION_FAILED = 417,
-  I_AM_A_TEAPOT = 418,
-  UNPROCESSABLE_ENTITY = 422,
-  TOO_MANY_REQUESTS = 429,
-  INTERNAL_SERVER_ERROR = 500,
-  NOT_IMPLEMENTED = 501,
-  BAD_GATEWAY = 502,
-  SERVICE_UNAVAILABLE = 503,
-  GATEWAY_TIMEOUT = 504,
-  HTTP_VERSION_NOT_SUPPORTED = 505,
-}
-
- enum HttpMessageLocalEnum {
-    BAD_GATEWAY = {
-      [LanguageEnum.zhCn]: '网关错误',
-      [LanguageEnum.enUs]: 'gateway error',
-    },
-    SERVICE_UNAVAILABLE = {
-      [LanguageEnum.zhCn]: '服务不可用，服务器暂时过载或维护',
-      [LanguageEnum.enUs]: 'Service unavailable, server temporarily overloaded or maintenance gateway error',
-    },
-    GATEWAY_TIMEOUT = {
-      [LanguageEnum.zhCn]: '网关超时',
-      [LanguageEnum.enUs]: 'gateway timeout',
-    },
-    NOT_FOUND = {
-      [LanguageEnum.zhCn]: '路径错误',
-      [LanguageEnum.enUs]: 'wrong path',
-    },
-    UNAUTHORIZED = {
-      [LanguageEnum.zhCn]: '认证失败',
-      [LanguageEnum.enUs]: 'Authentication failed',
-    },
-    BAD_REQUEST = {
-      [LanguageEnum.zhCn]: '错误的请求',
-      [LanguageEnum.enUs]: 'bad Request',
-    },
-    INTERNAL_SERVER_ERROR = {
-      [LanguageEnum.zhCn]: '错误的请求',
-      [LanguageEnum.enUs]: 'bad Request',
-    },
-    ERROR_HTTP = {
-      [LanguageEnum.zhCn]: '服务器错误',
-      [LanguageEnum.enUs]: 'Server Error',
-    },
-    FORBIDDEN = {
-      [LanguageEnum.zhCn]: '无此权限',
-      [LanguageEnum.enUs]: 'no permission',
-    },
- }
-
- enum HttpMessageEnum {
-  BAD_GATEWAY = HttpMessageLocalEnum["BAD_GATEWAY"][CURRENT_LANGUAGE_KEY],
-  SERVICE_UNAVAILABLE =  HttpMessageLocalEnum["SERVICE_UNAVAILABLE"][CURRENT_LANGUAGE_KEY],
-  GATEWAY_TIMEOUT = HttpMessageLocalEnum["GATEWAY_TIMEOUT"][CURRENT_LANGUAGE_KEY],
-  NOT_FOUND =  HttpMessageLocalEnum["NOT_FOUND"][CURRENT_LANGUAGE_KEY],
-  UNAUTHORIZED = HttpMessageLocalEnum["UNAUTHORIZED"][CURRENT_LANGUAGE_KEY],
-  BAD_REQUEST = HttpMessageLocalEnum["BAD_REQUEST"][CURRENT_LANGUAGE_KEY],
-  INTERNAL_SERVER_ERROR=HttpMessageLocalEnum["INTERNAL_SERVER_ERROR"][CURRENT_LANGUAGE_KEY],
-  ERROR_HTTP =HttpMessageLocalEnum["ERROR_HTTP"][CURRENT_LANGUAGE_KEY],
-  FORBIDDEN = HttpMessageLocalEnum["FORBIDDEN"][CURRENT_LANGUAGE_KEY],
-}
-
-export interface RequestConfig<T = any> extends AxiosRequestConfig {
-  errorConfig?: {
-    errorHandler?: IErrorHandler;
-    customErrorShow?:  IErrorHandler;
-  };
-  requestInterceptors?: IRequestInterceptorTuple[];
-  responseInterceptors?: IResponseInterceptorTuple[];
-}
-
-/**
- * 判断如果是 Promise, 则从 Promise 中取出并执行剩余操作, 此时返回 Promise
- * 如果不是 Promise, 则直接执行剩余操作, 此时直接返回结果
- */
-const getPromiseValue = <T>(value: T | Promise<T>, callback: (val: T) => any): T | Promise<T> => {
-  if (value instanceof Promise) {
-    return value.then(callback);
-  }
-  return callback(value);
-}
-
-let requestInstance: AxiosInstance;
-let config: RequestConfig;
-const getConfig = (): RequestConfig => {
-  if (config) return config;
-  config = getPluginManager().applyPlugins({
-    key: 'request',
-    type: ApplyPluginsType.modify,
-    initialValue: {},
-  });
-  return config;
-};
-
-const dealRequestData = (response: AxiosResponse<any, any>, opts: IRequestOptions) => {
-  const { data, status, message } = response;
-  const regex = /^0+$/;
-  let httpMessage = null;
-  if (Number(status) === 200) {
-    if (data?.code && !regex.test(data?.code)) {
-      if (!opts?.closeMessage) {
-        config?.errorConfig?.customErrorShow ?
-          config?.errorConfig?.customErrorShow(response, opts) :
-          notification.error({
-            message: data?.code,
-            description: opts.setCustomMessage ? opts.setCustomMessage(response, opts): data?.msg
-          });
-      }
-      if (config?.errorConfig?.errorHandler) {
-        config?.errorConfig?.errorHandler(response, opts)
-      }
-      return Promise.reject(response);
-    }
-  } else {
-    switch (status) {
-      case HttpStatusEnum.BAD_GATEWAY:
-        httpMessage = HttpMessageEnum.BAD_GATEWAY;
-        break;
-      case HttpStatusEnum.SERVICE_UNAVAILABLE:
-        httpMessage = HttpMessageEnum.SERVICE_UNAVAILABLE;
-        break;
-      case HttpStatusEnum.GATEWAY_TIMEOUT:
-        httpMessage = HttpMessageEnum.GATEWAY_TIMEOUT;
-        break;
-      case HttpStatusEnum.NOT_FOUND:
-        httpMessage = HttpMessageEnum.NOT_FOUND;
-        break;
-      case HttpStatusEnum.UNAUTHORIZED:
-        httpMessage = HttpMessageEnum.UNAUTHORIZED;
-        break;
-      case HttpStatusEnum.FORBIDDEN:
-        httpMessage = HttpMessageEnum.FORBIDDEN;
-        break;
-      case HttpStatusEnum.BAD_REQUEST:
-        httpMessage = HttpMessageEnum.BAD_REQUEST;
-        break;
-      default:
-        httpMessage = HttpMessageEnum.ERROR_HTTP;
-        break;
-    }
-    if (!opts?.closeMessage && status !== HttpStatusEnum.UNAUTHORIZED) {
-      config?.errorConfig?.customErrorShow ?
-        config?.errorConfig?.customErrorShow(response, opts) :
-        notification.error({
-          message: status ?  `${status}(${httpMessage})`: httpMessage,
-          description: opts.setCustomMessage ? opts.setCustomMessage(response, opts) : (message || "服务器错误")
-        })
-    }
-    if (config?.errorConfig?.errorHandler) {
-      config?.errorConfig?.errorHandler(response, opts)
-    }
-    return Promise.reject(response);
-  }
-  return response;
-};
-
-const getRequestInstance = (opts): AxiosInstance => {
-  if (requestInstance) return requestInstance;
-  const config = getConfig();
-  requestInstance = axios.create({
-    ...config,
-  });
-
-  const configCache = opts.cache;
-  const finalCache = {
-   enabledByDefault: configCache === true || !!configCache?.maxAge || !!configCache?.maxCount,
-   maxCount: configCache?.maxCount,
-   maxAge: configCache?.maxAge
-  };
-
-  
-  const cache = cacheAdapterEnhancer(finalCache);
-  const _request = requestInstance.request;
-  requestInstance.request = (config) => cache(_request, config);
-
-  config?.requestInterceptors?.forEach((interceptor) => {
-    if(interceptor instanceof Array){
-      requestInstance.interceptors.request.use((config) => {
-        const { url } = config;
-        if(interceptor[0].length === 2){
-          const res = interceptor[0](url, config);
-          return getPromiseValue(res, (val) => {
-            const { url: newUrl, options = {} } = val
-            return { ...options, url: newUrl }
-          });
-        }
-        return interceptor[0](config);
-      }, interceptor[1]);
-    } else {
-      requestInstance.interceptors.request.use((config) => {
-        const { url } = config;
-        if(interceptor.length === 2){
-          const res = interceptor(url, config);
-          return getPromiseValue(res, (val) => {
-            const { url: newUrl, options = {} } = val
-            return { ...options, url: newUrl }
-          });
-        }
-        return interceptor(config);
-      })
-    }
-  });
-
-  config?.responseInterceptors?.forEach((interceptor) => {
-    interceptor instanceof Array ?
-      requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
-       requestInstance.interceptors.response.use(interceptor);
-  });
-
-  requestInstance.interceptors.response.use((response) => {
-    return dealRequestData(response, opts);
-  })
-  return requestInstance;
-};
-
-const changeRequestData = (opts: IRequestOptions) => {
-  const optsData = opts?.data  || {};
-  const optsParams =  opts?.params  || {};
-  const contentType = opts?.headers?  opts?.headers['Content-Type']: null;
-  let finalOpts = {...opts};
-  if (optsData && optsData?.current) {
-    optsData.currentPage = optsData.current;
-    delete optsData.current;
-    finalOpts.data = {...optsData};
-  }
-  if(optsParams && optsParams?.current){
-    optsParams.currentPage = optsParams.current;
-    delete optsParams.current;
-    finalOpts.params = {...optsParams};
-  }
-  if( contentType && contentType.includes('multipart/form-data') ){
-     let formData = new FormData();
-     let userData = opts?.params || opts.data || {};
-     Object.keys(userData).forEach(key => {
-      formData.append(key, userData[key]);
-     })
-    finalOpts.data = formData;
-    if(finalOpts.params){
-      delete finalOpts.params;
-    }
-  }
-  finalOpts.headers = {
-  ...finalOpts.headers,
-  "Accept-Language": CURRENT_LANGUAGE_KEY
-  }
-  return finalOpts;
-};
-
-const changeResponseData = (response: AxiosResponse<any, any>, getResponse: boolean) => {
-  const currentResponseData = response.data;
-  let finalResponse = currentResponseData;
-  if (currentResponseData?.code) {
-    const { code, result } = currentResponseData;
-    const regex = /^0+$/;
-    if (result) {
-      finalResponse = {
-        ...currentResponseData,
-        success: regex.test(code),
-        data: Array.isArray(result) ? result : result?.records,
-        total: Array.isArray(result) ? result.length : result?.totalRows
-      }
-    }
-    response.data = { ...finalResponse };
-  }
-  return getResponse ? response : finalResponse;
-};
-
-const request: IRequest = (url: string, opts: IRequestOptions = { method: 'GET' }) => {
-  const requestInstance = getRequestInstance(opts);
-  const config = getConfig();
-  const finalOpts = changeRequestData(opts);
-  const { getResponse = false, requestInterceptors, responseInterceptors } = finalOpts;
-  const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => {
-    if(interceptor instanceof Array){
-      return requestInstance.interceptors.request.use((config) => {
-        const { url } = config;
-        if(interceptor[0].length === 2){
-          const res = interceptor[0](url, config);
-          return getPromiseValue(res, (val) => {
-            const { url: newUrl, options = {} } = val
-            return { ...options, url: newUrl }
-          });
-        }
-        return interceptor[0](config);
-      }, interceptor[1]);
-    } else {
-      return requestInstance.interceptors.request.use((config) => {
-        const { url } = config;
-        if(interceptor.length === 2){
-          const res = interceptor(url, config);
-          return getPromiseValue(res, (val) => {
-            const { url: newUrl, options = {} } = val
-            return { ...options, url: newUrl }
-          });
-        }
-        return interceptor(config);
-      })
-    }
-    });
-  const responseInterceptorsToEject = responseInterceptors?.map((interceptor) => {
-    return interceptor instanceof Array ?
-      requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
-       requestInstance.interceptors.response.use(interceptor);
-    });
-  return new Promise((resolve, reject)=>{
-    requestInstance
-      .request({...finalOpts, url})
-      .then((res)=>{
-        requestInterceptorsToEject?.forEach((interceptor) => {
-          requestInstance.interceptors.request.eject(interceptor);
-        });
-        responseInterceptorsToEject?.forEach((interceptor) => {
-          requestInstance.interceptors.response.eject(interceptor);
-        });
-        resolve(changeResponseData(res,getResponse ))
-      })
-      .catch((error)=>{
-        requestInterceptorsToEject?.forEach((interceptor) => {
-          requestInstance.interceptors.request.eject(interceptor);
-        });
-        responseInterceptorsToEject?.forEach((interceptor) => {
-          requestInstance.interceptors.response.eject(interceptor);
-        });
-        const {response, message} = error;
-        if(response){
-          dealRequestData({
-            ...response,
-            message
-          }, opts);
-        }
-        reject(error);
-      })
-  })
-}
-
-// interface PageParams {
-//   pageSize?: number;
-//   current?: number;
-//   keyword?: string;
-// }
-
-// type WidthPageParams<T> = T & PageParams;
-
-// type TableRequest<T, U> = ProTableProps<T, U>['request']
-
-
-type ApiSort = {
-  field?: string;
-  direction?: string;
-  asc?: boolean;
-}
-
-type SortOrder = Record<string, "descend" | "ascend" | null>
-
-function sortFilterProTable<P, D>(
-  fn: (
-    params: P & {
-      sort?: ApiSort[];
-    }
-  ) => Promise<ApiResponse<D>>
-) {
-  return (
-    params: P & {
-      pageSize?: number;
-      current?: number;
-      keyword?: string;
-    },
-    sort: SortOrder,
-    filter: Record<string, (string | number)[] | null>
-  ) => {
-    let finalSort: ApiSort = {};
-    let finalParams:  P & {
-      pageSize?: number;
-      current?: number;
-      keyword?: string;
-      sort?: ApiSort[]
-    }  = {...params};
-
-    if(sort){
-      Object.keys(sort).forEach((key) => {
-        if (sort[key]) {
-          finalSort.field = key;
-          finalSort.asc = sort[key] === "ascend" ? true : false;
-        }
-      });
-    };
-
-    if(filter){
-      Object.keys(filter).forEach((key) => {
-        if (filter[key]) {
-          finalParams[key] = filter[key];
-        }
-      });
-    }
-
-    if(finalSort.field){
-      finalParams.sort = [finalSort];
-    }
-    return fn(finalParams);
-  };
-}
-
-export {
-  useRequest,
-  request,
-  getRequestInstance,
-  sortFilterProTable,
-  HttpStatusEnum,
-  HttpMessageEnum
-};
-export type {
-  AxiosInstance,
-  AxiosRequestConfig,
-  AxiosResponse,
-  AxiosError,
-  RequestError,
-  IResponseInterceptor as ResponseInterceptor,
-  IRequestOptions as RequestOptions,
-  IRequest as Request,
-};
-

package/dist/template/request/runtime-config.tpl

@@ -1,6 +0,0 @@
-// @ts-nocheck
-
-import type { RequestConfig } from './types.d'
-export type IRuntimeConfig = {
-  request: RequestConfig
-}

package/dist/template/request/type.tpl

@@ -1,6 +0,0 @@
-// @ts-nocheck 
-export type {
-  AxiosError, AxiosInstance,
-  AxiosRequestConfig,
-  AxiosResponse, Request, RequestConfig, RequestError, RequestOptions, ResponseInterceptor
-} from './request';