diff --git a/template/.gitignore b/template/.gitignore index 7bc388e..9dc9b7d 100644 --- a/template/.gitignore +++ b/template/.gitignore @@ -61,6 +61,7 @@ out # Nuxt.js build / generate output .nuxt dist +build # Gatsby files .cache/ # Comment in the public line in if your project uses Gatsby and not Next.js @@ -86,5 +87,5 @@ dist .pnp.* package-lock.json -src/wechatMp/dist -oak-app-domain \ No newline at end of file +oak-app-domain +*/public/locales \ No newline at end of file diff --git a/template/.stylelintrc.js b/template/.stylelintrc.js index 969b363..99446b0 100644 --- a/template/.stylelintrc.js +++ b/template/.stylelintrc.js @@ -1,4 +1,3 @@ - module.exports = { customSyntax: 'postcss-less', extends: 'stylelint-config-standard', @@ -16,9 +15,14 @@ module.exports = { 'no-duplicate-selectors': null, 'selector-class-pattern': null, 'font-family-no-missing-generic-family-keyword': null, - 'function-no-unknown': [true, { ignoreFunctions: ['alpha', 'constant', 'fadeout'] }], + 'function-no-unknown': [ + true, + { ignoreFunctions: ['alpha', 'constant', 'fadeout'] }, + ], 'declaration-block-no-shorthand-property-overrides': null, 'no-empty-source': null, - 'selector-type-no-unknown': null + 'selector-type-no-unknown': null, + 'function-url-quotes': null, + 'max-line-length': null, }, -}; \ No newline at end of file +}; diff --git a/template/src/RunningContext.ts b/template/src/RunningContext.ts index 72d1fe9..26eadde 100644 --- a/template/src/RunningContext.ts +++ b/template/src/RunningContext.ts @@ -1,6 +1,21 @@ import { GeneralRuntimeContext } from 'oak-general-business'; import { EntityDict } from 'oak-app-domain'; +import { RowStore } from 'oak-domain/lib/types'; export class RuntimeContext extends GeneralRuntimeContext { - -} \ No newline at end of file + static FromCxtStr(cxtStr?: string) { + const { token, applicationId, scene } = cxtStr + ? GeneralRuntimeContext.fromString(cxtStr) + : { + token: undefined, + applicationId: undefined, + scene: undefined, + }; + return (store: RowStore) => { + const context = new RuntimeContext(store, applicationId); + context.setScene(scene); + context.setToken(token); + return context; + }; + } +} diff --git a/template/src/aspects/AspectDict.ts b/template/src/aspects/AspectDict.ts new file mode 100644 index 0000000..68c1a3e --- /dev/null +++ b/template/src/aspects/AspectDict.ts @@ -0,0 +1,7 @@ +import { RuntimeContext } from "../RuntimeContext"; +import { AspectDict as GeneralAspectDict } from 'oak-general-business/src/aspects/AspectDict'; +import { EntityDict } from "oak-app-domain"; + +export type AspectDict = { + test: (params: string, context: RuntimeContext) => Promise; +} & GeneralAspectDict; diff --git a/template/src/aspects/index.ts b/template/src/aspects/index.ts index 807975f..d564e2c 100644 --- a/template/src/aspects/index.ts +++ b/template/src/aspects/index.ts @@ -1,14 +1,13 @@ -import { Aspect } from 'oak-domain/lib/types'; -import { aspectDict as GeneralAspectDict } from 'oak-general-business'; +import { test } from './sample'; +import { aspectDict as generalAspectDict } from 'oak-general-business'; +import { AspectDict as GeneralAspectDict } from 'oak-general-business/src/aspects/AspectDict'; +import { AspectDict } from './AspectDict'; import { EntityDict } from 'oak-app-domain'; import { RuntimeContext } from '../RuntimeContext'; -import { test } from './sample'; - -const aspectDict = Object.assign({ +const aspectDict = { test, -}, GeneralAspectDict as Record>); + ...generalAspectDict, +} as AspectDict & GeneralAspectDict; -export { - aspectDict, -} \ No newline at end of file +export { aspectDict }; diff --git a/template/src/checkers/index.ts b/template/src/checkers/index.ts index 705d67f..900b4dd 100644 --- a/template/src/checkers/index.ts +++ b/template/src/checkers/index.ts @@ -1,7 +1,14 @@ import { EntityDict } from 'oak-app-domain'; import { Checker } from 'oak-domain/lib/types'; -import { checkers as GeneralCheckers } from 'oak-general-business'; +import { processCheckers } from 'oak-general-business/src/utils/check'; +import { checkers as generalCheckers } from 'oak-general-business'; import { RuntimeContext } from '../RuntimeContext'; import { checkers as houseCheckers } from './house'; -export const checkers = [...houseCheckers, ...GeneralCheckers] as Checker[]; \ No newline at end of file +const checkers = [...houseCheckers, ...generalCheckers] as Checker< + EntityDict, + keyof EntityDict, + RuntimeContext +>[]; +processCheckers(checkers); +export { checkers }; diff --git a/template/src/config/index.ts b/template/src/config/index.ts index 09ac130..2ba233b 100644 --- a/template/src/config/index.ts +++ b/template/src/config/index.ts @@ -1,9 +1,33 @@ -import { appid, projectname } from '../../wechatMp/src/project.config.json'; +import WechatMpConfig from '../../wechatMp/src/project.config.json'; export default { - weChatMp: { // 第一个小程序的配置 - appId: appid, // 请到progjection.config.json中修改 - appSecret: 'b40433d3b20e1eea5544fcf6f4bbe291', // appSecret - appName: projectname, // 请到progjection.config.json中修改 + weChatMp: { + // 第一个小程序的配置 + appId: WechatMpConfig.appid, // 请到progjection.config.json中修改 + appSecret: 'b40433d3b20e1eea5544fcf6f4bbe291', // appSecret + appName: WechatMpConfig.projectname, // 请到progjection.config.json中修改 + }, + System: { + develop: { + name: 'develop', + description: '开发用的system', + config: { + Map: { + amap: { + webApiKey: '', + }, + }, + Cos: { + qiniu: { + accessKey: '', + secretKey: '', + uploadHost: 'https://up.qiniup.com', //七牛上传域名 + bucket: 'test', + domain: '', + protocol: 'http', + }, + }, + }, + }, }, }; diff --git a/template/src/data/application.ts b/template/src/data/application.ts index 7b8184f..ecbaffb 100644 --- a/template/src/data/application.ts +++ b/template/src/data/application.ts @@ -1,6 +1,9 @@ import { CreateOperationData as Application } from 'oak-app-domain/Application/Schema'; -import { DEV_SYSTEM_ID } from './system'; -const DEV_WECHATMP_APPLICATION_ID = 'MY_DEV_WECHATMP_APPLICATION_ID'; +import { + DEV_SYSTEM_ID, + DEV_WECHATMP_APPLICATION_ID, + DEV_WEB_APPLICATION_ID, +} from 'oak-general-business'; import Config from '../config'; export const applications: Application[] = [ @@ -15,5 +18,15 @@ export const applications: Application[] = [ appSecret: Config.weChatMp.appSecret, }, description: '小程序应用，指向dev_system', - } -]; \ No newline at end of file + }, + { + id: DEV_WEB_APPLICATION_ID, + name: 'devWeb', + type: 'web', + systemId: DEV_SYSTEM_ID, + config: { + type: 'web', + }, + description: 'web应用，指向dev_system', + }, +]; diff --git a/template/src/data/domain.ts b/template/src/data/domain.ts new file mode 100644 index 0000000..21a4d7d --- /dev/null +++ b/template/src/data/domain.ts @@ -0,0 +1,13 @@ +import { CreateOperationData as Domain } from 'oak-app-domain/Domain/Schema'; +import { DEV_SYSTEM_ID, DEV_DOMAIN_ID } from 'oak-general-business'; + +export const domains: Domain[] = [ + { + id: DEV_DOMAIN_ID, + protocol: 'http', + url: 'localhost', + port: 3001, + apiPath: '/rest/aspect', + systemId: DEV_SYSTEM_ID, + }, +]; \ No newline at end of file diff --git a/template/src/data/index.ts b/template/src/data/index.ts index 4ded7fc..ff56687 100644 --- a/template/src/data/index.ts +++ b/template/src/data/index.ts @@ -1,8 +1,11 @@ import { applications } from './application'; import { systems } from './system'; -import { data as GeneralData } from 'oak-general-business'; +import { domains } from './domain'; +import { data as generalData } from 'oak-general-business'; -export const data = Object.assign({ +export const data = { application: applications, system: systems, -}, GeneralData); + ...generalData, + domain: domains, +}; diff --git a/template/src/data/system.ts b/template/src/data/system.ts index 273f122..f03c0d4 100644 --- a/template/src/data/system.ts +++ b/template/src/data/system.ts @@ -1,11 +1,13 @@ import { CreateOperationData as System } from 'oak-app-domain/System/Schema'; -export const DEV_SYSTEM_ID = 'MY_DEV_SYSTEM_ID'; +import { DEV_SYSTEM_ID } from 'oak-general-business'; + +import Config from '../config'; export const systems: System[] = [ { id: DEV_SYSTEM_ID, - name: 'develop', - description: '开发用的system', - config: {}, - } -]; \ No newline at end of file + name: Config.System.develop.name, + description: Config.System.develop.description, + config: Config.System.develop.config, + }, +]; diff --git a/template/src/exceptionRouters.ts b/template/src/exceptionRouters.ts index ec43d04..c786cc8 100644 --- a/template/src/exceptionRouters.ts +++ b/template/src/exceptionRouters.ts @@ -1,9 +1,13 @@ import { ExceptionRouters } from 'oak-frontend-base'; -import { exceptionRouters as GenenralExceptionRouters } from 'oak-general-business'; import { ExampleException } from './types/Exception'; +import { exceptionRouters as generalExceptionRouter } from 'oak-general-business'; -export const routers = ([ - [ExampleException, { - router: '/url/url', - }] -] as ExceptionRouters).concat(GenenralExceptionRouters); +export const routers = [ + [ + ExampleException, + { + router: '/url/url', + }, + ], + ...generalExceptionRouter, +] as ExceptionRouters; diff --git a/template/src/features/index.ts b/template/src/features/index.ts index 6751934..27fec8e 100644 --- a/template/src/features/index.ts +++ b/template/src/features/index.ts @@ -1,14 +1,26 @@ import { EntityDict } from 'oak-app-domain'; import { BasicFeatures } from 'oak-frontend-base'; +import { CommonAspectDict } from 'oak-common-aspect'; import * as Sample from './Sample'; -import { aspectDict } from '../aspects'; +import { AspectDict } from '../aspects/AspectDict'; import { RuntimeContext } from '../RuntimeContext'; -import { GeneralRuntimeContext } from 'oak-general-business'; +import { AspectWrapper } from 'oak-domain/lib/types'; -export function initialize(basicFeatures: BasicFeatures) { +export function initialize( + aspectWrapper: AspectWrapper< + EntityDict, + RuntimeContext, + AspectDict & CommonAspectDict + >, + basicFeatures: BasicFeatures< + EntityDict, + RuntimeContext, + AspectDict & CommonAspectDict + > +) { const { cache } = basicFeatures; - const sample = new Sample.Sample(cache); + const sample = new Sample.Sample(aspectWrapper, cache); return { sample, diff --git a/template/src/initialize.dev.ts b/template/src/initialize.dev.ts new file mode 100644 index 0000000..5df762d --- /dev/null +++ b/template/src/initialize.dev.ts @@ -0,0 +1,88 @@ +import './utils/polyfill'; +import { initialize as init } from 'oak-frontend-base/src/initialize.dev'; + +import { EntityDict, storageSchema, ActionDefDict } from 'oak-app-domain'; +import { CommonAspectDict } from 'oak-common-aspect'; +import { RuntimeContext } from './RuntimeContext'; + +import { initialize as initializeGeneralFeatures } from 'oak-general-business/src/features'; + +import { initialize as initializeFeatures } from './features'; +import { data } from './data'; +import { routers } from './exceptionRouters'; +import { checkers } from './checkers'; + + +// dev需要将下面内容也传入 +import { AspectDict } from './aspects/AspectDict'; +import { aspectDict } from './aspects'; +import { triggers } from './triggers'; +import { watchers } from './watchers'; + +import { AspectWrapper } from 'oak-domain/lib/types'; +import { BasicFeatures } from 'oak-frontend-base'; +import { AppType } from 'oak-app-domain/Application/Schema'; + +export default function initialize(type: AppType, url?: string) { + let wholeFeatures = {}; + const createFeatures = ( + aspectWrapper: AspectWrapper< + EntityDict, + RuntimeContext, + AspectDict & CommonAspectDict + >, + basicFeatures: BasicFeatures< + EntityDict, + RuntimeContext, + AspectDict & CommonAspectDict + >, + context: RuntimeContext + ) => { + const { token, extraFile, application } = initializeGeneralFeatures< + EntityDict, + RuntimeContext, + AspectDict + >(aspectWrapper, basicFeatures, type, context); + + const features = initializeFeatures(aspectWrapper, basicFeatures); + const features2 = Object.assign( + { + token, + extraFile, + application, + }, + features + ); + + Object.assign(wholeFeatures, features2, basicFeatures); + return features2; + }; + + const { i18n } = init< + EntityDict, + RuntimeContext, + AspectDict, + ReturnType + >( + storageSchema, + createFeatures, + RuntimeContext.FromCxtStr, + aspectDict, + routers, + triggers, + checkers, + watchers, + data as any, + ActionDefDict, + ); + + return { + i18n, + features: wholeFeatures as BasicFeatures< + EntityDict, + RuntimeContext, + AspectDict & CommonAspectDict + > & + ReturnType, + }; +} diff --git a/template/src/initialize.prod.ts b/template/src/initialize.prod.ts new file mode 100644 index 0000000..941371a --- /dev/null +++ b/template/src/initialize.prod.ts @@ -0,0 +1,99 @@ +import './utils/polyfill'; +import { initialize as init } from 'oak-frontend-base/src/initialize.prod'; +import { SimpleConnector } from 'oak-domain/lib/utils/SimpleConnector'; + +import { AspectWrapper } from 'oak-domain/lib/types'; +import { EntityDict, storageSchema, ActionDefDict } from 'oak-app-domain'; +import { CommonAspectDict } from 'oak-common-aspect'; +import { RuntimeContext } from './RuntimeContext'; + +import { initialize as initializeGeneralFeatures } from 'oak-general-business/src/features'; + +import { initialize as initializeFeatures } from './features'; +import { routers } from './exceptionRouters'; +import { checkers } from './checkers'; +import { makeException } from './types/Exception'; +import { AspectDict } from './aspects/AspectDict'; + +import { BasicFeatures } from 'oak-frontend-base'; +import { AppType } from 'oak-app-domain/Application/Schema'; + + +export default function initialize(type: AppType, url: string) { + let wholeFeatures = {}; + const createFeatures = ( + aspectWrapper: AspectWrapper< + EntityDict, + RuntimeContext, + AspectDict & CommonAspectDict + >, + basicFeatures: BasicFeatures< + EntityDict, + RuntimeContext, + AspectDict & CommonAspectDict + >, + context: RuntimeContext + ) => { + const { token, extraFile, application } = initializeGeneralFeatures< + EntityDict, + RuntimeContext, + AspectDict + >(aspectWrapper, basicFeatures, type, context); + + const features = initializeFeatures(aspectWrapper, basicFeatures); + const features2 = Object.assign( + { + token, + extraFile, + application, + }, + features + ); + + Object.assign(wholeFeatures, features2, basicFeatures); + return features2; + }; + + let URL: string; + /** + * 如果是本地前后端联调，可以显示import initialize.prod走到这里 + */ + if (type === 'wechatMp') { + // 如果是小程序，需要显式传入url + const apiPath = process.env.NODE_ENV === 'development' ? '3001': '/oak-api'; // 生产环境通过路径映射增加oak-api + const protocol = process.env.NODE_ENV === 'development' ? 'http://' : 'https://'; + URL = `${protocol}${url}${apiPath}/aspect`; + } + else if (process.env.NODE_ENV === 'development') { + URL = 'http://localhost:3001/aspect'; + } + else { + // web和public环境只需要传相对路径 + URL = `/oak-api/aspect`; + } + const connector = new SimpleConnector(URL, makeException, RuntimeContext.FromCxtStr); + const { i18n } = init< + EntityDict, + RuntimeContext, + AspectDict, + ReturnType + >( + storageSchema, + createFeatures, + RuntimeContext.FromCxtStr, + routers, + connector, + checkers, + ActionDefDict, + ); + + return { + i18n, + features: wholeFeatures as BasicFeatures< + EntityDict, + RuntimeContext, + AspectDict & CommonAspectDict + > & + ReturnType, + }; +} diff --git a/template/src/initialize.ts b/template/src/initialize.ts index 4ff8747..34c4a48 100644 --- a/template/src/initialize.ts +++ b/template/src/initialize.ts @@ -1,40 +1,4 @@ -import './utils/polyfill'; -import { initializeFeatures as initializeGeneralFeatures } from 'oak-general-business'; -import { BasicFeatures, } from 'oak-frontend-base'; -import { EntityDict } from 'oak-app-domain'; -import { RuntimeContext } from './RuntimeContext'; -import { aspectDict } from './aspects'; -import { initialize } from './features'; -import { checkers } from './checkers'; -import { watchers } from './watchers'; -import { triggers } from './triggers'; -import { data } from './data'; -import { routers } from './exceptionRouters'; +import initialize from './initialize.dev'; +export default initialize; -const { token, extraFile, application } = initializeGeneralFeatures(); - -const createFeatures = (basicFeatures: BasicFeatures) => { - const features = initialize(basicFeatures); - const wholeFeatures = Object.assign( - { - token, - extraFile, - application, - }, - features - ); - return wholeFeatures; -}; - -export { - createFeatures, - aspectDict, - triggers, - checkers, - watchers, - data, - routers, - - token, - application, -} +console.log('不应该走到这里'); diff --git a/template/wechatMp/src/pages/index/index.json b/template/src/pages/index/index.json similarity index 100% rename from template/wechatMp/src/pages/index/index.json rename to template/src/pages/index/index.json diff --git a/template/src/pages/index/index.less b/template/src/pages/index/index.less new file mode 100644 index 0000000..1086664 --- /dev/null +++ b/template/src/pages/index/index.less @@ -0,0 +1,5 @@ +/** index.wxss **/ + +.container { + display: flex; +} diff --git a/template/src/pages/index/index.ts b/template/src/pages/index/index.ts new file mode 100644 index 0000000..457a238 --- /dev/null +++ b/template/src/pages/index/index.ts @@ -0,0 +1,22 @@ + +export default OakPage({ + path: 'house:list', + entity: 'house', + projection: { + id: 1, + iState: 1, + coordinate: 1, + decorative: 1, + orientation: 1, + space: 1, + }, + isList: true, + formData: async function ({ data, features }) { + const application = await features.application.getApplication(); + return {}; + }, + // filters: [], + // sorters: [], + methods: { + }, +}); diff --git a/template/src/pages/index/index.tsx b/template/src/pages/index/index.tsx new file mode 100644 index 0000000..07ddfd0 --- /dev/null +++ b/template/src/pages/index/index.tsx @@ -0,0 +1,11 @@ +import * as React from 'react'; + +export default function render() { + const { t } = this; + const { searchValue } = this.state; + return ( +
+ +
+ ); +} \ No newline at end of file diff --git a/template/src/pages/index/index.wxml b/template/src/pages/index/index.wxml new file mode 100644 index 0000000..e65a4b8 --- /dev/null +++ b/template/src/pages/index/index.wxml @@ -0,0 +1,4 @@ + + + + diff --git a/template/src/triggers/index.ts b/template/src/triggers/index.ts index 3cb05b3..1b6bdde 100644 --- a/template/src/triggers/index.ts +++ b/template/src/triggers/index.ts @@ -1,7 +1,10 @@ +import { triggers as generalTriggers } from 'oak-general-business'; import { triggers as houseTriggers } from './house'; -import { triggers as GenenralTriggers } from 'oak-general-business'; import { Trigger } from 'oak-domain/lib/types'; import { EntityDict } from 'oak-app-domain'; import { RuntimeContext } from '../RuntimeContext'; -export const triggers = [...houseTriggers, ...GenenralTriggers] as Trigger[]; +export const triggers = [ + ...houseTriggers, + ...generalTriggers, +] as Trigger[]; diff --git a/template/src/types/Exception.ts b/template/src/types/Exception.ts index adb8d17..c21a9dd 100644 --- a/template/src/types/Exception.ts +++ b/template/src/types/Exception.ts @@ -1,3 +1,23 @@ -import { OakException } from "oak-domain/lib/types"; +import { OakException } from 'oak-domain/lib/types'; +import { makeException as makeGeneralException } from 'oak-general-business/lib/types/Exceptions'; -export class ExampleException extends OakException {}; \ No newline at end of file +export class ExampleException extends OakException {} + +export function makeException(msg: string | object) { + const data = typeof msg === 'string' ? JSON.parse(msg) : msg; + + const exception = makeGeneralException(data); + if (exception) { + return exception; + } + + const { name, message } = data; + switch (name) { + case ExampleException.name: { + return new ExampleException(message); + } + default: { + throw new OakException(`不可解读的exception信息「${msg}」`); + } + } +} diff --git a/template/src/typings/polyfill.d.ts b/template/src/typings/polyfill.d.ts index a1a19da..29b1e07 100644 --- a/template/src/typings/polyfill.d.ts +++ b/template/src/typings/polyfill.d.ts @@ -1,6 +1,43 @@ +import { GenerateIdOption } from '../utils/polyfill'; +import { MakeOakComponent, MakeOakPage } from 'oak-frontend-base/src/page.mp'; +import { + MakeOakComponent as MakeOakWebComponent, + MakeOakPage as MakeOakWebPage, +} from 'oak-frontend-base/src/page.web'; +import { EntityDict } from 'oak-app-domain'; +import { RuntimeContext } from '../RuntimeContext'; +import { aspectDict } from '../aspects'; +import { initialize } from '../initialize'; declare global { - const generateNewId: () => Promise; + const __DEV__: boolean; + const generateNewId: (option?: GenerateIdOption) => Promise; const getRandomValues: (length: number) => Promise; + const OakPage: + | MakeOakPage< + EntityDict, + RuntimeContext, + typeof aspectDict, + ReturnType['features'] + > + | MakeOakWebPage< + EntityDict, + RuntimeContext, + typeof aspectDict, + ReturnType['features'] + >; + const OakComponent: + | MakeOakComponent< + EntityDict, + RuntimeContext, + typeof aspectDict, + ReturnType['features'] + > + | MakeOakWebComponent< + EntityDict, + RuntimeContext, + typeof aspectDict, + ReturnType['features'] + >; } -export {} \ No newline at end of file +export {}; diff --git a/template/src/utils/polyfill.ts b/template/src/utils/polyfill.ts index c233aba..cee4cea 100644 --- a/template/src/utils/polyfill.ts +++ b/template/src/utils/polyfill.ts @@ -1,7 +1,14 @@ -import { v4 } from 'uuid'; +import { v4, v1 } from 'uuid'; -async function generateNewId() { - return v4({ random: await getRandomValues(16) }); +export type GenerateIdOption = { + shuffle?: boolean; +}; + +async function generateNewId(option?: GenerateIdOption) { + if (option?.shuffle && process.env.NODE_ENV === 'development') { + return v4({ random: await getRandomValues(16) }); + } + return v1({ random: await getRandomValues(16) }); } Object.assign(global, { diff --git a/template/src/watchers/index.ts b/template/src/watchers/index.ts new file mode 100644 index 0000000..57e139d --- /dev/null +++ b/template/src/watchers/index.ts @@ -0,0 +1,10 @@ +import { watchers as generalWatchers } from 'oak-general-business'; +import { Watcher } from 'oak-domain/lib/types'; +import { EntityDict } from 'oak-app-domain'; +import { RuntimeContext } from '../RuntimeContext'; + +export const watchers = [...generalWatchers] as Watcher< + EntityDict, + keyof EntityDict, + RuntimeContext +>[]; diff --git a/template/web/public/favicon.ico b/template/web/public/favicon.ico new file mode 100644 index 0000000..a11777c Binary files /dev/null and b/template/web/public/favicon.ico differ diff --git a/template/web/public/index.html b/template/web/public/index.html new file mode 100644 index 0000000..aa069f2 --- /dev/null +++ b/template/web/public/index.html @@ -0,0 +1,43 @@ + + + + + + + + + + + + + React App + + + +
+ + + diff --git a/template/web/public/logo192.png b/template/web/public/logo192.png new file mode 100644 index 0000000..fc44b0a Binary files /dev/null and b/template/web/public/logo192.png differ diff --git a/template/web/public/logo512.png b/template/web/public/logo512.png new file mode 100644 index 0000000..a4e47a6 Binary files /dev/null and b/template/web/public/logo512.png differ diff --git a/template/web/public/manifest.json b/template/web/public/manifest.json new file mode 100644 index 0000000..080d6c7 --- /dev/null +++ b/template/web/public/manifest.json @@ -0,0 +1,25 @@ +{ + "short_name": "React App", + "name": "Create React App Sample", + "icons": [ + { + "src": "favicon.ico", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + }, + { + "src": "logo192.png", + "type": "image/png", + "sizes": "192x192" + }, + { + "src": "logo512.png", + "type": "image/png", + "sizes": "512x512" + } + ], + "start_url": ".", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" +} diff --git a/template/web/public/robots.txt b/template/web/public/robots.txt new file mode 100644 index 0000000..e9e57dc --- /dev/null +++ b/template/web/public/robots.txt @@ -0,0 +1,3 @@ +# https://www.robotstxt.org/robotstxt.html +User-agent: * +Disallow: diff --git a/template/web/src/App.less b/template/web/src/App.less new file mode 100644 index 0000000..72c3a54 --- /dev/null +++ b/template/web/src/App.less @@ -0,0 +1,3 @@ +@import 'tdesign-react/es/style/index.css'; // 少量公共样式 + +@import 'tdesign-mobile-react/es/style/index.css'; // 少量公共样式 diff --git a/template/web/src/App.test.tsx b/template/web/src/App.test.tsx new file mode 100644 index 0000000..2a68616 --- /dev/null +++ b/template/web/src/App.test.tsx @@ -0,0 +1,9 @@ +import React from 'react'; +import { render, screen } from '@testing-library/react'; +import App from './App'; + +test('renders learn react link', () => { + render(); + const linkElement = screen.getByText(/learn react/i); + expect(linkElement).toBeInTheDocument(); +}); diff --git a/template/web/src/App.tsx b/template/web/src/App.tsx new file mode 100644 index 0000000..c5a93a1 --- /dev/null +++ b/template/web/src/App.tsx @@ -0,0 +1,49 @@ +import React from 'react'; +import { Routes, Route } from 'react-router-dom'; + +import './App.less'; +import LazyLoad from './utils/lazyLoad'; +const Console = LazyLoad(() => import('./template/console')); +const Frontend = LazyLoad(() => import('./template/frontend')); +const NotFound = LazyLoad(() => import('./template/notFound')); +const Message = LazyLoad(() =>import('@oak-general-business/components/message')); + +type Router = { + path: string; + element: ReturnType; + title: string; +} + +function getRoutes(routers2: Router[], namespace?: string) { + return routers2.map((router, index) => { + const { path, element } = router; + return ( + + ); + }); +} +// routers非常重要，不能删除 +let routers: Router[] = []; + +function App() { + return ( + + {Message} + + + {getRoutes(routers, 'console')} + + + {getRoutes(routers)} + + + + + ); +} + +export default App; diff --git a/template/web/src/app.json b/template/web/src/app.json new file mode 100644 index 0000000..76f8803 --- /dev/null +++ b/template/web/src/app.json @@ -0,0 +1,31 @@ +{ + "pages": [ + "@project/pages/house/list/index", + "@project/pages/house/info/index", + "@project/pages/lease/list/index", + "@project/pages/lease/info/index", + "@project/pages/lease/detail/index", + "@project/pages/lease/upsert/index", + "@project/pages/house/upsert/index", + "@project/pages/house/detail/index", + "@project/pages/house/rental/index", + "@project/pages/house/picture/index", + "@project/pages/pickers/tag/index", + "@project/pages/tag/upsert/index", + "@oak-general-business/pages/userRelation/onUser/index", + "@oak-general-business/pages/userRelation/onEntity/index", + "@oak-general-business/pages/address/list/index", + "@oak-general-business/pages/address/upsert/index", + "@oak-general-business/pages/token/me/index", + "@oak-general-business/pages/pickers/area/index", + "@oak-general-business/pages/mobile/me/index", + "@oak-general-business/pages/mobile/login/index", + "@oak-general-business/pages/user/manage/index", + "@oak-general-business/pages/user/manage/detail/index", + "@oak-general-business/pages/user/manage/upsert/index", + "@oak-general-business/pages/userEntityGrant/grant/index", + "@oak-general-business/pages/wechatQrCode/scan/index", + "@oak-general-business/pages/userEntityGrant/detail/index", + "@oak-general-business/pages/userEntityGrant/confirm/index" + ] +} diff --git a/template/web/src/index.less b/template/web/src/index.less new file mode 100644 index 0000000..ec2585e --- /dev/null +++ b/template/web/src/index.less @@ -0,0 +1,13 @@ +body { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +code { + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; +} diff --git a/template/web/src/index.tsx b/template/web/src/index.tsx new file mode 100644 index 0000000..6137c37 --- /dev/null +++ b/template/web/src/index.tsx @@ -0,0 +1,43 @@ +import './utils/polyfill'; +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import { BrowserRouter } from 'react-router-dom'; +import { I18nextProvider } from 'react-i18next'; +import './index.less'; +import App from './App'; +import reportWebVitals from './reportWebVitals'; +import { ResponsiveProvider } from 'oak-frontend-base/src/platforms/web/responsive'; +import { getAppType } from './utils/env'; +import initialize from '../../src/initialize'; + +const appType = getAppType(); +const { features, i18n } = initialize(appType, window.location.hostname); +Object.assign(global, { + features, +}) + +const root = ReactDOM.createRoot( + document.getElementById('root') as HTMLElement +); + +features.application.getApplication() +.then( + () => { + root.render( + // + + + + + + + + // + ); + } +) + +// If you want to start measuring performance in your app, pass a function +// to log results (for example: reportWebVitals(console.log)) +// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals +reportWebVitals(); diff --git a/template/web/src/logo.svg b/template/web/src/logo.svg new file mode 100644 index 0000000..9dfc1c0 --- /dev/null +++ b/template/web/src/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/template/web/src/react-app-env.d.ts b/template/web/src/react-app-env.d.ts new file mode 100644 index 0000000..6889c6b --- /dev/null +++ b/template/web/src/react-app-env.d.ts @@ -0,0 +1 @@ +/// \ No newline at end of file diff --git a/template/web/src/reportWebVitals.ts b/template/web/src/reportWebVitals.ts new file mode 100644 index 0000000..49a2a16 --- /dev/null +++ b/template/web/src/reportWebVitals.ts @@ -0,0 +1,15 @@ +import { ReportHandler } from 'web-vitals'; + +const reportWebVitals = (onPerfEntry?: ReportHandler) => { + if (onPerfEntry && onPerfEntry instanceof Function) { + import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { + getCLS(onPerfEntry); + getFID(onPerfEntry); + getFCP(onPerfEntry); + getLCP(onPerfEntry); + getTTFB(onPerfEntry); + }); + } +}; + +export default reportWebVitals; diff --git a/template/web/src/setupTests.ts b/template/web/src/setupTests.ts new file mode 100644 index 0000000..8f2609b --- /dev/null +++ b/template/web/src/setupTests.ts @@ -0,0 +1,5 @@ +// jest-dom adds custom jest matchers for asserting on DOM nodes. +// allows you to do things like: +// expect(element).toHaveTextContent(/react/i) +// learn more: https://github.com/testing-library/jest-dom +import '@testing-library/jest-dom'; diff --git a/template/web/src/template/console/index.tsx b/template/web/src/template/console/index.tsx new file mode 100644 index 0000000..2d77cd3 --- /dev/null +++ b/template/web/src/template/console/index.tsx @@ -0,0 +1,28 @@ + +import React from 'react'; +import { useNavigate, useParams, useSearchParams, useLocation } from 'react-router-dom'; +import { Routes, Route, Outlet } from 'react-router-dom'; + + +// function Console() { +// const n = useNavigate(); +// const d = useParams(); +// const [search, setSearch] = useSearchParams(); +// const id = search.get('id'); +// const l = useLocation(); +// console.log(d, id, l); +// return
{ +// n('', { state: { name: '212' } }) +// }}>console
; +// } + +// export default Console; + + +function Console() { + return ( + + ); +} + +export default Console; \ No newline at end of file diff --git a/template/web/src/template/frontend/index.tsx b/template/web/src/template/frontend/index.tsx new file mode 100644 index 0000000..272240a --- /dev/null +++ b/template/web/src/template/frontend/index.tsx @@ -0,0 +1,10 @@ + +import React from 'react'; +import { useNavigate, useParams, useSearchParams, useLocation } from 'react-router-dom'; +import { Outlet, Route } from 'react-router-dom'; + +function Frontend() { + return ; +} + +export default Frontend; \ No newline at end of file diff --git a/template/web/src/template/notFound/index.tsx b/template/web/src/template/notFound/index.tsx new file mode 100644 index 0000000..4adee22 --- /dev/null +++ b/template/web/src/template/notFound/index.tsx @@ -0,0 +1,8 @@ +import React from 'react'; + + +const NotFound = () => { + return
你来到了未知的区域
; +}; + +export default NotFound; diff --git a/template/web/src/utils/Loading.tsx b/template/web/src/utils/Loading.tsx new file mode 100644 index 0000000..a20c2d2 --- /dev/null +++ b/template/web/src/utils/Loading.tsx @@ -0,0 +1,22 @@ + +import React, { useEffect } from 'react'; + +import NProgress from 'nprogress'; +import 'nprogress/nprogress.css'; + +function Loading() { + //componentDidMount + useEffect(() => { + NProgress.start(); + }, []); + //componentWillUnmount + useEffect(() => { + return () => { + NProgress.done(); + }; + }, []); + + return null; +} + +export default Loading \ No newline at end of file diff --git a/template/web/src/utils/env.ts b/template/web/src/utils/env.ts new file mode 100644 index 0000000..88e2d4b --- /dev/null +++ b/template/web/src/utils/env.ts @@ -0,0 +1,6 @@ +export function getAppType() { + if (/MicroMessenger/i.test(window.navigator.userAgent)) { + return 'wechatPublic'; + } + return 'web'; +} \ No newline at end of file diff --git a/template/web/src/utils/lazyLoad.tsx b/template/web/src/utils/lazyLoad.tsx new file mode 100644 index 0000000..4069fda --- /dev/null +++ b/template/web/src/utils/lazyLoad.tsx @@ -0,0 +1,13 @@ +import React from "react"; +import Loading from './Loading'; + +const LazyLoad = (factory: () => Promise<{ default: any }>) => { + const Component = React.lazy(factory); + return ( + }> + + + ); +}; + +export default LazyLoad; \ No newline at end of file diff --git a/template/web/src/utils/polyfill.ts b/template/web/src/utils/polyfill.ts new file mode 100644 index 0000000..1fac444 --- /dev/null +++ b/template/web/src/utils/polyfill.ts @@ -0,0 +1,15 @@ + +Object.assign(global, { + fetch: fetch, + getRandomValues: async function getRandomValues(length: number) { + if (length > 65536) { + throw new Error('Can only request a maximum of 65536 bytes'); + } + const randomValues = window.crypto.getRandomValues( + new Uint8Array(length) + ); + + + return new Uint8Array(randomValues); + }, +}); diff --git a/template/wechatMp/src/app.less b/template/wechatMp/src/app.less index 7b74cf1..27ce786 100644 --- a/template/wechatMp/src/app.less +++ b/template/wechatMp/src/app.less @@ -1,12 +1,24 @@ -/**app.wxss**/ -@import url("https://fonts.googleapis.com/icon?family=Material+Icons"); +/** app.wxss **/ -.container { - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: space-between; - padding: 200rpx 0; - box-sizing: border-box; -} +@font-face { + font-family: "Material Symbols Rounded"; + font-style: normal; + font-weight: 400; + src: url(https://fonts.gstatic.com/s/sandbox/materialsymbolsrounded/v7/syl0-zNym6YjUruM-QrEh7-nyTnjDwKNJ_190FjpZIvDmUSVOK7BDB_Qb9vUSzq3wzLK-P0J-V_Zs-QtQth3-jOc7TOVpeRL2w5rwZu2rIelXxc.woff2) format("woff2"); +} + +.material-symbols-rounded { + font-family: "Material Symbols Rounded"; + font-weight: normal; + font-style: normal; + font-size: 44rpx; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + font-feature-settings: "liga"; + -webkit-font-smoothing: antialiased; +} \ No newline at end of file diff --git a/template/wechatMp/src/app.ts b/template/wechatMp/src/app.ts index 9aa3305..de4a6f4 100644 --- a/template/wechatMp/src/app.ts +++ b/template/wechatMp/src/app.ts @@ -1,4 +1,12 @@ -import { features } from './init'; +import './utils/polyfill'; + +import initialize from '../../src/initialize'; + +/** + * 初始化，小程序这里必须输入访问的目标域名，系统根据domain和system的关系来判定appId + */ +const url = 'localhost'; +const { features } = initialize('wechatMp', url); export interface IAppOption { globalData: { @@ -11,7 +19,9 @@ App({ features, }, async onLaunch() { - await features.token.loginWechatMp('app:onLaunch'); + // 等application初始化完成后进行登录 + await features.application.getApplication(); + features.token.loginWechatMp(); }, onHide() { diff --git a/template/wechatMp/src/components/message/index.json b/template/wechatMp/src/components/message/index.json deleted file mode 100644 index 32640e0..0000000 --- a/template/wechatMp/src/components/message/index.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "component": true -} \ No newline at end of file diff --git a/template/wechatMp/src/components/message/index.less b/template/wechatMp/src/components/message/index.less deleted file mode 100644 index 653d78e..0000000 --- a/template/wechatMp/src/components/message/index.less +++ /dev/null @@ -1,45 +0,0 @@ -.t-message { - width: 750rpx; - height: 0; - border-radius: 0rpx 0rpx 16rpx 16rpx; - display: flex; - justify-content: center; - align-items: center; - position: fixed; - left: 50%; - font-size: 28rpx; - color: #fff; - opacity: 0; - box-shadow: 0rpx 6rpx 16rpx 0rpx rgb(217 212 191 / 50%); - transform: translateX(-50%) translateZ(0) translateY(-100%); - transition: all 0.4s ease-in-out; - - &-success { - background-color: #34bfa3; - } - - &-error { - background-color: #f4516c; - } - - &-warning { - background-color: #ffe57f; - color: #333; - } - - &-primary { - background-color: #3963bc; - } -} - -.t-message-show { - transform: translateX(-50%) translateZ(0) translateY(0); - height: 72rpx; - opacity: 1; -} - -.t-message-image { - width: 30rpx; - height: 30rpx; - margin-right: 15rpx; -} diff --git a/template/wechatMp/src/components/message/index.ts b/template/wechatMp/src/components/message/index.ts deleted file mode 100644 index 9d8b8ad..0000000 --- a/template/wechatMp/src/components/message/index.ts +++ /dev/null @@ -1,107 +0,0 @@ -Component({ - options: { - multipleSlots: true, - }, - externalClasses: ['t-class', 't-image-class', 't-class-image'], - properties: { - zIndex: { - type: Number, - value: 777, - }, - show: Boolean, - image: String, - content: String, - type: { - type: String, - value: 'primary', - options: ['primary', 'warning', 'success', 'error'], - }, - duration: { - type: Number, - value: 1500, - }, - openApi: { - type: Boolean, - value: true, - }, - /** - * message距离顶部的距离 - */ - top: { - type: Number, - value: 0, - }, - }, - - data: { - status: false, - }, - - // 解决 addListener undefined 的错误 - observers: { - show: function (show) { - show && this.changeStatus(); - if (!show) - this.setData({ - status: show, - }); - }, - }, - - attached() { - this.initMessage(); - }, - - pageLifetimes: { - show() { - this.initMessage(); - }, - }, - - methods: { - changeStatus() { - this.setData({ - status: true, - }); - // @ts-ignore - if (this.data.timer) clearTimeout(this.data.timer); - // @ts-ignore - this.data.timer = setTimeout(() => { - this.setData({ - status: false, - }); - // @ts-ignore - if (this.data.success) this.data.success(); - // @ts-ignore - this.data.timer = null; - }, this.properties.duration); - }, - initMessage() { - // @ts-ignore - wx.oak = wx.oak || {}; - // @ts-ignore - wx.oak.showMessage = (options = {}) => { - // @ts-ignore - const { content = '', image = '', type = 'primary', duration = 1500, success = null, top = 0, - } = options; - // @ts-ignore - this.data.success = success; - this.setData({ - content, - image, - duration, - type, - top, - }); - this.changeStatus(); - return this; - }; - // @ts-ignore - wx.oak.hideMessage = () => { - this.setData({ - status: false, - }); - }; - }, - }, -}); diff --git a/template/wechatMp/src/components/message/index.wxml b/template/wechatMp/src/components/message/index.wxml deleted file mode 100644 index 3911cbc..0000000 --- a/template/wechatMp/src/components/message/index.wxml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - {{content}} - - - \ No newline at end of file diff --git a/template/wechatMp/src/i18n/locales.ts b/template/wechatMp/src/i18n/locales.ts deleted file mode 100644 index 9c7ab6d..0000000 --- a/template/wechatMp/src/i18n/locales.ts +++ /dev/null @@ -1,5 +0,0 @@ -export default { - fallbackLocale: 'zh-CN', - defaultLocale: 'zh-CN', - translations: {}, -}; diff --git a/template/wechatMp/src/i18n/locales.wxs b/template/wechatMp/src/i18n/locales.wxs deleted file mode 100644 index 2b25da4..0000000 --- a/template/wechatMp/src/i18n/locales.wxs +++ /dev/null @@ -1,114 +0,0 @@ -var Interpreter = (function (r) { - var o = ''; - function i(r, n) { - return r - ? 'string' == typeof r - ? r - : r - .reduce(function (r, t) { - return r.concat([ - (function (n, e) { - if (((e = e || {}), 'string' == typeof n)) - return n; - { - var r, t, u; - if (n[2] && 'object' == typeof n[2]) - return ( - (r = Object.keys(n[2]).reduce( - function (r, t) { - return ( - (r[t] = i( - n[2][t], - e - )), - r - ); - }, - {} - )), - (t = r[e[0]]), - void 0 !== (u = e[n[0]]) - ? r[u.toString()] || - r.other || - o - : t || r.other || o - ); - } - if ('object' == typeof n && 0 < n.length) - return (function r(t, n, e) { - void 0 === e && (e = 0); - if (!n || !t || t.length <= 0) - return ''; - n = n[t[e]]; - if ('string' == typeof n) return n; - if ('number' == typeof n) - return n.toString(); - if (!n) - return '{'.concat( - t.join('.'), - '}' - ); - return r(t, n, ++e); - })(n[0].split('.'), e, 0); - return ''; - })(t, n), - ]); - }, []) - .join('') - : o; - } - function c(r, t, n) { - return ( - ('object' == typeof r && - ((t = t).constructor && 'Array' === t.constructor - ? t - : t - .replace(getRegExp('\[', 'ig'), '.') - .replace(getRegExp('\]', 'ig'), '') - .split('.') - ).reduce(function (r, t) { - return (r || {})[t]; - }, r)) || - n - ); - } - function f(r) { - var t = r; - return (t = - r && -1 !== r.indexOf(':') - ? r.replace(getRegExp(':', 'ig'), '.') - : t); - } - function g(r, t, n) { - var e = f(n), - r = r[t]; - return (r && (r[e] || c(r, e))) || n; - } - return ( - (r.getMessageInterpreter = function () { - function u(r, t, n, e) { - return i( - (function (r, t, n, e) { - var u = f(r); - if (!(n = t[n])) return g(t, e, r); - var o = n[u]; - return (o = o || c(n, u)) ? o : g(t, e, r); - })(r, e, n, n), - t - ); - } - return function (r, t, n, e) { - return 3 === arguments.length - ? u(r, null, t, n) - : 4 === arguments.length - ? u(r, t, n, e) - : ''; - }; - }), - r - ); -})({}); - -module.exports = { -t: Interpreter.getMessageInterpreter() -} \ No newline at end of file diff --git a/template/wechatMp/src/init.ts b/template/wechatMp/src/init.ts deleted file mode 100644 index 7dd4998..0000000 --- a/template/wechatMp/src/init.ts +++ /dev/null @@ -1,36 +0,0 @@ -import "./utils/polyfill"; -import { InitializeWechatMp, initI18n } from 'oak-frontend-base'; -import { EntityDict } from 'oak-app-domain'; -import { storageSchema, ActionDefDict } from 'oak-app-domain'; -import { RuntimeContext } from '../../src/RuntimeContext'; -import { aspectDict, createFeatures, routers, triggers, checkers, - watchers, data, token, application } from '../../src/initialize'; - -// 每个应用都要初始化applicationId（generalbusiness的要求） -const applicationId = data.application[0].id; -const { OakComponent, OakPage, features } = InitializeWechatMp>( - storageSchema, - createFeatures, - (store, scene) => new RuntimeContext(store, applicationId, () => token.getToken(), scene), - routers, - triggers, - checkers, - watchers, - aspectDict, - data as any, - ActionDefDict); - -// 因为依赖的问题，general库中的部分feature暂时只能在这里注入。以后再修改 -token.setCache(features.cache); -application.setCache(features.cache); -application.setApplicationId(applicationId); - -Object.assign(global, { - OakPage, - OakComponent, -}); - -export { - features, - createFeatures, -}; \ No newline at end of file diff --git a/template/wechatMp/src/pages/index/index.less b/template/wechatMp/src/pages/index/index.less deleted file mode 100644 index e1a30da..0000000 --- a/template/wechatMp/src/pages/index/index.less +++ /dev/null @@ -1,20 +0,0 @@ -/** index.wxss **/ - -.userinfo { - display: flex; - flex-direction: column; - align-items: center; - color: #aaa; -} - -.userinfo-avatar { - overflow: hidden; - width: 128rpx; - height: 128rpx; - margin: 20rpx; - border-radius: 50%; -} - -.usermotto { - margin-top: 200px; -} diff --git a/template/wechatMp/src/pages/index/index.ts b/template/wechatMp/src/pages/index/index.ts deleted file mode 100644 index 667d115..0000000 --- a/template/wechatMp/src/pages/index/index.ts +++ /dev/null @@ -1,47 +0,0 @@ -// index.ts - -Page({ - data: { - motto: 'Hello World', - userInfo: {}, - hasUserInfo: false, - canIUse: wx.canIUse('button.open-type.getUserInfo'), - canIUseGetUserProfile: false, - canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName') // 如需尝试获取用户信息可改为false - }, - // 事件处理函数 - bindViewTap() { - wx.navigateTo({ - url: '../logs/logs', - }) - }, - onLoad() { - // @ts-ignore - if (wx.getUserProfile) { - this.setData({ - canIUseGetUserProfile: true - }) - } - }, - getUserProfile() { - // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗 - wx.getUserProfile({ - desc: '展示用户信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写 - success: (res) => { - console.log(res) - this.setData({ - userInfo: res.userInfo, - hasUserInfo: true - }) - } - }) - }, - getUserInfo(e: any) { - // 不推荐使用getUserInfo获取用户信息，预计自2021年4月13日起，getUserInfo将不再弹出弹窗，并直接返回匿名的用户个人信息 - console.log(e) - this.setData({ - userInfo: e.detail.userInfo, - hasUserInfo: true - }) - } -}) diff --git a/template/wechatMp/src/pages/index/index.wxml b/template/wechatMp/src/pages/index/index.wxml deleted file mode 100644 index f00d294..0000000 --- a/template/wechatMp/src/pages/index/index.wxml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - 请使用1.4.4及以上版本基础库 - - - - {{userInfo.nickName}} - - - - {{motto}} - - diff --git a/template/wechatMp/src/typings/polyfill.d.ts b/template/wechatMp/src/typings/polyfill.d.ts index 284fa07..9673d96 100644 --- a/template/wechatMp/src/typings/polyfill.d.ts +++ b/template/wechatMp/src/typings/polyfill.d.ts @@ -1,11 +1,21 @@ -import { MakeOakComponent, MakeOakPage } from 'oak-frontend-base'; -import { EntityDict } from 'oak-app-domain/EntityDict'; +import { MakeOakComponent, MakeOakPage } from 'oak-frontend-base/src/page.mp'; +import { EntityDict } from 'oak-app-domain'; import { RuntimeContext } from '../../../src/RuntimeContext'; import { aspectDict } from '../../../src/aspects'; -import { createFeatures } from '../init'; +import { initialize } from '../../../src/initialize'; declare global { - const OakPage: MakeOakPage>; - const OakComponent: MakeOakComponent>; + const OakPage: MakeOakPage< + EntityDict, + RuntimeContext, + typeof aspectDict, + ReturnType['features'] + >; + const OakComponent: MakeOakComponent< + EntityDict, + RuntimeContext, + typeof aspectDict, + ReturnType['features'] + >; } -export {} \ No newline at end of file +export {}; diff --git a/template/wechatMp/src/utils/polyfill.ts b/template/wechatMp/src/utils/polyfill.ts index f237941..4c804ea 100644 --- a/template/wechatMp/src/utils/polyfill.ts +++ b/template/wechatMp/src/utils/polyfill.ts @@ -1,75 +1,76 @@ -// import '../../../src/utils/polyfill'; - Object.assign(global, { /** * 封装wx环境下的fetch，注意有部分属性并非完全吻合，请谨慎使用 - * @param url - * @param options - * @returns - */ - fetch: async (url: string, options?: Parameters[1]) => { - const params = Object.assign({ - method: 'GET', - dataType: '其他', - responseType: 'text', - headers: { - 'Content-type': 'application/json', + * @param url + * @param options + * @returns + */ + fetch: async ( + url: string, + options?: Parameters[1] + ) => { + const params = Object.assign( + { + method: 'GET', + headers: { + 'Content-type': 'application/json', + }, }, - }, options); - const { method, headers, dataType, responseType, body } = params; - - let responseType2 = responseType; - if ((headers as Record)['Accept'] === 'application/octet-stream') { - responseType2 = 'arraybuffer'; - } - - if (!['text', 'arraybuffer'].includes(responseType2)) { - throw new Error(`传入不支持的responseType: ${responseType2}`); - } - - let dataType2 = dataType === 'json' ? dataType : '其他'; - if (responseType2 === 'arraybuffer') { - dataType2 = '其他'; - } - - return new Promise( - (resolve, reject) => { - wx.request({ - url, - data: body || {}, - method: method as any, - header: headers, - dataType: dataType2 as any, - responseType: responseType2 as any, - success: (res) => { - const { statusCode, data, header } = res; - const result = Object.assign({}, res, { - status: statusCode, - ok: statusCode === 200, - headers: header, - arrayBuffer: async () => data as ArrayBuffer, - json: async () => JSON.parse(data as string), - text: async () => data as string, - clone: () => result!, - url, - statusText: statusCode === 200 ? 'ok' : 'error', - }); - return resolve(result); - }, - fail: reject, - }); - } + options ); + const { method, headers, body } = params; + + let responseType: 'arraybuffer' | 'text' | undefined; + const accept = (headers as Record)['Accept']; + if ( + [ + 'image/jpg', + 'image/jpeg', + 'image/png', + 'application/octet-stream', + ].includes(accept) + ) { + responseType = 'arraybuffer'; + } else { + responseType = 'text'; + } + const dataType = '其他'; + + return new Promise((resolve, reject) => { + wx.request({ + url, + data: body || {}, + method: method as any, + header: headers, + dataType, + responseType, + success: (res) => { + const { statusCode, data, header } = res; + const result = Object.assign({}, res, { + status: statusCode, + ok: statusCode === 200, + headers: header, + arrayBuffer: async () => data as ArrayBuffer, + json: async () => JSON.parse(data as string), + text: async () => data as string, + clone: () => result!, + url, + statusText: statusCode === 200 ? 'ok' : 'error', + }); + return resolve(result); + }, + fail: reject, + }); + }); }, getRandomValues: async function getRandomValues(length: number) { if (length > 65536) { - throw new Error('Can only request a maximum of 65536 bytes') + throw new Error('Can only request a maximum of 65536 bytes'); } - + const { randomValues } = await wx.getRandomValues({ length, }); return new Uint8Array(randomValues); - } - , -}); \ No newline at end of file + }, +});