@luck-design-biz/luckda 0.0.25-17 → 0.0.25-19

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.
Files changed (63) hide show
  1. package/es/components/LdGrid/index.js +6 -9
  2. package/es/locales/zh-CN.js +5 -1
  3. package/es/lowcode/constants/event-topics.js +1 -1
  4. package/es/lowcode/engine/launcher.js +2 -0
  5. package/es/lowcode/engine/meta/form.props.json +0 -6
  6. package/es/lowcode/engine/meta/js-editor/auto-complete.json +5 -17
  7. package/es/lowcode/engine/meta/page.props.json +6 -0
  8. package/es/lowcode/engine/meta/table.props.json +10 -4
  9. package/es/lowcode/engine/meta/tree.props.default.json +6 -6
  10. package/es/lowcode/engine/meta/tree.props.json +57 -63
  11. package/es/lowcode/engine/provider/ContextProvider/index.js +30 -33
  12. package/es/lowcode/engine/provider/ContextProvider/usePageState.js +21 -0
  13. package/es/lowcode/engine/provider/RemoteSourceProvider.js +8 -13
  14. package/es/lowcode/engine/tools/diff.js +1 -1
  15. package/es/lowcode/engine/tools/helper.js +24 -12
  16. package/es/lowcode/engine/tools/useCombinedRefs.js +14 -0
  17. package/es/lowcode/painter/DesignToolbar.js +52 -23
  18. package/es/lowcode/painter/components/PreviewIframe.js +1 -1
  19. package/es/lowcode/painter/panel-section/StylePanel/MainPanel.js +2 -2
  20. package/es/lowcode/painter/style/design.less +1 -0
  21. package/es/lowcode/preview/index.js +2 -4
  22. package/es/lowcode/view/Canvas.js +15 -2
  23. package/es/lowcode/view/lc-components/Form/index.js +42 -64
  24. package/es/lowcode/view/lc-components/Form/meta.json +0 -6
  25. package/es/lowcode/view/lc-components/Page/meta.json +6 -0
  26. package/es/lowcode/view/lc-components/PageLayout/index.js +2 -2
  27. package/es/lowcode/view/lc-components/Table/components/TopImex.js +2 -2
  28. package/es/lowcode/view/lc-components/Table/index.js +181 -195
  29. package/es/lowcode/view/lc-components/Table/meta.json +10 -4
  30. package/es/lowcode/view/lc-components/Tree/index.js +0 -20
  31. package/es/lowcode/view/lc-components/Tree/meta.json +57 -63
  32. package/lib/components/LdGrid/index.js +6 -9
  33. package/lib/locales/zh-CN.js +5 -1
  34. package/lib/lowcode/constants/event-topics.js +2 -2
  35. package/lib/lowcode/engine/launcher.js +2 -0
  36. package/lib/lowcode/engine/meta/form.props.json +0 -6
  37. package/lib/lowcode/engine/meta/js-editor/auto-complete.json +5 -17
  38. package/lib/lowcode/engine/meta/page.props.json +6 -0
  39. package/lib/lowcode/engine/meta/table.props.json +10 -4
  40. package/lib/lowcode/engine/meta/tree.props.default.json +6 -6
  41. package/lib/lowcode/engine/meta/tree.props.json +57 -63
  42. package/lib/lowcode/engine/provider/ContextProvider/index.js +29 -32
  43. package/lib/lowcode/engine/provider/ContextProvider/usePageState.js +28 -0
  44. package/lib/lowcode/engine/provider/RemoteSourceProvider.js +8 -13
  45. package/lib/lowcode/engine/tools/diff.js +1 -1
  46. package/lib/lowcode/engine/tools/helper.js +26 -12
  47. package/lib/lowcode/engine/tools/useCombinedRefs.js +20 -0
  48. package/lib/lowcode/painter/DesignToolbar.js +51 -22
  49. package/lib/lowcode/painter/components/PreviewIframe.js +1 -1
  50. package/lib/lowcode/painter/panel-section/StylePanel/MainPanel.js +2 -2
  51. package/lib/lowcode/painter/style/design.less +1 -0
  52. package/lib/lowcode/preview/index.js +2 -4
  53. package/lib/lowcode/view/Canvas.js +15 -2
  54. package/lib/lowcode/view/lc-components/Form/index.js +42 -64
  55. package/lib/lowcode/view/lc-components/Form/meta.json +0 -6
  56. package/lib/lowcode/view/lc-components/Page/meta.json +6 -0
  57. package/lib/lowcode/view/lc-components/PageLayout/index.js +2 -2
  58. package/lib/lowcode/view/lc-components/Table/components/TopImex.js +2 -2
  59. package/lib/lowcode/view/lc-components/Table/index.js +178 -192
  60. package/lib/lowcode/view/lc-components/Table/meta.json +10 -4
  61. package/lib/lowcode/view/lc-components/Tree/index.js +0 -20
  62. package/lib/lowcode/view/lc-components/Tree/meta.json +57 -63
  63. package/package.json +1 -1
@@ -27,8 +27,7 @@ var RemoteSourceContext = exports.RemoteSourceContext = /*#__PURE__*/(0, _react.
27
27
  var _default = exports.default = function _default(_ref) {
28
28
  var children = _ref.children,
29
29
  code = _ref.code,
30
- eventBus = _ref.eventBus,
31
- debug = _ref.debug;
30
+ eventBus = _ref.eventBus;
32
31
  var _usePageDataStore = (0, _usePageDataStore2.default)(function (state) {
33
32
  return {
34
33
  initialize: state.initialize,
@@ -59,7 +58,7 @@ var _default = exports.default = function _default(_ref) {
59
58
  setRuntime = _useCookieState2[1];
60
59
  var prevRuntime = (0, _react.useRef)(cookieRuntime);
61
60
  (0, _ahooks.useCreation)(function () {
62
- !debug && (0, _launcher.default)();
61
+ (0, _launcher.default)();
63
62
  pause();
64
63
  if (eventBus.runtime !== cookieRuntime) {
65
64
  prevRuntime.current = cookieRuntime;
@@ -67,10 +66,8 @@ var _default = exports.default = function _default(_ref) {
67
66
  }
68
67
  }, []);
69
68
  (0, _ahooks.useUnmount)(function () {
70
- if (!debug) {
71
- reset();
72
- clear();
73
- }
69
+ reset();
70
+ clear();
74
71
  setRuntime(prevRuntime.current);
75
72
  });
76
73
 
@@ -184,7 +181,7 @@ var _default = exports.default = function _default(_ref) {
184
181
  case 2:
185
182
  fetchPageDataRes = _context.sent;
186
183
  if (!(fetchPageDataRes.code === 1)) {
187
- _context.next = 15;
184
+ _context.next = 16;
188
185
  break;
189
186
  }
190
187
  data = fetchPageDataRes.data, list = fetchPageDataRes.list, detail = fetchPageDataRes.detail;
@@ -209,12 +206,10 @@ var _default = exports.default = function _default(_ref) {
209
206
  runFetchAllSerials({
210
207
  uid: data.moduleId
211
208
  });
212
- if (!debug) {
213
- initialize((0, _dataProcess.decompress)(source));
214
- resume();
215
- }
209
+ initialize((0, _dataProcess.decompress)(source));
210
+ resume();
216
211
  eventBus.$publisher(_eventTopics.PAGE_LOAD_MOUNT);
217
- case 15:
212
+ case 16:
218
213
  case "end":
219
214
  return _context.stop();
220
215
  }
@@ -55,7 +55,7 @@ function diff(obj, newObj) {
55
55
  }
56
56
  var isNewObjArray = Array.isArray(newObj);
57
57
  for (var _key in newObj) {
58
- if (!(_key in obj)) {
58
+ if (!obj || !(_key in obj)) {
59
59
  diffs.push({
60
60
  type: 'CREATE',
61
61
  path: [isNewObjArray ? +_key : _key],
@@ -9,6 +9,7 @@ exports.extractKeywords = extractKeywords;
9
9
  exports.getCtx = getCtx;
10
10
  exports.getFuncBody = getFuncBody;
11
11
  exports.getLDMetaAttr = getLDMetaAttr;
12
+ exports.getMetaAttr = getMetaAttr;
12
13
  exports.isColor = isColor;
13
14
  exports.isPromise = isPromise;
14
15
  exports.listReducer = listReducer;
@@ -16,6 +17,7 @@ exports.loadScript = loadScript;
16
17
  exports.omitBadProps = omitBadProps;
17
18
  exports.parseCSS = parseCSS;
18
19
  exports.setLDMetaAttrs = setLDMetaAttrs;
20
+ exports.setMetaAttrs = setMetaAttrs;
19
21
  var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
20
22
  var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
21
23
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -167,25 +169,37 @@ function isColor(str) {
167
169
  var rgbaRegex = /^rgba?\(\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})(,\s*(0|1|0?\.\d+))?\s*\)$/;
168
170
  return hexRegex.test(str) || rgbaRegex.test(str);
169
171
  }
170
- function setLDMetaAttrs(data) {
171
- var meta = document.querySelector("meta[name=\"".concat(_constants.META_TAG_NAME, "\"]"));
172
+ function setMetaAttrs(name, data) {
173
+ var meta = document.querySelector("meta[name=\"".concat(name, "\"]"));
172
174
  if (!meta) {
173
175
  meta = document.createElement('meta');
174
176
  }
175
- meta.name = _constants.META_TAG_NAME;
176
- meta.content = new URLSearchParams(data).toString().replaceAll('&', ',');
177
+ meta.name = name;
178
+ meta.content = (0, _lodash.isString)(data) ? data : new URLSearchParams(data).toString().replaceAll('&', ',');
177
179
  document.head.appendChild(meta);
178
180
  }
179
- function getLDMetaAttr(name) {
181
+ function getMetaAttr(name, _) {
180
182
  if ((0, _lodash.isNil)(name)) return void 0;
181
- var meta = document.querySelector("meta[name=\"".concat(_constants.META_TAG_NAME, "\"]"));
182
- var params = new URLSearchParams(meta.content.replaceAll(',', '&'));
183
- if ((0, _lodash.isArray)(name)) {
184
- return name.map(function (n) {
185
- return params.get(n);
186
- });
183
+ var meta = document.querySelector("meta[name=\"".concat(name, "\"]"));
184
+ if (meta.content.includes(',')) {
185
+ var data = new URLSearchParams(meta.content.replaceAll(',', '&'));
186
+ if ((0, _lodash.isNil)(_)) {
187
+ return Object.fromEntries(data.entries());
188
+ }
189
+ if ((0, _lodash.isArray)(_)) {
190
+ return _.map(function (n) {
191
+ return data.get(n);
192
+ });
193
+ }
194
+ return data.get(_);
187
195
  }
188
- return params.get(name);
196
+ return meta.content;
197
+ }
198
+ function setLDMetaAttrs(data) {
199
+ setMetaAttrs(_constants.META_TAG_NAME, data);
200
+ }
201
+ function getLDMetaAttr(_) {
202
+ return getMetaAttr(_constants.META_TAG_NAME, _);
189
203
  }
190
204
  function extractKeywords(obj, keys) {
191
205
  var keywords = [];
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+ var _react = require("react");
8
+ var useCombinedRefs = function useCombinedRefs(forwardedRef) {
9
+ var innerRef = (0, _react.useRef)(null);
10
+ (0, _react.useEffect)(function () {
11
+ if (!forwardedRef) return;
12
+ if (typeof forwardedRef === 'function') {
13
+ forwardedRef(innerRef.current);
14
+ } else {
15
+ forwardedRef.current = innerRef.current;
16
+ }
17
+ }, [forwardedRef]);
18
+ return forwardedRef || innerRef;
19
+ };
20
+ var _default = exports.default = useCombinedRefs;
@@ -60,15 +60,13 @@ var DesignToolbar = function DesignToolbar(_ref) {
60
60
  undo: state.undo,
61
61
  redo: state.redo,
62
62
  pastStates: state.pastStates,
63
- futureStates: state.futureStates,
64
- clear: state.clear
63
+ futureStates: state.futureStates
65
64
  };
66
65
  }),
67
66
  canUndo = _useTemporalStore.canUndo,
68
67
  canRedo = _useTemporalStore.canRedo,
69
68
  undo = _useTemporalStore.undo,
70
- redo = _useTemporalStore.redo,
71
- clear = _useTemporalStore.clear;
69
+ redo = _useTemporalStore.redo;
72
70
  var _useCookieState = (0, _ahooks.useCookieState)(_constants.COOKIE_VIRTUAL_ACCOUNT_KEY),
73
71
  _useCookieState2 = (0, _slicedToArray2.default)(_useCookieState, 2),
74
72
  userId = _useCookieState2[0],
@@ -77,7 +75,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
77
75
  manual: true
78
76
  }),
79
77
  clearCacheLoading = _useRequest.loading,
80
- runClearCache = _useRequest.run;
78
+ runClearCache = _useRequest.runAsync;
81
79
  var _useRequest2 = (0, _ahooks.useRequest)(_apiUrl.fetchUpdatePageData, {
82
80
  manual: true,
83
81
  debounceWait: 300
@@ -103,21 +101,39 @@ var DesignToolbar = function DesignToolbar(_ref) {
103
101
  return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
104
102
  while (1) switch (_context.prev = _context.next) {
105
103
  case 0:
106
- _context.next = 2;
104
+ _antd.message.loading({
105
+ content: (0, _utils.formatMessage)({
106
+ id: 'luckda.lowcode.design.toolbar.save.on',
107
+ label: '保存中...'
108
+ }),
109
+ key: 'saveLoading'
110
+ });
111
+ _context.next = 3;
107
112
  return runAsync({
108
113
  pageData: JSON.stringify(pageData),
109
114
  pageCode: (0, _helper.getLDMetaAttr)('pageCode')
110
115
  });
111
- case 2:
116
+ case 3:
112
117
  _yield$runAsync = _context.sent;
113
118
  code = _yield$runAsync.code;
114
119
  if (code === 1) {
115
- clear();
116
- (0, _utils.showPop)((0, _utils.formatMessage)({
117
- id: 'app.base.tip.operate.success'
118
- }), null, 'success');
120
+ _antd.message.success({
121
+ content: (0, _utils.formatMessage)({
122
+ id: 'luckda.lowcode.design.toolbar.save.success',
123
+ label: '保存成功'
124
+ }),
125
+ key: 'saveLoading'
126
+ });
127
+ } else {
128
+ _antd.message.error({
129
+ content: (0, _utils.formatMessage)({
130
+ id: 'luckda.lowcode.design.toolbar.save.error',
131
+ label: '保存失败'
132
+ }),
133
+ key: 'saveLoading'
134
+ });
119
135
  }
120
- case 5:
136
+ case 6:
121
137
  case "end":
122
138
  return _context.stop();
123
139
  }
@@ -277,7 +293,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
277
293
  fontSize: 12,
278
294
  margin: '0 4px 0 2px'
279
295
  },
280
- loading: clearCacheLoading,
296
+ disabled: clearCacheLoading,
281
297
  onClick: handleClearCache
282
298
  }, (0, _utils.formatMessage)({
283
299
  id: 'luckda.lowcode.design.toolbar.clear',
@@ -288,16 +304,29 @@ var DesignToolbar = function DesignToolbar(_ref) {
288
304
  fontSize: 12,
289
305
  margin: '0 4px 0 2px'
290
306
  },
291
- onClick: function onClick() {
292
- setShowPreview(true);
293
- context.$publisher(context.topics.COMPONENT_ACTIVE, null);
294
- }
307
+ disabled: updatePageDataLoading,
308
+ onClick: /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
309
+ return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
310
+ while (1) switch (_context3.prev = _context3.next) {
311
+ case 0:
312
+ _context3.next = 2;
313
+ return handleSave();
314
+ case 2:
315
+ context.$publisher(context.topics.COMPONENT_ACTIVE, null);
316
+ setShowPreview(true);
317
+ case 4:
318
+ case "end":
319
+ return _context3.stop();
320
+ }
321
+ }, _callee3);
322
+ }))
295
323
  }, (0, _utils.formatMessage)({
296
324
  id: 'luckda.lowcode.design.toolbar.preview',
297
325
  label: '预览'
298
326
  })), /*#__PURE__*/_react.default.createElement(_antd.Button, {
299
327
  size: "small",
300
328
  type: "primary",
329
+ disabled: updatePageDataLoading,
301
330
  style: {
302
331
  fontSize: 12,
303
332
  padding: '0 7px 0 0',
@@ -320,7 +349,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
320
349
  return setShow(true);
321
350
  }
322
351
  }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
323
- type: updatePageDataLoading ? 'loading' : 'eye'
352
+ type: "eye"
324
353
  })))), /*#__PURE__*/_react.default.createElement(_antd.Modal, {
325
354
  visible: show,
326
355
  width: 1024,
@@ -379,10 +408,10 @@ var DesignToolbar = function DesignToolbar(_ref) {
379
408
  setUserId(void 0);
380
409
  }
381
410
  }
382
- }, userOptions.map(function (_ref5) {
383
- var key = _ref5.key,
384
- label = _ref5.label,
385
- rest = (0, _objectWithoutProperties2.default)(_ref5, _excluded);
411
+ }, userOptions.map(function (_ref6) {
412
+ var key = _ref6.key,
413
+ label = _ref6.label,
414
+ rest = (0, _objectWithoutProperties2.default)(_ref6, _excluded);
386
415
  return /*#__PURE__*/_react.default.createElement(_antd.Select.Option, (0, _extends2.default)({
387
416
  key: key,
388
417
  value: key
@@ -20,7 +20,7 @@ var PreviewIframe = function PreviewIframe(_ref) {
20
20
  return (0, _umi.getCreateHistoryOptions)().basename;
21
21
  });
22
22
  return /*#__PURE__*/_react.default.createElement(Iframe, {
23
- src: "".concat(basename === '/' ? '' : basename, "/byteman/preview?code=").concat(code, "&user=").concat(userId)
23
+ src: "".concat(basename === '/' ? '' : basename, "/byteman/preview?code=").concat(code, "&user=").concat(userId, "&pure=1")
24
24
  });
25
25
  };
26
26
  var _default = exports.default = PreviewIframe;
@@ -86,11 +86,11 @@ var MainPanel = function MainPanel() {
86
86
  }), /*#__PURE__*/_react.default.createElement(_WidthHeight.default, {
87
87
  field: "height",
88
88
  label: (0, _utils.formatMessage)({
89
- id: 'luckda.lowcode.painter.panel-section.style-panel.width',
89
+ id: 'luckda.lowcode.painter.panel-section.style-panel.height',
90
90
  label: '高'
91
91
  }),
92
92
  placeholder: (0, _utils.formatMessage)({
93
- id: 'luckda.lowcode.painter.panel-section.style-panel.width',
93
+ id: 'luckda.lowcode.painter.panel-section.style-panel.height',
94
94
  label: '请输入宽高度'
95
95
  })
96
96
  }), /*#__PURE__*/_react.default.createElement(_Display.default, {
@@ -86,6 +86,7 @@
86
86
  &-simulator {
87
87
  min-height: 100%;
88
88
  :global {
89
+ .anticon,
89
90
  .ant-form-item,
90
91
  .ant-collapse-header,
91
92
  .resizer,
@@ -15,8 +15,7 @@ var _Page = _interopRequireDefault(require("../view/Page"));
15
15
  var _index = require("../constants/index");
16
16
  var Preview = function Preview(_ref) {
17
17
  var code = _ref.code,
18
- userId = _ref.userId,
19
- debug = _ref.debug;
18
+ userId = _ref.userId;
20
19
  var _useState = (0, _react.useState)(userId),
21
20
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
22
21
  currentKey = _useState2[0],
@@ -30,8 +29,7 @@ var Preview = function Preview(_ref) {
30
29
  return code && currentKey ? /*#__PURE__*/_react.default.createElement(_EventBusProvider.default, {
31
30
  runtime: _index.RUNTIME.PREVIEW
32
31
  }, /*#__PURE__*/_react.default.createElement(_ContextProvider.default, {
33
- code: code,
34
- debug: debug
32
+ code: code
35
33
  }, /*#__PURE__*/_react.default.createElement(_Page.default, null))) : null;
36
34
  };
37
35
  var _default = exports.default = Preview;
@@ -38,11 +38,24 @@ var Canvas = function Canvas(_ref) {
38
38
  var _advance$events;
39
39
  ctx.doAction(advance === null || advance === void 0 || (_advance$events = advance.events) === null || _advance$events === void 0 ? void 0 : _advance$events.onPageMount);
40
40
  });
41
+ var handleStateChanged = (0, _ahooks.useMemoizedFn)(function (_ref2) {
42
+ var _advance$events2;
43
+ var state = _ref2.state,
44
+ prevState = _ref2.prevState,
45
+ diff = _ref2.diff;
46
+ ctx.doAction(advance === null || advance === void 0 || (_advance$events2 = advance.events) === null || _advance$events2 === void 0 ? void 0 : _advance$events2.onStateChanged, {
47
+ state: state,
48
+ prevState: prevState,
49
+ diff: diff
50
+ });
51
+ });
41
52
  (0, _react.useEffect)(function () {
42
53
  ctx.$subscriber(ctx.topics.PAGE_LOAD_MOUNT).once(handleMount).watch();
54
+ var tid = ctx.$subscriber(ctx.topics.PAGE_STATE_CHANGED).on(handleStateChanged);
43
55
  return function () {
44
- var _advance$events2;
45
- ctx.doAction(advance === null || advance === void 0 || (_advance$events2 = advance.events) === null || _advance$events2 === void 0 ? void 0 : _advance$events2.onPageUnmount);
56
+ var _advance$events3;
57
+ ctx.$unsubscriber(ctx.topics.PAGE_STATE_CHANGED, tid);
58
+ ctx.doAction(advance === null || advance === void 0 || (_advance$events3 = advance.events) === null || _advance$events3 === void 0 ? void 0 : _advance$events3.onPageUnmount);
46
59
  };
47
60
  }, []);
48
61
  return /*#__PURE__*/_react.default.createElement(PageRoot, {
@@ -24,6 +24,7 @@ var _helper = require("../../../engine/tools/helper");
24
24
  var _ContextProvider = require("../../../engine/provider/ContextProvider");
25
25
  var _Form = _interopRequireDefault(require("../../../../upload/Form"));
26
26
  var _RuntimeComp = _interopRequireDefault(require("../JSX/RuntimeComp"));
27
+ var _useCombinedRefs = _interopRequireDefault(require("../../../engine/tools/useCombinedRefs"));
27
28
  var _formPropsDefault = _interopRequireDefault(require("../../../engine/meta/form.props.default.json"));
28
29
  var _index2 = _interopRequireDefault(require("./index.less"));
29
30
  var _excluded = ["advance"];
@@ -61,20 +62,8 @@ var getMthodParams = function getMthodParams(methodStr) {
61
62
  }
62
63
  return [];
63
64
  };
64
- var useCombinedRefs = function useCombinedRefs(forwardedRef) {
65
- var innerRef = (0, _react.useRef)(null);
66
- (0, _react.useEffect)(function () {
67
- if (!forwardedRef) return;
68
- if (typeof forwardedRef === 'function') {
69
- forwardedRef(innerRef.current);
70
- } else {
71
- forwardedRef.current = innerRef.current;
72
- }
73
- }, [forwardedRef]);
74
- return forwardedRef || innerRef;
75
- };
76
65
  var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
77
- var _ctx$pagePublicResour2;
66
+ var _ctx$state2;
78
67
  var id = _ref3.id,
79
68
  className = _ref3.className,
80
69
  blocks = _ref3.blocks,
@@ -90,7 +79,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
90
79
  children = _ref3.children;
91
80
  var apiRef = (0, _react.useRef)();
92
81
  var wrapperRef = (0, _react.useRef)();
93
- var formRef = useCombinedRefs(ref);
82
+ var formRef = (0, _useCombinedRefs.default)(ref);
94
83
  var promiseRef = (0, _react.useRef)(null);
95
84
  var ctx = (0, _ContextProvider.useContext)();
96
85
  var remoteSource = (0, _ContextProvider.useRemoteSource)();
@@ -110,48 +99,31 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
110
99
  return !hidden;
111
100
  });
112
101
  }, [blocks]);
113
- (0, _ahooks.useMount)(function () {
114
- ctx.doAction(advance.events.onMount, {
102
+ (0, _ahooks.useUnmount)(function () {
103
+ return ctx.doAction(advance.events.onUnmount, {
115
104
  instance: formRef.current
116
105
  });
117
106
  });
118
- (0, _react.useEffect)(function () {
119
- var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref5) {
120
- var resource = _ref5.resource,
121
- prevResource = _ref5.prevResource;
122
- ctx.doAction(advance.events.onPagePublicResourceChanged, {
123
- resource: resource,
124
- prevResource: prevResource,
125
- instance: formRef.current
126
- });
127
- }).watch();
128
- return function () {
129
- ctx.$unsubscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED, tid);
130
- ctx.doAction(advance.events.onUnmount, {
131
- instance: formRef.current
132
- });
133
- };
134
- }, []);
135
107
  (0, _react.useImperativeHandle)(apiRef, function () {
136
108
  return {
137
- /**
138
- * 获取表格实例
139
- * @method
109
+ /**
110
+ * 获取表格实例
111
+ * @method
140
112
  */
141
113
  getInstance: function getInstance() {
142
114
  return formRef.current;
143
115
  },
144
- /**
145
- * 提交表格数据
146
- * @method
116
+ /**
117
+ * 提交表格数据
118
+ * @method
147
119
  */
148
120
  submit: function submit() {
149
121
  return new Promise(function (resolve) {
150
- var _ctx$pagePublicResour;
122
+ var _ctx$state;
151
123
  promiseRef.current = resolve;
152
124
  var instance = formRef.current;
153
- var _ref6 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || _initData || {},
154
- formMode = _ref6.formMode;
125
+ var _ref5 = ((_ctx$state = ctx.state) === null || _ctx$state === void 0 ? void 0 : _ctx$state[id]) || initData || _initData || {},
126
+ formMode = _ref5.formMode;
155
127
  if (formMode === 'add') {
156
128
  instance.onAdd();
157
129
  } else if (formMode === 'update') {
@@ -159,22 +131,22 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
159
131
  }
160
132
  });
161
133
  },
162
- /**
163
- * @typedef {Object} Field
164
- * @property {Object} target - 字段引用
165
- * @property {boolean} disabled - 字段不可维护
166
- * @property {boolean} required - 字段必填
167
- * @property {any} value - 字段值
134
+ /**
135
+ * @typedef {Object} Field
136
+ * @property {Object} target - 字段引用
137
+ * @property {boolean} disabled - 字段不可维护
138
+ * @property {boolean} required - 字段必填
139
+ * @property {any} value - 字段值
168
140
  */
169
- /**
170
- * @typedef {Object} Block
171
- * @property {Object} target - 区块引用
172
- * @property {function(fieldName): Field} getField - 获取区块下的表单域
141
+ /**
142
+ * @typedef {Object} Block
143
+ * @property {Object} target - 区块引用
144
+ * @property {function(fieldName): Field} getField - 获取区块下的表单域
173
145
  */
174
- /**
175
- * 获取区块
176
- * @param {*} blockId - 区块ID
177
- * @returns {Block}
146
+ /**
147
+ * 获取区块
148
+ * @param {*} blockId - 区块ID
149
+ * @returns {Block}
178
150
  */
179
151
  getBlock: function getBlock(blockId) {
180
152
  var instance = formRef.current;
@@ -254,10 +226,10 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
254
226
  };
255
227
  return (0, _helper.executeCode)(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
256
228
  });
257
- var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, dataSetKey, _ref7) {
258
- var values = _ref7.values,
259
- submitData = _ref7.submitData,
260
- behaviorKey = _ref7.behaviorKey;
229
+ var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, dataSetKey, _ref6) {
230
+ var values = _ref6.values,
231
+ submitData = _ref6.submitData,
232
+ behaviorKey = _ref6.behaviorKey;
261
233
  if ((0, _lodash.isNil)(dataSourceFormat)) return (0, _defineProperty2.default)({}, dataSetKey, submitData);
262
234
  return (0, _helper.executeCode)(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData', 'behaviorKey'], dataSetKey, values, submitData, behaviorKey);
263
235
  });
@@ -483,7 +455,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
483
455
  });
484
456
  var beforeSubmit = (0, _ahooks.useMemoizedFn)(function (values, data) {
485
457
  return new Promise( /*#__PURE__*/function () {
486
- var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve) {
458
+ var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve) {
487
459
  var _data;
488
460
  return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
489
461
  while (1) switch (_context.prev = _context.next) {
@@ -511,10 +483,15 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
511
483
  }, _callee);
512
484
  }));
513
485
  return function (_x) {
514
- return _ref9.apply(this, arguments);
486
+ return _ref8.apply(this, arguments);
515
487
  };
516
488
  }());
517
489
  });
490
+ var afterInit = (0, _ahooks.useMemoizedFn)(function () {
491
+ ctx.doAction(advance.events.onMount, {
492
+ instance: formRef.current
493
+ });
494
+ });
518
495
  var afterSubmit = (0, _ahooks.useMemoizedFn)(function (success, mainKey, res) {
519
496
  ctx.doAction(advance.events.onSaveCallback, {
520
497
  success: success,
@@ -546,7 +523,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
546
523
  renderFormList: renderFormList,
547
524
  renderFormExtra: renderFormExtra,
548
525
  mainFormLdId: "block_main",
549
- initData: ((_ctx$pagePublicResour2 = ctx.pagePublicResource) === null || _ctx$pagePublicResour2 === void 0 ? void 0 : _ctx$pagePublicResour2[id]) || initData || _initData,
526
+ initData: ((_ctx$state2 = ctx.state) === null || _ctx$state2 === void 0 ? void 0 : _ctx$state2[id]) || initData || _initData,
550
527
  ref: formRef,
551
528
  readOnly: readOnly,
552
529
  showSaveBtn: showSave,
@@ -570,7 +547,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
570
547
  rest[_key5] = arguments[_key5];
571
548
  }
572
549
  return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
573
- }
550
+ },
551
+ afterInit: afterInit
574
552
  }));
575
553
  });
576
554
  LCForm.defaultProps = (0, _helper.omitBadProps)(_formPropsDefault.default);
@@ -604,12 +604,6 @@
604
604
  "name": "表单内容发生改变时的回调",
605
605
  "desc": "表单内容发生改变时的回调",
606
606
  "func": "function onChildChange(instance) {\n\t\n}"
607
- },
608
- {
609
- "key": "onPagePublicResourceChanged",
610
- "name": "页面共享资源变化后",
611
- "desc": "当页面共享资源发生变化后(pagePublicResourceChanged),执行方法",
612
- "func": "function onPagePublicResourceChanged(resource, prevResource, instance) {\n\t\n}"
613
607
  }
614
608
  ]
615
609
  }
@@ -32,6 +32,12 @@
32
32
  "css": "background-color: transparent;",
33
33
  "advance": {
34
34
  "events": [
35
+ {
36
+ "key": "onStateChanged",
37
+ "name": "页面状态变化",
38
+ "desc": "在页面状态发生变化时,执行方法",
39
+ "func": "function onStateChanged(state, prevState, diff){\n\t\n}"
40
+ },
35
41
  {
36
42
  "key": "onPageMount",
37
43
  "name": "页面首次渲染完成",
@@ -37,9 +37,9 @@ var LCPageLayout = function LCPageLayout(_ref) {
37
37
  $css: css
38
38
  }, display === 'tb' ? /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
39
39
  split: "horizontal"
40
- }, children) : null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_base.Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
40
+ }, children) : null) : [/*#__PURE__*/_react.default.createElement(_base.Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
41
41
  split: display === 'ltb' ? 'horizontal' : 'vertical'
42
- }, children === null || children === void 0 ? void 0 : children[1], children === null || children === void 0 ? void 0 : children[2])) : null))));
42
+ }, children === null || children === void 0 ? void 0 : children[1], children === null || children === void 0 ? void 0 : children[2])) : null)]));
43
43
  };
44
44
  LCPageLayout.defaultProps = (0, _helper.omitBadProps)(_pagelayoutPropsDefault.default);
45
45
  var _default = exports.default = LCPageLayout;
@@ -287,7 +287,7 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
287
287
  var handleExportAll = function handleExportAll(procress) {
288
288
  return new Promise( /*#__PURE__*/function () {
289
289
  var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(resolve, reject) {
290
- var isBehavior, strategy, behaviorKey, _exportExcelParams, _exportExcelPrefix, exportExcelResponse, _tableRef$gridApi, joiner, labels, fieldInfo, defaultExcelParams, _exportExcelParams2, _exportExcelPrefix2, _exportExcelResponse;
290
+ var isBehavior, strategy, behaviorKey, _exportExcelParams, _exportExcelPrefix, exportExcelResponse, _tableRef$current, joiner, labels, fieldInfo, defaultExcelParams, _exportExcelParams2, _exportExcelPrefix2, _exportExcelResponse;
291
291
  return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
292
292
  while (1) switch (_context2.prev = _context2.next) {
293
293
  case 0:
@@ -331,7 +331,7 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
331
331
  joiner = apiUrl.indexOf('?') !== -1 ? '&' : '?';
332
332
  labels = [];
333
333
  fieldInfo = [];
334
- tableRef === null || tableRef === void 0 || (_tableRef$gridApi = tableRef.gridApi) === null || _tableRef$gridApi === void 0 || _tableRef$gridApi.columnApi.getAllDisplayedColumns().forEach(function (column) {
334
+ (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.gridApi) === null || _tableRef$current === void 0 || _tableRef$current.columnApi.getAllDisplayedColumns().forEach(function (column) {
335
335
  if (column.colId !== 'luck-expand' && column.colId !== 'luck-select' && column.colId !== 'luck-index' && column.colId !== 'luck-actions' && column.colId !== 'fraction_drag'
336
336
  // !column.colDef.draggable
337
337
  ) {