@cloudbase/framework-plugin-low-code 0.7.29 → 0.7.32

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.
@@ -1 +1 @@
1
- {"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/copy.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,aAAa,EACb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAwB,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAQ9E,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,cAAc,KAAA,iBAef;AAED,wBAAsB,qBAAqB,CACzC,YAAY,6BAAsB,EAClC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,iBAkEpB;AAED,wBAAsB,8BAA8B,CAClD,YAAY,6BAAsB,EAClC,WAAW,EAAE,MAAM,EACnB,oBAAoB;;qBAEH,OAAO;;;;;;aAMlB,EACN,iBAAiB,EAAE,kBAAkB,iBAmHtC"}
1
+ {"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/copy.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,aAAa,EACb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAwB,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAI9E,wBAAsB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,cAAc,KAAA,iBActG;AAED,wBAAsB,qBAAqB,CACzC,YAAY,6BAAsB,EAClC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,iBAiEpB;AAED,wBAAsB,8BAA8B,CAClD,YAAY,6BAAsB,EAClC,WAAW,EAAE,MAAM,EACnB,oBAAoB;;qBAEH,OAAO;;;;;;aAMlB,EACN,iBAAiB,EAAE,kBAAkB,iBAkGtC"}
@@ -75,6 +75,11 @@ function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDir) {
75
75
  return !junk.is(path[path.length - 1]);
76
76
  },
77
77
  });
78
+ const nodeModulesPath = path_1.default.join(materialDir, 'node_modules');
79
+ const targetNodeModulesPath = path_1.default.join(librariesDir, 'node_modules');
80
+ if (fs_extra_1.default.existsSync(nodeModulesPath) && !fs_extra_1.default.existsSync(targetNodeModulesPath)) {
81
+ yield fs_extra_1.default.symlink(nodeModulesPath, targetNodeModulesPath, 'dir');
82
+ }
78
83
  try {
79
84
  const meta = (0, util_1.readComponentLibMata)(librariesDir);
80
85
  if (meta === null || meta === void 0 ? void 0 : meta.schemaVersion) {
@@ -131,8 +136,7 @@ function genCompositeComponentLibraries(dependencies = [], appBuildDir, material
131
136
  }),
132
137
  compConfig: compItem.compConfig || {},
133
138
  emitEvents: JSON.stringify(compItem.emitEvents.map((evt) => evt.eventName)),
134
- handlersImports: compItem.lowCodes.filter((codeItem) => codeItem.type === 'handler-fn' &&
135
- codeItem.name !== '____index____'),
139
+ handlersImports: compItem.lowCodes.filter((codeItem) => codeItem.type === 'handler-fn' && codeItem.name !== '____index____'),
136
140
  useComponents: (function () {
137
141
  const list = [];
138
142
  JSON.stringify(compItem.componentInstances, (key, value) => {
@@ -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":"AASA,OAAO,EAAE,aAAa,EAAiB,kBAAkB,EAAE,OAAO,EAAkB,MAAM,sBAAsB,CAAC;AAKjH,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAiC,MAAM,oBAAoB,CAAC;AAErH,OAAO,EAAgB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAOvD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACjC,QAAQ,EAAE;QACR,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,QAAQ,EAAE;QACR,GAAG,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;QACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;KACxC,CAAC;IACF,OAAO,EAAE;QACP,WAAW,EAAE,SAAS,GAAG,UAAU,CAAC;KACrC,CAAC;IACF,GAAG,EAAE;QACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;IACF,aAAa,EAAE;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,aAAa,EAAE;QACb,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAID,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,KAAK,GAAG,YAAY,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;CACrB;AACD,wBAAgB,YAAY,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,oBAAoB,QAwC3E;AAED,wBAAsB,UAAU,CAAC,WAAW,EAAE,MAAM,iBAkBnD;AAED,wBAAsB,iCAAiC,CAAC,EACtD,KAAK,EACL,cAAc,EACd,WAAW,EACX,YAAY,EACZ,YAAiB,EACjB,eAAe,EACf,UAAU,EACV,IAAI,EACJ,KAAK,EACL,aAAa,EACb,MAAW,GACZ,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,kBAAkB,EAAE,CAAC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,aAAa,EAAE,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,mBAuBA;AACD,MAAM,WAAW,6BAA6B;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,KAAK,GAAG,YAAY,CAAC;CACtC;AAED,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,kBAAkB,EAC/B,cAAc,EAAE,kBAAkB,EAAE,EACpC,WAAW,EAAE,MAAM,eAuBpB;AAED,wBAAsB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,KAAA,iBAqBzF;AAED,wBAAsB,0BAA0B,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,oBA4BzG;AAGD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,WAAW,EAAE,kBAAkB,EAC/B,cAAc,GAAE,kBAAkB,EAAO,uBA+B1C;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,kBAAkB,QAUpG;AAGD,wBAAsB,wBAAwB,CAC5C,cAAc,EAAE,kBAAkB,EAAE,EACpC,UAAU,EAAE,GAAG,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAAE,EAClB,OAAO,EAAE,6BAA6B,iBAsEvC;AAED,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,kBAAkB,EAAE,kCAExE;AAGD,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,GAAG,OASxD;AAGD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAEvC;AAED,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,kBAAkB,EAAE,EAAE,OAAO,UAAQ,OAqBzF;AAED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,YAAY,6BAAsB,EAClC,eAAe,EAAE,MAAM,EACvB,UAAU,SAAM,EAChB,IAAI,kBAAuB,EAC3B,KAAK,UAAQ,EACb,aAAa,cAAkB,EAC/B,WAAW,KAAK,EAChB,MAAM,GAAE,MAAM,EAAO,OA4EtB;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,YAAY,6BAAsB,EAClC,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,kBAAkB,EAAE,EACpC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,6BAA6B,OAuBvC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,kBAAkB,EAAE,EACpC,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,6BAAyD,uBA2BnE;AAID,wBAAsB,8BAA8B,CAClD,YAAY,6BAAsB,EAClC,YAAY,EAAE,MAAM,EACpB,cAAc,GAAE,YAAiB,iBAoDlC;AAED,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,iBAwC9E;AAOD,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,iBA0DtF;AAcD,wBAAgB,8BAA8B,CAC5C,YAAY,6BAAsB,EAClC,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,MAAM,YAcd;AAGD,wBAAsB,+BAA+B,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE;;;CAAA,iBAanF;AAGD,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,oBAkCvE"}
@@ -349,12 +349,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, materialsDir, dependencies
349
349
  '@zxing/library': 'window.ZXing',
350
350
  '@cloudbase/weda-client': 'window.WedaClientSDK',
351
351
  },
352
- resolveModules: [
353
- path_1.default.resolve(appBuildDir, 'node_modules'),
354
- path_1.default.resolve(appBuildDir, 'src'),
355
- ...getMaterialNodeModulesPathList(dependencies, materialsDir, appBuildDir),
356
- 'node_modules',
357
- ],
352
+ resolveModules: ['./src', 'node_modules'],
358
353
  definePlugin: Object.assign({ 'process.env.buildType': `"${buildTypeList[0]}"`, 'process.env.isApp': buildTypeList.includes("app"), 'process.env.isAdminPortal': (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList) }, extraDefine),
359
354
  devtool: ['app-nvzcvt10', 'app-msa2ihs9'].includes(appId)
360
355
  ? 'source-map'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/framework-plugin-low-code",
3
- "version": "0.7.29",
3
+ "version": "0.7.32",
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",
@@ -4,7 +4,7 @@
4
4
  "scripts": {},
5
5
  "dependencies": {
6
6
  "@cloudbase/weda-client": "0.2.18-alpha.1",
7
- "@cloudbase/weda-cloud-sdk": "1.0.14",
7
+ "@cloudbase/weda-cloud-sdk": "1.0.15",
8
8
  "@cloudbase/oauth": "0.1.1-alpha.5",
9
9
  "mobx": "^5.15.4",
10
10
  "lodash.get": "^4.4.2",
@@ -1,6 +1,6 @@
1
1
  import * as React from 'react';
2
2
  import { observable, autorun, untracked } from 'mobx';
3
- import { remove } from 'lodash';
3
+ import { remove, set as lodashSet } from 'lodash';
4
4
  import { checkVisible } from '../../utils/index';
5
5
 
6
6
  export const WidgetsContext = React.createContext({ parent: null });
@@ -191,29 +191,41 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
191
191
  parentLevelWidgets && parentLevelWidgets[node.id].push(w);
192
192
 
193
193
  // Setup data binds
194
- Object.keys(dataBinds[node.id] || {}).map((prop) => {
195
- if (prop === '_waFor') {
196
- return;
197
- }
198
- function getBindData(options = {}) {
199
- let disposeError = false;
200
- const dispose = autorun(() => {
201
- try {
202
- // Computed data bind in the next tick since data bind may read widgets data
203
- w[prop] = dataBinds[node.id][prop](subForItems, undefined, context, scopeContext);
204
- disposeError = false;
205
- } catch (e) {
206
- options.showLog && console.error(e);
207
- retryQueue.push(getBindData);
208
- disposeError = true;
194
+ Object.keys(dataBinds[node.id] || {})
195
+ .sort((a, b) => {
196
+ return a.length - b.length > 0 ? 1 : -1;
197
+ })
198
+ .map((prop) => {
199
+ if (prop === '_waFor') {
200
+ return;
201
+ }
202
+ function getBindData(options = {}) {
203
+ let disposeError = false;
204
+ const dispose = autorun(() => {
205
+ try {
206
+ // Computed data bind in the next tick since data bind may read widgets data
207
+ const value = dataBinds[node.id][prop](subForItems, undefined, context, scopeContext);
208
+ const paths = prop.split('.').filter((key) => !!key);
209
+ if (paths.length > 1) {
210
+ // 一定要 untracked 不然爆栈了
211
+ untracked(() => lodashSet(w, prop, value));
212
+ } else {
213
+ // 普通 key 直接赋值
214
+ w[prop] = value;
215
+ }
216
+ disposeError = false;
217
+ } catch (e) {
218
+ options.showLog && console.error(e);
219
+ retryQueue.push(getBindData);
220
+ disposeError = true;
221
+ }
222
+ });
223
+ if (!!disposeError && curForNode.id) {
224
+ widgets[curForNode.id]._disposers.push(dispose);
209
225
  }
210
- });
211
- if (!!disposeError && curForNode.id) {
212
- widgets[curForNode.id]._disposers.push(dispose);
213
226
  }
214
- }
215
- getBindData();
216
- });
227
+ getBindData();
228
+ });
217
229
  } else {
218
230
  if (parentLevelWidgets) {
219
231
  const len = parentLevelWidgets[node.id].push([]);
@@ -107,7 +107,7 @@ class CompositeCompWrapper extends React.Component {
107
107
  }
108
108
 
109
109
  createCompAPI(compThis) {
110
- const { forwardRef, ...restProps } = compThis.props || {};
110
+ const { forwardRef } = compThis.props || {};
111
111
  compThis.$WEAPPS_COMP = {
112
112
  compConfig: compThis.compConfig,
113
113
  widgets: compThis.widgets,
@@ -115,6 +115,7 @@ class CompositeCompWrapper extends React.Component {
115
115
  handler: compThis.handler,
116
116
  lib: { const: constObj, tools: toolsObj },
117
117
  get props() {
118
+ const { forwardRef, ...restProps } = compThis.props || {};
118
119
  return {...restProps, events: compThis.events, data: compThis.propsData }
119
120
  },
120
121
  get state() {