@cloudbase/framework-plugin-low-code 0.7.33 → 0.7.36
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/index.d.ts +1 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +29 -22
- package/lib/weapps-core/utils/file.d.ts +1 -1
- package/package.json +2 -2
- package/template/mp/common/util.js +0 -1
- package/template/src/handlers/FieldMiddleware/renderer.jsx +34 -39
- package/template/src/handlers/utils/common.js +1 -0
- package/template/src/pages/composite.tpl +1 -1
package/lib/index.d.ts
CHANGED
|
@@ -80,6 +80,7 @@ declare class LowCodePlugin extends Plugin {
|
|
|
80
80
|
protected _appPath: string;
|
|
81
81
|
protected _authPlugin: any;
|
|
82
82
|
protected _miniprogramePlugin: any;
|
|
83
|
+
protected _miniprogramePluginProjectParam: any;
|
|
83
84
|
protected _webPlugin: any;
|
|
84
85
|
protected _functionPlugin: any;
|
|
85
86
|
protected _productBasePath?: string;
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAOA,OAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAOrE,OAAO,EACL,SAAS,EAET,cAAc,EAIf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AASvD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAgB,MAAM,SAAS,CAAC;AAE7D,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AAKpD,eAAO,MAAM,SAAS,WAAW,CAAC;AAClC,eAAO,MAAM,2BAA2B,IAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -71,6 +71,12 @@ const QRCODE_PATH = './qrcode.jpg';
|
|
|
71
71
|
const LOG_FILE = 'build.log';
|
|
72
72
|
const DEFAULT_CLOUDFUNCTION_ROOT_NAME = 'cloudfunctions';
|
|
73
73
|
const DEFAULT_CLOUDFUNCTION_ROOT_PATH = path_1.default.join(DEFAULT_CLOUDFUNCTION_ROOT_NAME, '/');
|
|
74
|
+
const MP_COMPILE_SETTING = {
|
|
75
|
+
es6: true,
|
|
76
|
+
es7: true,
|
|
77
|
+
minify: true,
|
|
78
|
+
codeProtect: false,
|
|
79
|
+
};
|
|
74
80
|
const DEFAULT_INPUTS = {
|
|
75
81
|
_inputFile: 'input.json',
|
|
76
82
|
debug: false,
|
|
@@ -224,29 +230,20 @@ class LowCodePlugin extends framework_core_1.Plugin {
|
|
|
224
230
|
}
|
|
225
231
|
let projectJson = fs_extra_1.default.readJsonSync(path_1.default.resolve(this.api.projectPath, exports.DIST_PATH, 'project.config.json'));
|
|
226
232
|
let { cloudfunctionRoot, miniprogramRoot = './' } = projectJson;
|
|
227
|
-
|
|
228
|
-
es6: true,
|
|
229
|
-
es7: true,
|
|
230
|
-
minify: true,
|
|
231
|
-
codeProtect: false,
|
|
232
|
-
};
|
|
233
|
-
this._miniprogramePlugin = new framework_plugin_mp_1.plugin('miniprograme', this.api, {
|
|
233
|
+
this._miniprogramePluginProjectParam = {
|
|
234
234
|
appid: deployOptions.mpAppId,
|
|
235
235
|
privateKeyPath: `./private.${deployOptions.mpAppId}.key`,
|
|
236
|
-
localPath: exports.DIST_PATH,
|
|
237
236
|
ignores: ['node_modules/**/*', LOG_FILE].concat(cloudfunctionRoot ? [path_1.default.join(cloudfunctionRoot, '**/*')] : []),
|
|
238
|
-
|
|
239
|
-
|
|
237
|
+
};
|
|
238
|
+
this._miniprogramePlugin = new framework_plugin_mp_1.plugin('miniprograme', this.api, Object.assign(Object.assign({}, this._miniprogramePluginProjectParam), { localPath: exports.DIST_PATH, deployMode: deployOptions.mpAppId === deployOptions.targetMpAppId ? deployOptions.mode : types_1.DEPLOY_MODE.UPLOAD, uploadOptions: {
|
|
240
239
|
version: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.version) || '1.0.0',
|
|
241
240
|
desc: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.description) || '',
|
|
242
|
-
setting,
|
|
243
|
-
},
|
|
244
|
-
previewOptions: {
|
|
241
|
+
setting: MP_COMPILE_SETTING,
|
|
242
|
+
}, previewOptions: {
|
|
245
243
|
qrcodeOutputPath: path_1.default.resolve(this.api.projectPath, QRCODE_PATH),
|
|
246
244
|
pagePath: (_b = (_a = fs_extra_1.default.readJsonSync(path_1.default.resolve(this.api.projectPath, exports.DIST_PATH, miniprogramRoot, 'app.json'))) === null || _a === void 0 ? void 0 : _a.pages) === null || _b === void 0 ? void 0 : _b[0],
|
|
247
|
-
setting,
|
|
248
|
-
}
|
|
249
|
-
});
|
|
245
|
+
setting: MP_COMPILE_SETTING,
|
|
246
|
+
} }));
|
|
250
247
|
}
|
|
251
248
|
else if ((0, common_2.buildAsWebByBuildType)(buildTypeList)) {
|
|
252
249
|
this._webPlugin = new framework_plugin_website_1.plugin('web', this.api, {
|
|
@@ -599,6 +596,21 @@ class LowCodePlugin extends framework_core_1.Plugin {
|
|
|
599
596
|
this._time("DEPLOY");
|
|
600
597
|
if (this._miniprogramePlugin) {
|
|
601
598
|
yield this._miniprogramePlugin.deploy();
|
|
599
|
+
try {
|
|
600
|
+
const saveZipPath = path_1.default.join(this._productBasePath, 'compiledResult.zip');
|
|
601
|
+
yield mpci.getCompiledResult({
|
|
602
|
+
project: new mpci.Project(Object.assign(Object.assign({}, this._miniprogramePluginProjectParam), { projectPath: this._appPath, type: 'miniProgram' })),
|
|
603
|
+
version: '0.0.0',
|
|
604
|
+
desc: '',
|
|
605
|
+
setting: MP_COMPILE_SETTING,
|
|
606
|
+
onProgressUpdate: () => { },
|
|
607
|
+
}, path_1.default.join(this._productBasePath, 'compiledResult.zip'));
|
|
608
|
+
const { size } = yield fs_extra_1.default.stat(saveZipPath);
|
|
609
|
+
this.api.logger.info('获取小程序包大小', size);
|
|
610
|
+
}
|
|
611
|
+
catch (e) {
|
|
612
|
+
this.api.logger.error('获取小程序包失败', e);
|
|
613
|
+
}
|
|
602
614
|
}
|
|
603
615
|
else if (this._webPlugin) {
|
|
604
616
|
yield this._webPlugin.deploy();
|
|
@@ -685,12 +697,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
|
|
|
685
697
|
mpAnalyzeAndCleanCode(distDir) {
|
|
686
698
|
return __awaiter(this, void 0, void 0, function* () {
|
|
687
699
|
let { deployOptions } = this._resolvedInputs;
|
|
688
|
-
const project = new mpci.Project({
|
|
689
|
-
appid: deployOptions.mpAppId,
|
|
690
|
-
projectPath: distDir,
|
|
691
|
-
type: 'miniProgram',
|
|
692
|
-
privateKeyPath: `./private.${deployOptions.mpAppId}.key`,
|
|
693
|
-
});
|
|
700
|
+
const project = new mpci.Project(Object.assign(Object.assign({}, this._miniprogramePluginProjectParam), { projectPath: distDir, type: 'miniProgram' }));
|
|
694
701
|
const analyseRes = yield mpci.analyseCode(project);
|
|
695
702
|
if (analyseRes) {
|
|
696
703
|
const codeExtensions = new Set(['.wxml', '.wxss', '.wxs', '.js', '.json', '.json', '.ts']);
|
|
@@ -6,7 +6,7 @@ export declare function originJsonToFileList(appData: IWeAppData): (import("../t
|
|
|
6
6
|
code: string;
|
|
7
7
|
pageId: string;
|
|
8
8
|
})[];
|
|
9
|
-
export declare function getExtByType(type: CodeType): ".
|
|
9
|
+
export declare function getExtByType(type: CodeType): ".js" | ".json" | ".less";
|
|
10
10
|
export declare function HACK_FIX_LOWCODE_IN(code?: string): string;
|
|
11
11
|
export declare function HACK_FIX_LOWCODE_OUT(code?: string): string;
|
|
12
12
|
//# sourceMappingURL=file.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudbase/framework-plugin-low-code",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.36",
|
|
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",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@cloudbase/cals": "0.3.
|
|
38
|
+
"@cloudbase/cals": "0.3.35",
|
|
39
39
|
"@cloudbase/framework-core": "^1.8.16",
|
|
40
40
|
"@cloudbase/framework-plugin-auth": "^1.8.16",
|
|
41
41
|
"@cloudbase/framework-plugin-mp": "v1.3.6-beta.8",
|
|
@@ -159,16 +159,44 @@ function FieldWrapper({
|
|
|
159
159
|
context,
|
|
160
160
|
children,
|
|
161
161
|
updateContext,
|
|
162
|
+
renderSlot = false,
|
|
162
163
|
}) {
|
|
163
|
-
const { scopeContext, forContext, forIndexes, widgetsData, codeContext, dataContext } = context;
|
|
164
|
+
const { scopeContext, forContext, forIndexes, widgetsData, codeContext, dataContext, virtualFields } = context;
|
|
164
165
|
|
|
165
166
|
const injectContext = {};
|
|
166
167
|
const indexRef = React.useRef();
|
|
167
168
|
const typeRef = React.useRef();
|
|
168
169
|
const instanceRef = React.useRef();
|
|
170
|
+
|
|
169
171
|
const { 'x-props': xProps } = componentSchema;
|
|
170
172
|
let { staticResourceAttribute = [], listenerInstances = [] } = xProps;
|
|
171
173
|
|
|
174
|
+
// 多个组件的 slot 属性
|
|
175
|
+
const slotMap = React.useMemo(
|
|
176
|
+
() => {
|
|
177
|
+
return generateSlotMap(
|
|
178
|
+
generateSlotMetaMap(
|
|
179
|
+
componentSchema,
|
|
180
|
+
{
|
|
181
|
+
scopeContext,
|
|
182
|
+
forContext,
|
|
183
|
+
dataContext,
|
|
184
|
+
codeContext,
|
|
185
|
+
virtualFields,
|
|
186
|
+
updateContext,
|
|
187
|
+
injectContext,
|
|
188
|
+
},
|
|
189
|
+
{
|
|
190
|
+
renderSlot,
|
|
191
|
+
},
|
|
192
|
+
),
|
|
193
|
+
);
|
|
194
|
+
},
|
|
195
|
+
!!codeContext
|
|
196
|
+
? [componentSchema, virtualFields]
|
|
197
|
+
: [componentSchema, scopeContext, codeContext, forContext, dataContext, virtualFields],
|
|
198
|
+
);
|
|
199
|
+
|
|
172
200
|
// 组件最终用于执行的事件函数
|
|
173
201
|
const emit = React.useCallback(
|
|
174
202
|
(trigger, listeners, eventData, forItems, domEvent, scopeContext) => {
|
|
@@ -245,6 +273,7 @@ function FieldWrapper({
|
|
|
245
273
|
ref={instanceRef}
|
|
246
274
|
data={{
|
|
247
275
|
...data,
|
|
276
|
+
...slotMap,
|
|
248
277
|
_selectableBlockEvents: {
|
|
249
278
|
onCustomEvent: ({ order: index, blockKey }) => {
|
|
250
279
|
if (index !== undefined) {
|
|
@@ -363,21 +392,6 @@ export function getComponentRenderList(props) {
|
|
|
363
392
|
return null;
|
|
364
393
|
}
|
|
365
394
|
|
|
366
|
-
const slotMap = generateSlotMap(
|
|
367
|
-
generateSlotMetaMap(
|
|
368
|
-
componentSchema,
|
|
369
|
-
{
|
|
370
|
-
..._context,
|
|
371
|
-
forContext: forItems,
|
|
372
|
-
virtualFields,
|
|
373
|
-
updateContext,
|
|
374
|
-
},
|
|
375
|
-
{
|
|
376
|
-
renderSlot,
|
|
377
|
-
},
|
|
378
|
-
),
|
|
379
|
-
);
|
|
380
|
-
|
|
381
395
|
return (
|
|
382
396
|
<ForContext.Provider key={forItemData._key} value={forItems}>
|
|
383
397
|
<FieldWrapper
|
|
@@ -388,13 +402,11 @@ export function getComponentRenderList(props) {
|
|
|
388
402
|
widgetsData,
|
|
389
403
|
forContext: forItems,
|
|
390
404
|
forIndexes: forItemsIndexes,
|
|
405
|
+
virtualFields,
|
|
391
406
|
}}
|
|
392
407
|
id={compId}
|
|
393
408
|
updateContext={updateContext}
|
|
394
|
-
data={
|
|
395
|
-
...forItemData,
|
|
396
|
-
...slotMap,
|
|
397
|
-
}}
|
|
409
|
+
data={forItemData}
|
|
398
410
|
{...getSafeComponentProps({
|
|
399
411
|
style: forItemStyle,
|
|
400
412
|
classNameList: forItemClassNameList,
|
|
@@ -433,21 +445,6 @@ export function getComponentRenderList(props) {
|
|
|
433
445
|
return null;
|
|
434
446
|
}
|
|
435
447
|
|
|
436
|
-
// 单个组件的 slot 属性
|
|
437
|
-
const slotMap = generateSlotMap(
|
|
438
|
-
generateSlotMetaMap(
|
|
439
|
-
componentSchema,
|
|
440
|
-
{
|
|
441
|
-
..._context,
|
|
442
|
-
virtualFields,
|
|
443
|
-
updateContext,
|
|
444
|
-
},
|
|
445
|
-
{
|
|
446
|
-
renderSlot,
|
|
447
|
-
},
|
|
448
|
-
),
|
|
449
|
-
);
|
|
450
|
-
|
|
451
448
|
return (
|
|
452
449
|
<FieldWrapper
|
|
453
450
|
key={key}
|
|
@@ -457,13 +454,11 @@ export function getComponentRenderList(props) {
|
|
|
457
454
|
..._context,
|
|
458
455
|
forIndexes: forIndexes,
|
|
459
456
|
widgetsData,
|
|
457
|
+
virtualFields,
|
|
460
458
|
}}
|
|
461
459
|
id={compId}
|
|
462
460
|
updateContext={updateContext}
|
|
463
|
-
data={
|
|
464
|
-
...fieldData,
|
|
465
|
-
...slotMap,
|
|
466
|
-
}}
|
|
461
|
+
data={fieldData}
|
|
467
462
|
{...getSafeComponentProps({
|
|
468
463
|
style: finalStyle,
|
|
469
464
|
classNameList: finalClassNameList,
|
|
@@ -218,6 +218,7 @@ export async function checkAnonymous() {
|
|
|
218
218
|
* 检查页面权限
|
|
219
219
|
**/
|
|
220
220
|
export async function checkAuth(app, appId, $page) {
|
|
221
|
+
return true
|
|
221
222
|
<% if (isAdminPortal || isXPage) { %>return true;<% } %>
|
|
222
223
|
app.showNavigationBarLoading();
|
|
223
224
|
const { loginConfigVersion } = app.__internal__.getConfig();
|
|
@@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite";
|
|
|
3
3
|
import { observable, autorun, reaction, runInAction } from "mobx";
|
|
4
4
|
import { get } from 'lodash';
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { AppRender } from "handlers/render";
|
|
7
7
|
import { createComputed } from "../../../../utils";
|
|
8
8
|
import { createWidgets, retryDataBinds, WidgetsContext, resolveComponentProps } from 'handlers/utils'
|
|
9
9
|
import getStateFn from "./lowcode/state.js";
|