@cloudbase/framework-plugin-low-code 0.7.14 → 0.7.17

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":"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;AAQzB,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,CAgSvC;AAuLD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAkCnB;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"}
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;AAM3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAW/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAiC,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQrG,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,CA+OvC;AAsJD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,iBAuB9F;AAiBD,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;;;EA6BA"}
@@ -81,7 +81,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
81
81
  weapps,
82
82
  materials,
83
83
  });
84
- buildContext['miniprogramPlugins'] = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
84
+ buildContext.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
85
85
  yield (0, materials_1.installMaterials)(projDir, allAppUsedComps, weapps, buildContext);
86
86
  const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
87
87
  const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext);
@@ -105,7 +105,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
105
105
  yield (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
106
106
  }
107
107
  appFileData = Object.assign(Object.assign({}, appFileData), { 'common/style.js': {}, 'common/utils.wxs': {
108
- domain: domain,
108
+ domain,
109
109
  }, 'common/util.js': {
110
110
  isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
111
111
  }, 'common/widget.js': {}, 'common/url.js': {}, 'common/weapp-sdk.js': {}, 'common/weapp-page.js': {
@@ -128,11 +128,9 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
128
128
  yield (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
129
129
  }
130
130
  else {
131
- appFileData = Object.assign(Object.assign({}, appFileData), { 'common/wx_yypt_report_v2.js': {}, 'app.js': { yyptConfig: yyptConfig }, 'app.json': { content: appConfig }, 'app.wxss': {
131
+ appFileData = Object.assign(Object.assign({}, appFileData), { 'common/wx_yypt_report_v2.js': {}, 'app.js': { yyptConfig }, 'app.json': { content: appConfig }, 'app.wxss': {
132
132
  importStyles: materials.reduce((styles, lib) => {
133
- styles = styles.concat((lib.styles || []).map((stylePath) => stylePath && !stylePath.startsWith('/')
134
- ? `/${config_1.materialsDirName}/${lib.name}/${stylePath}`
135
- : stylePath) || []);
133
+ styles = styles.concat((lib.styles || []).map((stylePath) => stylePath && !stylePath.startsWith('/') ? `/${config_1.materialsDirName}/${lib.name}/${stylePath}` : stylePath) || []);
136
134
  return styles;
137
135
  }, []),
138
136
  }, 'package.json': {
@@ -140,14 +138,10 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
140
138
  extraDeps: resolveNpmDeps(),
141
139
  } });
142
140
  }
143
- console.log('Generating ' + em('miniprogramRoot') + ' files');
141
+ console.log(`Generating ${em('miniprogramRoot')} files`);
144
142
  yield (0, generateFiles_1.default)(appFileData, templateDir, miniprogramRoot, buildContext);
145
- if (miniprogramRoot !== path_1.default.join(projDir, '/') &&
146
- fs.existsSync(path_1.default.join(projDir, config_1.materialsDirName))) {
147
- console.log('Move ' +
148
- em(config_1.materialsDirName) +
149
- ' from' +
150
- `${projDir} to ${miniprogramRoot}`);
143
+ if (miniprogramRoot !== path_1.default.join(projDir, '/') && fs.existsSync(path_1.default.join(projDir, config_1.materialsDirName))) {
144
+ console.log(`Move ${em(config_1.materialsDirName)} from` + `${projDir} to ${miniprogramRoot}`);
151
145
  yield fs.move(path_1.default.join(projDir, config_1.materialsDirName), path_1.default.join(miniprogramRoot, config_1.materialsDirName));
152
146
  }
153
147
  if (weapps.find((item) => !item.mpPkgUrl)) {
@@ -170,7 +164,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
170
164
  datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, dataSource_1.getDatasetProfiles)(mainAppData, weapps)),
171
165
  },
172
166
  };
173
- console.log('Generating ' + em('datasources') + ' files');
167
+ console.log(`Generating ${em('datasources')} files`);
174
168
  yield (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
175
169
  }
176
170
  yield Promise.all(weapps.map((app, index) => __awaiter(this, void 0, void 0, function* () {
@@ -225,7 +219,7 @@ exports.generateWxMp = generateWxMp;
225
219
  function generatePkg(weapp, appRoot, ctx, pageConfigs) {
226
220
  return __awaiter(this, void 0, void 0, function* () {
227
221
  const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
228
- console.log('Generating ' + em(weapp.rootPath ? 'subApp' : 'app') + ' to ' + appRoot);
222
+ console.log(`Generating ${em(weapp.rootPath ? 'subApp' : 'app')} to ${appRoot}`);
229
223
  if (weapp.mpPkgUrl) {
230
224
  console.log(`Removing ${appRoot}`);
231
225
  yield (0, generateFiles_1.cleanDir)(appRoot, ['materials']);
@@ -235,7 +229,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
235
229
  }
236
230
  }
237
231
  else {
238
- console.log('Generating ' + em('page') + ' files');
232
+ console.log(`Generating ${em('page')} files`);
239
233
  (0, generateFiles_1.cleanDir)(path_1.default.join(appRoot, 'pages'), []);
240
234
  yield Promise.all(weapp.pageInstanceList.map((page) => __awaiter(this, void 0, void 0, function* () {
241
235
  var _a, _b;
@@ -251,12 +245,10 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
251
245
  pageSource: page.data.src || '',
252
246
  eventHanlders: (0, util_2.createEventHanlders)(page.componentInstances, '$page', ctx),
253
247
  dataBinds: (0, util_2.createDataBinds)(page.componentInstances, ctx),
254
- pageAttributes: Object.assign({}, (((_a = page.data) === null || _a === void 0 ? void 0 : _a.appShareMessage)
255
- ? { appShareMessage: page.data.appShareMessage.value }
256
- : {})),
248
+ pageAttributes: Object.assign({}, (((_a = page.data) === null || _a === void 0 ? void 0 : _a.appShareMessage) ? { appShareMessage: page.data.appShareMessage.value } : {})),
257
249
  debug: !ctx.isProduction,
258
250
  stringifyObj: util_1.inspect,
259
- subLevelPath: rootPath ? path_1.default.relative(rootPath, '') + '/' : '',
251
+ subLevelPath: rootPath ? `${path_1.default.relative(rootPath, '')}/` : '',
260
252
  },
261
253
  [`index.json|${pageFileName}.json`]: {
262
254
  usingComponents,
@@ -314,9 +306,7 @@ function generateFramework(appData, outDir, ctx) {
314
306
  fileData = Object.assign(Object.assign({}, fileData), { 'app/app-global.js': {}, 'app/weapps-api.js': {
315
307
  appId: ctx.appId,
316
308
  domain: ctx.domain || '',
317
- subLevelPath: appData.rootPath
318
- ? path_1.default.relative(`${appData.rootPath}`, '') + '/'
319
- : '',
309
+ subLevelPath: appData.rootPath ? `${path_1.default.relative(`${appData.rootPath}`, '')}/` : '',
320
310
  subPackageName: appData.rootPath || '',
321
311
  isBare: false,
322
312
  appConfig: (0, util_3.JsonToStringWithVariableName)({
@@ -364,10 +354,15 @@ function writeLowCodeFiles(appData, outDir, ctx) {
364
354
  });
365
355
  }
366
356
  exports.writeLowCodeFiles = writeLowCodeFiles;
367
- function getAppendableJson(obj) {
357
+ function getAppendableJson(json) {
358
+ const obj = Object.assign({}, json);
359
+ if (obj.reachBottomDistance) {
360
+ obj.onReachBottomDistance = parseInt(obj.reachBottomDistance) || 0;
361
+ delete obj.reachBottomDistance;
362
+ }
368
363
  if (obj && Object.keys(obj).length > 0) {
369
364
  const str = JSON.stringify(obj);
370
- return ',\n' + str.substr(1, str.length - 2);
365
+ return `,\n${str.substr(1, str.length - 2)}`;
371
366
  }
372
367
  return '';
373
368
  }
@@ -383,10 +378,7 @@ function handleUsedComponents({ buildContext, weapps, materials, }) {
383
378
  });
384
379
  let allAppUsedComps = appUsedComps.reduce((comps, item) => {
385
380
  Object.keys(item.usedComps).forEach((libName) => {
386
- comps[libName] = new Set([
387
- ...Array.from(item.usedComps[libName]),
388
- ...Array.from(comps[libName] || []),
389
- ]);
381
+ comps[libName] = new Set([...Array.from(item.usedComps[libName]), ...Array.from(comps[libName] || [])]);
390
382
  });
391
383
  return comps;
392
384
  }, {});
@@ -414,9 +406,7 @@ function cleanPkg(pkg, miniprogramRoot) {
414
406
  if (pkg.mpPkgUrl) {
415
407
  return;
416
408
  }
417
- const pkgDir = [miniprogramRoot, pkg.rootPath]
418
- .filter((p) => !!p)
419
- .join(path_1.default.sep);
409
+ const pkgDir = [miniprogramRoot, pkg.rootPath].filter((p) => !!p).join(path_1.default.sep);
420
410
  const pagesDir = path_1.default.join(pkgDir, 'pages');
421
411
  const lowcodesDir = path_1.default.join(pkgDir, 'lowcode');
422
412
  const existedPages = yield fs.readdir(pagesDir);
@@ -431,13 +421,11 @@ function cleanPkg(pkg, miniprogramRoot) {
431
421
  }
432
422
  else {
433
423
  const handlersDir = path_1.default.join(lowcodeDir, 'handler');
434
- const handlers = ((_d = (_c = (_b = (_a = pkg === null || pkg === void 0 ? void 0 : pkg.pageInstanceList) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === pageName)) === null || _b === void 0 ? void 0 : _b.lowCodes) === null || _c === void 0 ? void 0 : _c.filter((m) => m.type === 'handler-fn')) === null || _d === void 0 ? void 0 : _d.map((m) => m.name + '.js')) || [];
424
+ const handlers = ((_d = (_c = (_b = (_a = pkg === null || pkg === void 0 ? void 0 : pkg.pageInstanceList) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === pageName)) === null || _b === void 0 ? void 0 : _b.lowCodes) === null || _c === void 0 ? void 0 : _c.filter((m) => m.type === 'handler-fn')) === null || _d === void 0 ? void 0 : _d.map((m) => `${m.name}.js`)) || [];
435
425
  (0, generateFiles_1.cleanDir)(handlersDir, handlers);
436
426
  }
437
427
  });
438
- const commonModules = pkg.lowCodes
439
- .filter((m) => m.type === 'normal-module')
440
- .map((m) => m.name + '.js');
428
+ const commonModules = pkg.lowCodes.filter((m) => m.type === 'normal-module').map((m) => `${m.name}.js`);
441
429
  const commonDir = path_1.default.join(lowcodesDir, 'common');
442
430
  (0, generateFiles_1.cleanDir)(commonDir, commonModules);
443
431
  });
@@ -1 +1 @@
1
- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/generate.ts"],"names":[],"mappings":"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"}
@@ -127,6 +127,7 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
127
127
  isComposite: extraData.isComposite,
128
128
  compProps: extraData.compProps,
129
129
  title: data.navigationBarTitleText || data.title || '',
130
+ reachBottomDistance: data.reachBottomDistance || 0
130
131
  };
131
132
  const dest = path_1.default.resolve(appBuildDir, `./pages/${pageInstance.id}/index.jsx`);
132
133
  const template = yield fs_extra_1.default.readFile(path_1.default.resolve(config_1.appTemplateDir, './src/pages/app.tpl'), {
@@ -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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"}
@@ -192,7 +192,6 @@ function generateKbonePageConfig(mpConfig, mainAppData, subAppDataList = []) {
192
192
  config_1.KBONE_PAGE_KEYS.forEach((key) => {
193
193
  if (item.data[key]) {
194
194
  mpConfig.pages[pageId][key] = item.data[key];
195
- delete item.data[key];
196
195
  }
197
196
  });
198
197
  mpConfig.pages[pageId].extra = Object.assign(Object.assign({}, item.data), { navigationBarTitleText });
@@ -318,7 +317,10 @@ function getWebpackWebBuildParams(appId, appBuildDir, materialsDir, dependencies
318
317
  jsApis = jsApis.concat(assets);
319
318
  }
320
319
  }
321
- const getPublicPath = () => buildTypeList.includes("app") || buildTypeList.includes("adminPortal") ? '' : publicPath;
320
+ const getPublicPath = () => buildTypeList.includes("app") ||
321
+ buildTypeList.includes("adminPortal")
322
+ ? ''
323
+ : publicPath;
322
324
  return {
323
325
  context: appBuildDir,
324
326
  mode: mode !== "production" ? 'development' : mode,
@@ -508,6 +510,7 @@ function installDependencies(targetDir, options = {}) {
508
510
  installProcess.on('exit', () => console.timeEnd(operationTag));
509
511
  yield (0, process_1.promisifyProcess)(installProcess);
510
512
  try {
513
+ fixNodeModules(targetDir);
511
514
  yield fs_extra_1.default.remove(path_1.default.join(path_1.default.join(targetDir, 'package-lock.json')));
512
515
  yield fs_extra_1.default.remove(path_1.default.join(path_1.default.join(targetDir, 'yarn.lock')));
513
516
  }
@@ -515,6 +518,16 @@ function installDependencies(targetDir, options = {}) {
515
518
  });
516
519
  }
517
520
  exports.installDependencies = installDependencies;
521
+ function fixNodeModules(projDir) {
522
+ const mobxPackageFile = path_1.default.join(projDir, 'node_modules', 'mobx/package.json');
523
+ if (fs_extra_1.default.existsSync(mobxPackageFile)) {
524
+ const mobxPackageFileContent = fs_extra_1.default.readJSONSync(mobxPackageFile);
525
+ if (fs_extra_1.default.existsSync(path_1.default.join(projDir, 'node_modules', 'mobx/lib/mobx.min.js'))) {
526
+ mobxPackageFileContent.main = 'lib/mobx.min.js';
527
+ fs_extra_1.default.writeJSONSync(mobxPackageFile, mobxPackageFileContent);
528
+ }
529
+ }
530
+ }
518
531
  function getMaterialNodeModulesPathList(dependencies = [], materialsDir) {
519
532
  const localPkg = (0, util_1.getCurrentPackageJson)();
520
533
  return dependencies.map(({ name, version }) => {
@@ -214,7 +214,14 @@ function translateStyleByHandler(style = {}, handler) {
214
214
  setStyleValue(result, key, value);
215
215
  }
216
216
  else if (value !== undefined && value !== null) {
217
+ try {
218
+
217
219
  setStyleValue(result, key, handler(value));
220
+ }catch(e){
221
+ console.log(style,key,value)
222
+ console.log(e)
223
+ throw e
224
+ }
218
225
  }
219
226
  return result;
220
227
  }, {});
@@ -257,6 +264,7 @@ function toREM(cssLen) {
257
264
  return calPxToREM(cssLen);
258
265
  }
259
266
  else {
267
+ console.log(cssLen)
260
268
  throw new Error('cssLen type error');
261
269
  }
262
270
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/framework-plugin-low-code",
3
- "version": "0.7.14",
3
+ "version": "0.7.17",
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",
@@ -436,10 +436,10 @@
436
436
  ></script>
437
437
  <script
438
438
  crossorigin="anonymous"
439
- src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.10/dist/h5.browser.js"
439
+ src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.11/dist/h5.browser.js"
440
440
  ></script>
441
441
  <script>
442
- // zxing polifill
442
+ // zxing polifill
443
443
  if (!this.globalThis) {
444
444
  this.globalThis = this;
445
445
  }
@@ -450,7 +450,7 @@
450
450
  ></script>
451
451
  <script
452
452
  crossorigin="anonymous"
453
- src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-client@0.2.10/dist/web.browser.js"
453
+ src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-client@0.2.11/dist/web.browser.js"
454
454
  ></script>
455
455
  </body>
456
456
  </html>
@@ -139,6 +139,7 @@ export function pageLifeCycleMount(
139
139
  onTabItemTap,
140
140
  },
141
141
  app = {},
142
+ extra = {}
142
143
  ) {
143
144
  let queryText = location.href.split('?')[1];
144
145
  let query = querystring.parse(queryText);
@@ -175,15 +176,15 @@ export function pageLifeCycleMount(
175
176
 
176
177
  // console.log(scrollTop, windowHeight, scrollTop + windowHeight, scrollHeight, isReachBottom)
177
178
  //滚动条到底部
178
- if (scrollTop + windowHeight >= scrollHeight && !isReachBottom) {
179
+ if (scrollTop + windowHeight >= scrollHeight - (extra.reachBottomDistance || 50)) {
179
180
  //要进行的操作
180
- isReachBottom = true;
181
- if (typeof onReachBottom === 'function') {
182
- onReachBottom();
181
+ if (!isReachBottom) {
182
+ isReachBottom = true;
183
+ if (typeof onReachBottom === 'function') {
184
+ onReachBottom();
185
+ }
183
186
  }
184
- }
185
- // 容许用户回弹50然后执行ReachBottom, 50为测试最佳值
186
- if (scrollTop + windowHeight < scrollHeight - 50) {
187
+ } else {
187
188
  isReachBottom = false;
188
189
  }
189
190
  }, 300);
@@ -128,7 +128,7 @@ export default function App() {
128
128
  React.useEffect(() => {
129
129
  document.title = "<%= title %>"
130
130
  }, [])
131
- pageLifeCycleMount(React.useEffect, PageLifeCycle, app)
131
+ pageLifeCycleMount(React.useEffect, PageLifeCycle, app, {reachBottomDistance:<%= reachBottomDistance %>})
132
132
  }
133
133
 
134
134
  React.useEffect(() => {