@cloudbase/framework-plugin-low-code 0.6.58-alpha.3 → 0.6.59
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/builder/core/generate.d.ts.map +1 -1
- package/lib/builder/core/generate.js +2 -0
- package/lib/builder/core/index.d.ts.map +1 -1
- package/lib/builder/core/index.js +1 -1
- package/lib/builder/mp/index.d.ts.map +1 -1
- package/lib/builder/mp/index.js +2 -0
- package/lib/builder/service/builder/webpack.d.ts.map +1 -1
- package/lib/builder/service/builder/webpack.js +5 -4
- package/lib/generator/config/common.d.ts +2 -0
- package/lib/generator/config/common.d.ts.map +1 -1
- package/lib/generator/config/common.js +12 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +18 -1
- package/package.json +2 -2
- package/template/html/index.html.ejs +19 -27
- package/template/mp/package.json +0 -1
- package/template/src/datasources/config.js.tpl +1 -5
- package/template/src/handlers/FieldMiddleware/renderer.jsx +67 -21
- package/template/src/handlers/render.jsx +64 -42
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/builder/core/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAe5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAkBnD,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,kCAA2B,EACzC,YAAY,6BAAsB,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EAAE,EAC1B,UAAU,EAAE,WAAW,EACvB,OAAO,qBAAwB,EAC/B,aAAa,qBAAiB,EAC9B,SAAS;iBACM,OAAO;eACT,GAAG;aAIf,EACD,MAAM,EAAE,MAAM,iBAyGf;AACD,wBAAsB,mBAAmB,CACvC,YAAY,oBAAa,EACzB,WAAW,EAAE,MAAM,EACnB,MAAM,KAAA,iBASP"}
|
|
@@ -67,6 +67,8 @@ function runGenerateCore(appBuildDir, appData, subAppDataList = [], dependencies
|
|
|
67
67
|
domain: domain,
|
|
68
68
|
appConfig: util_1.JsonToStringWithVariableName({
|
|
69
69
|
id: appKey,
|
|
70
|
+
staticResourceDomain: domain || '',
|
|
71
|
+
envVersion: deployMode === types_1.DEPLOY_MODE.UPLOAD ? 'production' : 'preview',
|
|
70
72
|
pages: pageInstanceList
|
|
71
73
|
.sort((item) => (item.isHome ? -1 : 1))
|
|
72
74
|
.map((item) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/core/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EAEb,UAAU,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,SAAS,EACT,cAAc,EACd,oBAAoB,EACpB,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAInD,oBAAY,aAAa,GAAG;IAC1B,YAAY,EAAE,aAAa,EAAE,CAAC;IAC9B,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC,uBAAuB,CAAC,EAAE,UAAU,EAAE,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE;QACV,WAAW,EAAE,OAAO,CAAC;QACrB,SAAS,EAAE,GAAG,CAAC;KAChB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,WAAW,CAC/B,EACE,oBAAoB,EACpB,uBAA4B,EAC5B,YAAY,EACZ,MAAe,EACf,eAAe,EACf,OAAsB,EACtB,aAAqB,EACrB,aAA+B,EAC/B,IAAiC,EACjC,UAAgC,EAChC,KAAa,EACb,cAAmC,EACnC,cAAmB,EACnB,cAAsB,EACtB,OAAY,EACZ,SAGC,EACD,cAAsB,EACtB,aAAyB,EACzB,MAAW,GACZ,EAAE,aAAa,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,EACD,EAAE,CAAC,EAAE,oBAAoB,+
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/core/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EAEb,UAAU,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,SAAS,EACT,cAAc,EACd,oBAAoB,EACpB,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAInD,oBAAY,aAAa,GAAG;IAC1B,YAAY,EAAE,aAAa,EAAE,CAAC;IAC9B,oBAAoB,CAAC,EAAE,UAAU,CAAC;IAClC,uBAAuB,CAAC,EAAE,UAAU,EAAE,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE;QACV,WAAW,EAAE,OAAO,CAAC;QACrB,SAAS,EAAE,GAAG,CAAC;KAChB,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,WAAW,CAC/B,EACE,oBAAoB,EACpB,uBAA4B,EAC5B,YAAY,EACZ,MAAe,EACf,eAAe,EACf,OAAsB,EACtB,aAAqB,EACrB,aAA+B,EAC/B,IAAiC,EACjC,UAAgC,EAChC,KAAa,EACb,cAAmC,EACnC,cAAmB,EACnB,cAAsB,EACtB,OAAY,EACZ,SAGC,EACD,cAAsB,EACtB,aAAyB,EACzB,MAAW,GACZ,EAAE,aAAa,GAAG;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,EACD,EAAE,CAAC,EAAE,oBAAoB,+BA6K1B;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -100,7 +100,7 @@ function buildWebApp({ mainAppSerializeData, subAppSerializeDataList = [], depen
|
|
|
100
100
|
weapps: [mainAppSerializeData, ...subAppSerializeDataList],
|
|
101
101
|
materials: dependencies,
|
|
102
102
|
});
|
|
103
|
-
const { publicPath, basename, assets = ''
|
|
103
|
+
const { publicPath, basename, assets = '' } = ((_a = mainAppData.appConfig) === null || _a === void 0 ? void 0 : _a.window) || {};
|
|
104
104
|
const projectConfig = yield prepare_1.runPrepare(buildTypeList, appBuildDir, isCleanDistDir);
|
|
105
105
|
const mpConfig = yield webpack_1.extractAndRemoveKbConfig(mainAppData, subAppDataList, appBuildDir);
|
|
106
106
|
const jsAssets = assets.split(',').map((item) => { var _a; return (_a = (item || '')) === null || _a === void 0 ? void 0 : _a.trim(); });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAuSvC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAUzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAuSvC;AA8KD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAgCnB;AAYD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}
|
package/lib/builder/mp/index.js
CHANGED
|
@@ -328,6 +328,8 @@ function generateFramework(appData, outDir, ctx) {
|
|
|
328
328
|
isBare: false,
|
|
329
329
|
appConfig: util_3.JsonToStringWithVariableName({
|
|
330
330
|
id: ctx.appId,
|
|
331
|
+
staticResourceDomain: ctx.domain || '',
|
|
332
|
+
envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
|
|
331
333
|
pages: appData.pageInstanceList
|
|
332
334
|
.sort((item) => (item.isHome ? -1 : 1))
|
|
333
335
|
.map((item) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/webpack.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/webpack.ts"],"names":[],"mappings":"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"}
|
|
@@ -319,6 +319,10 @@ function getWebpackWebBuildParams(appId, appBuildDir, materialsDir, dependencies
|
|
|
319
319
|
jsApis = jsApis.concat(assets);
|
|
320
320
|
}
|
|
321
321
|
}
|
|
322
|
+
const getPublicPath = () => buildTypeList.includes("app") ||
|
|
323
|
+
buildTypeList.includes("adminPortal")
|
|
324
|
+
? ''
|
|
325
|
+
: publicPath;
|
|
322
326
|
return {
|
|
323
327
|
context: appBuildDir,
|
|
324
328
|
mode: mode !== "production" ? 'development' : mode,
|
|
@@ -328,10 +332,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, materialsDir, dependencies
|
|
|
328
332
|
path: path_1.default.resolve(appBuildDir, './preview'),
|
|
329
333
|
filename: '[name].[contenthash].bundle.js',
|
|
330
334
|
chunkFilename: '[name].[contenthash].chunk.js',
|
|
331
|
-
publicPath:
|
|
332
|
-
buildTypeList.includes("adminPortal")
|
|
333
|
-
? ''
|
|
334
|
-
: publicPath,
|
|
335
|
+
publicPath: getPublicPath(),
|
|
335
336
|
pathinfo: false,
|
|
336
337
|
},
|
|
337
338
|
htmlTemplatePath: path_1.default.resolve(appBuildDir, './html/index.html.ejs'),
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export declare const REPLACE_SIGN = "%%%";
|
|
2
2
|
export declare const MP_CONFIG_MODULE_NAME = "mp_config";
|
|
3
3
|
export declare const KBONE_PAGE_KEYS: string[];
|
|
4
|
+
export declare const PRIVATE_JS_NAME = "weda-private.js";
|
|
5
|
+
export declare const PRIVATE_JS_CODE = "\n/**\n * An empty js file. It will be overridden in private place.\n *\n * For example:\n * ```javascript\n * window._isPrivate = true\n * ```\n */\n";
|
|
4
6
|
//# sourceMappingURL=common.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/generator/config/common.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,qBAAqB,cAAc,CAAC;AAEjD,eAAO,MAAM,eAAe,UAQ3B,CAAC"}
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/generator/config/common.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,eAAO,MAAM,qBAAqB,cAAc,CAAC;AAEjD,eAAO,MAAM,eAAe,UAQ3B,CAAC;AAKF,eAAO,MAAM,eAAe,oBAAoB,CAAC;AAKjD,eAAO,MAAM,eAAe,2JAS3B,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
|
|
3
|
+
exports.PRIVATE_JS_CODE = exports.PRIVATE_JS_NAME = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
|
|
4
4
|
exports.REPLACE_SIGN = '%%%';
|
|
5
5
|
exports.MP_CONFIG_MODULE_NAME = 'mp_config';
|
|
6
6
|
exports.KBONE_PAGE_KEYS = [
|
|
@@ -12,3 +12,14 @@ exports.KBONE_PAGE_KEYS = [
|
|
|
12
12
|
'reachBottomDistance',
|
|
13
13
|
'pullDownRefresh',
|
|
14
14
|
];
|
|
15
|
+
exports.PRIVATE_JS_NAME = 'weda-private.js';
|
|
16
|
+
exports.PRIVATE_JS_CODE = `
|
|
17
|
+
/**
|
|
18
|
+
* An empty js file. It will be overridden in private place.
|
|
19
|
+
*
|
|
20
|
+
* For example:
|
|
21
|
+
* \`\`\`javascript
|
|
22
|
+
* window._isPrivate = true
|
|
23
|
+
* \`\`\`
|
|
24
|
+
*/
|
|
25
|
+
`;
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAOA,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAUrE,OAAO,EACL,SAAS,EAET,cAAc,EAIf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAYvD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAgB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -63,6 +63,7 @@ const mpci = __importStar(require("miniprogram-ci"));
|
|
|
63
63
|
const qrcode_1 = __importDefault(require("qrcode"));
|
|
64
64
|
const url_1 = __importDefault(require("url"));
|
|
65
65
|
const types_1 = require("./types");
|
|
66
|
+
const config_1 = require("./generator/config");
|
|
66
67
|
exports.DIST_PATH = './dist';
|
|
67
68
|
exports.PERSISTENT_DEPENDIENCES_MAP = {};
|
|
68
69
|
const DEBUG_PATH = './debug';
|
|
@@ -565,9 +566,25 @@ class LowCodePlugin extends framework_core_1.Plugin {
|
|
|
565
566
|
this.api.logger.error('获取静态托管失败: ', e);
|
|
566
567
|
throw e;
|
|
567
568
|
}
|
|
569
|
+
const privateJsPath = path_1.default.join('/', 'tmp', config_1.PRIVATE_JS_NAME);
|
|
570
|
+
try {
|
|
571
|
+
yield fs_extra_1.default.ensureFile(privateJsPath);
|
|
572
|
+
yield fs_extra_1.default.writeFile(privateJsPath, config_1.PRIVATE_JS_CODE, {
|
|
573
|
+
encoding: 'utf8',
|
|
574
|
+
flag: 'w',
|
|
575
|
+
});
|
|
576
|
+
}
|
|
577
|
+
catch (e) {
|
|
578
|
+
this.api.logger.error('创建私有化JS文件失败:', e);
|
|
579
|
+
throw e;
|
|
580
|
+
}
|
|
568
581
|
const deployContent = [
|
|
569
582
|
...(this._webPlugin.buildOutput.static || []),
|
|
570
583
|
...(this._webPlugin.buildOutput.staticConfig || []),
|
|
584
|
+
{
|
|
585
|
+
src: privateJsPath,
|
|
586
|
+
cloudPath: `/weda-config/${config_1.PRIVATE_JS_NAME}`,
|
|
587
|
+
},
|
|
571
588
|
];
|
|
572
589
|
yield Promise.all(deployContent.map((options) => {
|
|
573
590
|
return this.api.cloudbaseManager.hosting.uploadFiles({
|
|
@@ -622,7 +639,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
|
|
|
622
639
|
: 'preview',
|
|
623
640
|
},
|
|
624
641
|
});
|
|
625
|
-
this.api.logger.info(`${this.api.emoji('🚀')} custom publish success: ${publishAppCustomNavRes}`);
|
|
642
|
+
this.api.logger.info(`${this.api.emoji('🚀')} custom publish success: ${JSON.stringify(publishAppCustomNavRes)}`);
|
|
626
643
|
try {
|
|
627
644
|
const { deployOptions, appId } = this._resolvedInputs;
|
|
628
645
|
const isPreview = (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.PREVIEW;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudbase/framework-plugin-low-code",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.59",
|
|
4
4
|
"description": "云开发 Tencent CloudBase Framework Low Code Plugin,将低码配置生成完整项目并一键部署云开发资源。",
|
|
5
5
|
"author": "yhsunshining@gmail.com",
|
|
6
6
|
"homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
|
|
@@ -87,4 +87,4 @@
|
|
|
87
87
|
"jest": "^26.0.1",
|
|
88
88
|
"typescript": "^3.8.3"
|
|
89
89
|
}
|
|
90
|
-
}
|
|
90
|
+
}
|
|
@@ -386,36 +386,18 @@
|
|
|
386
386
|
|
|
387
387
|
<body data-weui-theme="light">
|
|
388
388
|
<div id="react-body" class="main-wrap"></div>
|
|
389
|
-
<script>
|
|
390
|
-
(function () {
|
|
391
|
-
try {
|
|
392
|
-
const url = new URL(location.href);
|
|
393
|
-
const isPrivate =
|
|
394
|
-
sessionStorage.getItem('__URL_QUERY_IS_PRIVATE') ||
|
|
395
|
-
url.searchParams.get('isPrivate');
|
|
396
|
-
const tcbEndpoint =
|
|
397
|
-
sessionStorage.getItem('__URL_QUERY_TCB_ENDPOINT') ||
|
|
398
|
-
url.searchParams.get('tcbEndpoint');
|
|
399
|
-
if (isPrivate) {
|
|
400
|
-
sessionStorage.setItem('__URL_QUERY_IS_PRIVATE', isPrivate);
|
|
401
|
-
}
|
|
402
|
-
if (tcbEndpoint) {
|
|
403
|
-
sessionStorage.setItem('__URL_QUERY_TCB_ENDPOINT', tcbEndpoint);
|
|
404
|
-
}
|
|
405
|
-
} catch (e) {}
|
|
406
|
-
})();
|
|
407
|
-
</script>
|
|
408
389
|
<% if(!isAdminPortal){ %>
|
|
390
|
+
<script src="/weda-config/weda-private.js"></script>
|
|
409
391
|
<script>
|
|
410
392
|
(function () {
|
|
411
|
-
const
|
|
412
|
-
if (
|
|
393
|
+
const _isPrivate = window._isPrivate || false;
|
|
394
|
+
if (_isPrivate === true) {
|
|
413
395
|
document.write(
|
|
414
|
-
`<script src="//static.cloudbase.net/cloudbase-js-sdk/2.0.1-alpha.0/cloudbase.full.js?v=1><\/script>`
|
|
396
|
+
`<script src="//static.cloudbase.net/cloudbase-js-sdk/2.0.1-alpha.0/cloudbase.full.js?v=1"><\/script>`
|
|
415
397
|
);
|
|
416
398
|
} else {
|
|
417
399
|
document.write(
|
|
418
|
-
`<script src="//static.cloudbase.net/cloudbase-js-sdk/
|
|
400
|
+
`<script src="//static.cloudbase.net/cloudbase-js-sdk/1.5.3-alpha.0/cloudbase.full.js?v=1"><\/script>`
|
|
419
401
|
);
|
|
420
402
|
}
|
|
421
403
|
})();
|
|
@@ -477,10 +459,20 @@
|
|
|
477
459
|
src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js?v=1"
|
|
478
460
|
crossorigin="anonymous"
|
|
479
461
|
></script>
|
|
480
|
-
<script
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
462
|
+
<script>
|
|
463
|
+
(function () {
|
|
464
|
+
const _isPrivate = window._isPrivate || false;
|
|
465
|
+
if (_isPrivate === true) {
|
|
466
|
+
document.write(
|
|
467
|
+
`<script crossorigin="anonymous" src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.8-alpha.7/dist/h5.browser.js?v=1"><\/script>`
|
|
468
|
+
);
|
|
469
|
+
} else {
|
|
470
|
+
document.write(
|
|
471
|
+
`<script crossorigin="anonymous" src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.5/dist/h5.browser.js?v=1"><\/script>`
|
|
472
|
+
);
|
|
473
|
+
}
|
|
474
|
+
})();
|
|
475
|
+
</script>
|
|
484
476
|
<script>
|
|
485
477
|
// zxing polifill
|
|
486
478
|
if (!this.globalThis) {
|
package/template/mp/package.json
CHANGED
|
@@ -21,9 +21,5 @@ export default {
|
|
|
21
21
|
/**
|
|
22
22
|
* 是否开启私有化
|
|
23
23
|
*/
|
|
24
|
-
isPrivate:
|
|
25
|
-
/**
|
|
26
|
-
* 私有化部署的 TCB API 地址
|
|
27
|
-
*/
|
|
28
|
-
tcbEndpoint: sessionStorage.getItem('__URL_QUERY_TCB_ENDPOINT'),
|
|
24
|
+
isPrivate: window._isPrivate || false
|
|
29
25
|
}
|
|
@@ -1,11 +1,5 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
import {
|
|
3
|
-
useContext,
|
|
4
|
-
useCallback,
|
|
5
|
-
createContext,
|
|
6
|
-
useRef,
|
|
7
|
-
useState,
|
|
8
|
-
} from 'react';
|
|
2
|
+
import { useContext, useCallback, createContext, useRef } from 'react';
|
|
9
3
|
import { observer } from 'mobx-react-lite';
|
|
10
4
|
import { emitEvent } from '../actionHandler/utils';
|
|
11
5
|
import { translateStyleToRem } from '@tcwd/weapps-core';
|
|
@@ -13,15 +7,40 @@ import { get, set } from 'lodash';
|
|
|
13
7
|
import { $page } from '../../app/global-api';
|
|
14
8
|
import { getDom } from '../utils/widgets';
|
|
15
9
|
import { checkVisible } from '../../utils/index';
|
|
10
|
+
import { generateSlotMetaMap } from '../render';
|
|
16
11
|
|
|
17
12
|
export const ForContext = createContext({});
|
|
18
13
|
|
|
14
|
+
function generateSlotMap(slots, forContext = undefined) {
|
|
15
|
+
let map = {};
|
|
16
|
+
Object.keys(slots).forEach((slotProp) => {
|
|
17
|
+
let meta = slots[slotProp];
|
|
18
|
+
if (meta.type === 'HOC') {
|
|
19
|
+
set(map, slotProp, meta.node);
|
|
20
|
+
} else {
|
|
21
|
+
const Element = meta.node;
|
|
22
|
+
if (forContext) {
|
|
23
|
+
set(
|
|
24
|
+
map,
|
|
25
|
+
slotProp,
|
|
26
|
+
<ForContext.Provider value={forContext}>
|
|
27
|
+
<Element />
|
|
28
|
+
</ForContext.Provider>
|
|
29
|
+
);
|
|
30
|
+
} else {
|
|
31
|
+
set(map, slotProp, <Element />);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
return map;
|
|
36
|
+
}
|
|
37
|
+
|
|
19
38
|
export const CompRenderer = observer(function (props) {
|
|
20
39
|
const {
|
|
21
40
|
id: compId,
|
|
22
41
|
xProps,
|
|
23
42
|
virtualFields,
|
|
24
|
-
|
|
43
|
+
renderSlot,
|
|
25
44
|
codeContext,
|
|
26
45
|
scopeContext,
|
|
27
46
|
context = {},
|
|
@@ -30,12 +49,8 @@ export const CompRenderer = observer(function (props) {
|
|
|
30
49
|
componentSchema = {},
|
|
31
50
|
} = props;
|
|
32
51
|
|
|
33
|
-
const [blockIndex, setBlockIndex] = useState();
|
|
34
|
-
const [blockType, setBlockType] = useState();
|
|
35
52
|
const indexRef = useRef();
|
|
36
53
|
const typeRef = useRef();
|
|
37
|
-
indexRef.current = blockIndex;
|
|
38
|
-
typeRef.current = blockType;
|
|
39
54
|
|
|
40
55
|
const isInComposite = !!props.codeContext;
|
|
41
56
|
// 判断 widgets 是从 page 来的,还是组件来的
|
|
@@ -61,6 +76,13 @@ export const CompRenderer = observer(function (props) {
|
|
|
61
76
|
const Field = virtualFields[sourceKey];
|
|
62
77
|
const parentForItems = useContext(ForContext);
|
|
63
78
|
|
|
79
|
+
const _context = {
|
|
80
|
+
scopeContext,
|
|
81
|
+
forContext: parentForItems,
|
|
82
|
+
codeContext,
|
|
83
|
+
dataContext: context,
|
|
84
|
+
};
|
|
85
|
+
|
|
64
86
|
// 组件最终用于执行的事件函数
|
|
65
87
|
const emit = useCallback(
|
|
66
88
|
(trigger, eventDetail, forItems, scopeContext) => {
|
|
@@ -154,8 +176,8 @@ export const CompRenderer = observer(function (props) {
|
|
|
154
176
|
// 选区的预览的click事件
|
|
155
177
|
const onCustomEvent = ({ order: index, blockKey }) => {
|
|
156
178
|
if (index !== undefined) {
|
|
157
|
-
|
|
158
|
-
|
|
179
|
+
indexRef.current = index;
|
|
180
|
+
typeRef.current = blockKey;
|
|
159
181
|
}
|
|
160
182
|
};
|
|
161
183
|
|
|
@@ -192,10 +214,22 @@ export const CompRenderer = observer(function (props) {
|
|
|
192
214
|
if (!checkVisible(forItemData)) {
|
|
193
215
|
return null;
|
|
194
216
|
}
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
217
|
+
|
|
218
|
+
const slotMap = generateSlotMap(
|
|
219
|
+
generateSlotMetaMap(
|
|
220
|
+
componentSchema,
|
|
221
|
+
{
|
|
222
|
+
..._context,
|
|
223
|
+
forContext: forItems,
|
|
224
|
+
virtualFields,
|
|
225
|
+
updateContext,
|
|
226
|
+
},
|
|
227
|
+
{
|
|
228
|
+
renderSlot,
|
|
229
|
+
}
|
|
230
|
+
)
|
|
231
|
+
);
|
|
232
|
+
|
|
199
233
|
const emitWithForItems = (trigger, evt) =>
|
|
200
234
|
emit(trigger, evt, forItems, scopeContext);
|
|
201
235
|
|
|
@@ -235,6 +269,7 @@ export const CompRenderer = observer(function (props) {
|
|
|
235
269
|
<Field
|
|
236
270
|
data={{
|
|
237
271
|
...forItemData,
|
|
272
|
+
...slotMap,
|
|
238
273
|
_selectableBlockEvents: _selectableBlockEventsForItems,
|
|
239
274
|
}}
|
|
240
275
|
id={compId}
|
|
@@ -275,9 +310,19 @@ export const CompRenderer = observer(function (props) {
|
|
|
275
310
|
}
|
|
276
311
|
|
|
277
312
|
// 单个组件的 slot 属性
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
313
|
+
const slotMap = generateSlotMap(
|
|
314
|
+
generateSlotMetaMap(
|
|
315
|
+
componentSchema,
|
|
316
|
+
{
|
|
317
|
+
...context,
|
|
318
|
+
virtualFields,
|
|
319
|
+
updateContext,
|
|
320
|
+
},
|
|
321
|
+
{
|
|
322
|
+
renderSlot,
|
|
323
|
+
}
|
|
324
|
+
)
|
|
325
|
+
);
|
|
281
326
|
|
|
282
327
|
// 防止渲染时 data 的 style 与实际的 style 冲突
|
|
283
328
|
delete fieldData.style;
|
|
@@ -309,6 +354,7 @@ export const CompRenderer = observer(function (props) {
|
|
|
309
354
|
<Field
|
|
310
355
|
data={{
|
|
311
356
|
...fieldData,
|
|
357
|
+
...slotMap,
|
|
312
358
|
_selectableBlockEvents: _selectableBlockEventsWithItem,
|
|
313
359
|
}}
|
|
314
360
|
id={compId}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { useRef } from 'react';
|
|
3
3
|
import * as _ from 'lodash';
|
|
4
|
-
import { CompRenderer } from './FieldMiddleware/renderer';
|
|
4
|
+
import { CompRenderer, ForContext } from './FieldMiddleware/renderer';
|
|
5
5
|
import { isScopeSlot } from '../utils/index';
|
|
6
6
|
|
|
7
7
|
function getComponentChildren(component) {
|
|
@@ -14,6 +14,68 @@ function getComponentChildren(component) {
|
|
|
14
14
|
);
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
+
export function generateSlotMetaMap(componentSchema, context, options = {}) {
|
|
18
|
+
const slots = {};
|
|
19
|
+
const { properties = {} } = componentSchema;
|
|
20
|
+
const {
|
|
21
|
+
scopeContext,
|
|
22
|
+
codeContext,
|
|
23
|
+
virtualFields,
|
|
24
|
+
dataContext,
|
|
25
|
+
updateContext,
|
|
26
|
+
forContext,
|
|
27
|
+
} = context;
|
|
28
|
+
// eslint-disable-next-line guard-for-in
|
|
29
|
+
for (const key in properties) {
|
|
30
|
+
const child = properties[key];
|
|
31
|
+
if (!child['x-props'] && child.properties) {
|
|
32
|
+
const isHOC = isScopeSlot(componentSchema, key);
|
|
33
|
+
|
|
34
|
+
slots[key] = {
|
|
35
|
+
type: isHOC ? 'HOC' : 'ELEMENT',
|
|
36
|
+
node: isHOC
|
|
37
|
+
? (props) => {
|
|
38
|
+
let clonedScopeContext = _.cloneDeep(scopeContext);
|
|
39
|
+
_.set(
|
|
40
|
+
clonedScopeContext,
|
|
41
|
+
`${componentSchema.key}.${child.key}`,
|
|
42
|
+
props
|
|
43
|
+
);
|
|
44
|
+
return (
|
|
45
|
+
<AppRender
|
|
46
|
+
key={child.key}
|
|
47
|
+
componentSchema={child}
|
|
48
|
+
renderSlot={options?.renderSlot}
|
|
49
|
+
virtualFields={virtualFields}
|
|
50
|
+
codeContext={codeContext}
|
|
51
|
+
scopeContext={clonedScopeContext}
|
|
52
|
+
context={dataContext}
|
|
53
|
+
updateContext={updateContext}
|
|
54
|
+
/>
|
|
55
|
+
);
|
|
56
|
+
}
|
|
57
|
+
: () => {
|
|
58
|
+
return (
|
|
59
|
+
<ForContext.Provider value={forContext}>
|
|
60
|
+
<AppRender
|
|
61
|
+
key={child.key}
|
|
62
|
+
componentSchema={child}
|
|
63
|
+
renderSlot={options?.renderSlot}
|
|
64
|
+
virtualFields={virtualFields}
|
|
65
|
+
codeContext={codeContext}
|
|
66
|
+
scopeContext={scopeContext}
|
|
67
|
+
context={dataContext}
|
|
68
|
+
updateContext={updateContext}
|
|
69
|
+
/>
|
|
70
|
+
</ForContext.Provider>
|
|
71
|
+
);
|
|
72
|
+
},
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return slots;
|
|
77
|
+
}
|
|
78
|
+
|
|
17
79
|
export function AppRender(props) {
|
|
18
80
|
const {
|
|
19
81
|
className,
|
|
@@ -70,46 +132,6 @@ export function AppRender(props) {
|
|
|
70
132
|
}
|
|
71
133
|
|
|
72
134
|
const children = getComponentChildren(componentSchema);
|
|
73
|
-
const slots = {};
|
|
74
|
-
// eslint-disable-next-line guard-for-in
|
|
75
|
-
for (const key in properties) {
|
|
76
|
-
const child = properties[key];
|
|
77
|
-
if (!child['x-props'] && child.properties) {
|
|
78
|
-
slots[key] = isScopeSlot(componentSchema, key) ? (
|
|
79
|
-
(props) => {
|
|
80
|
-
let clonedScopeContext = _.cloneDeep(scopeContext);
|
|
81
|
-
_.set(
|
|
82
|
-
clonedScopeContext,
|
|
83
|
-
`${componentSchema.key}.${child.key}`,
|
|
84
|
-
props
|
|
85
|
-
);
|
|
86
|
-
return (
|
|
87
|
-
<AppRender
|
|
88
|
-
key={child.key}
|
|
89
|
-
componentSchema={child}
|
|
90
|
-
renderSlot
|
|
91
|
-
virtualFields={virtualFields}
|
|
92
|
-
codeContext={codeContext}
|
|
93
|
-
scopeContext={clonedScopeContext}
|
|
94
|
-
context={context}
|
|
95
|
-
updateContext={updateContext}
|
|
96
|
-
/>
|
|
97
|
-
);
|
|
98
|
-
}
|
|
99
|
-
) : (
|
|
100
|
-
<AppRender
|
|
101
|
-
key={child.key}
|
|
102
|
-
componentSchema={child}
|
|
103
|
-
renderSlot
|
|
104
|
-
virtualFields={virtualFields}
|
|
105
|
-
codeContext={codeContext}
|
|
106
|
-
scopeContext={scopeContext}
|
|
107
|
-
context={context}
|
|
108
|
-
updateContext={updateContext}
|
|
109
|
-
/>
|
|
110
|
-
);
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
135
|
|
|
114
136
|
return (
|
|
115
137
|
<CompRenderer
|
|
@@ -118,7 +140,7 @@ export function AppRender(props) {
|
|
|
118
140
|
emitEvents={componentSchema.emitEvents || []}
|
|
119
141
|
componentSchema={componentSchema}
|
|
120
142
|
virtualFields={virtualFields}
|
|
121
|
-
|
|
143
|
+
renderSlot={renderSlot}
|
|
122
144
|
codeContext={codeContext}
|
|
123
145
|
scopeContext={scopeContext}
|
|
124
146
|
context={context}
|