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

package/es/lowcode/painter/DesignToolbar.js

@@ -11,7 +11,7 @@ import { useLocation } from 'umi';
 import classNames from 'classnames';
 import { useMemoizedFn, useRequest, useDebounceFn, useCookieState } from 'ahooks';
 import { Select, Button, Icon, Divider, Modal, message, Drawer } from 'luck-design/antd';
-import { showPop, formatMessage } from '@luck-design-biz/base/utils';
+import { formatMessage } from '@luck-design-biz/base/utils';
 import { useContext, useGet, resetPageData, useTemporalStore } from "../engine/provider/ContextProvider";
 import JsonEditor from "../painter/components/code-editor/JsonEditor";
 import PreviewIframe from "./components/PreviewIframe";
@@ -52,15 +52,13 @@ var DesignToolbar = function DesignToolbar(_ref) {
         undo: state.undo,
         redo: state.redo,
         pastStates: state.pastStates,
-        futureStates: state.futureStates,
-        clear: state.clear
+        futureStates: state.futureStates
       };
     }),
     canUndo = _useTemporalStore.canUndo,
     canRedo = _useTemporalStore.canRedo,
     undo = _useTemporalStore.undo,
-    redo = _useTemporalStore.redo,
-    clear = _useTemporalStore.clear;
+    redo = _useTemporalStore.redo;
   var _useCookieState = useCookieState(COOKIE_VIRTUAL_ACCOUNT_KEY),
     _useCookieState2 = _slicedToArray(_useCookieState, 2),
     userId = _useCookieState2[0],
@@ -69,7 +67,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       manual: true
     }),
     clearCacheLoading = _useRequest.loading,
-    runClearCache = _useRequest.run;
+    runClearCache = _useRequest.runAsync;
   var _useRequest2 = useRequest(fetchUpdatePageData, {
       manual: true,
       debounceWait: 300
@@ -95,21 +93,39 @@ var DesignToolbar = function DesignToolbar(_ref) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          message.loading({
+            content: formatMessage({
+              id: 'luckda.lowcode.design.toolbar.save.on',
+              label: '保存中...'
+            }),
+            key: 'saveLoading'
+          });
+          _context.next = 3;
           return runAsync({
             pageData: JSON.stringify(pageData),
             pageCode: getLDMetaAttr('pageCode')
           });
-        case 2:
+        case 3:
           _yield$runAsync = _context.sent;
           code = _yield$runAsync.code;
           if (code === 1) {
-            clear();
-            showPop(formatMessage({
-              id: 'app.base.tip.operate.success'
-            }), null, 'success');
+            message.success({
+              content: formatMessage({
+                id: 'luckda.lowcode.design.toolbar.save.success',
+                label: '保存成功'
+              }),
+              key: 'saveLoading'
+            });
+          } else {
+            message.error({
+              content: formatMessage({
+                id: 'luckda.lowcode.design.toolbar.save.error',
+                label: '保存失败'
+              }),
+              key: 'saveLoading'
+            });
           }
-        case 5:
+        case 6:
         case "end":
           return _context.stop();
       }
@@ -269,7 +285,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       fontSize: 12,
       margin: '0 4px 0 2px'
     },
-    loading: clearCacheLoading,
+    disabled: clearCacheLoading,
     onClick: handleClearCache
   }, formatMessage({
     id: 'luckda.lowcode.design.toolbar.clear',
@@ -280,16 +296,29 @@ var DesignToolbar = function DesignToolbar(_ref) {
       fontSize: 12,
       margin: '0 4px 0 2px'
     },
-    onClick: function onClick() {
-      setShowPreview(true);
-      context.$publisher(context.topics.COMPONENT_ACTIVE, null);
-    }
+    disabled: updatePageDataLoading,
+    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return handleSave();
+          case 2:
+            context.$publisher(context.topics.COMPONENT_ACTIVE, null);
+            setShowPreview(true);
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }))
   }, formatMessage({
     id: 'luckda.lowcode.design.toolbar.preview',
     label: '预览'
   })), /*#__PURE__*/React.createElement(Button, {
     size: "small",
     type: "primary",
+    disabled: updatePageDataLoading,
     style: {
       fontSize: 12,
       padding: '0 7px 0 0',
@@ -312,7 +341,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       return setShow(true);
     }
   }, /*#__PURE__*/React.createElement(Icon, {
-    type: updatePageDataLoading ? 'loading' : 'eye'
+    type: "eye"
   })))), /*#__PURE__*/React.createElement(Modal, {
     visible: show,
     width: 1024,
@@ -371,10 +400,10 @@ var DesignToolbar = function DesignToolbar(_ref) {
           setUserId(void 0);
         }
       }
-    }, userOptions.map(function (_ref5) {
-      var key = _ref5.key,
-        label = _ref5.label,
-        rest = _objectWithoutProperties(_ref5, _excluded);
+    }, userOptions.map(function (_ref6) {
+      var key = _ref6.key,
+        label = _ref6.label,
+        rest = _objectWithoutProperties(_ref6, _excluded);
       return /*#__PURE__*/React.createElement(Select.Option, _extends({
         key: key,
         value: key

package/es/lowcode/painter/components/PreviewIframe.js

@@ -13,7 +13,7 @@ var PreviewIframe = function PreviewIframe(_ref) {
     return getCreateHistoryOptions().basename;
   });
   return /*#__PURE__*/React.createElement(Iframe, {
-    src: "".concat(basename === '/' ? '' : basename, "/byteman/preview?code=").concat(code, "&user=").concat(userId)
+    src: "".concat(basename === '/' ? '' : basename, "/byteman/preview?code=").concat(code, "&user=").concat(userId, "&pure=1")
   });
 };
 export default PreviewIframe;

package/es/lowcode/painter/panel-section/StylePanel/MainPanel.js

@@ -79,11 +79,11 @@ var MainPanel = function MainPanel() {
   }), /*#__PURE__*/React.createElement(WidthHeight, {
     field: "height",
     label: formatMessage({
-      id: 'luckda.lowcode.painter.panel-section.style-panel.width',
+      id: 'luckda.lowcode.painter.panel-section.style-panel.height',
       label: '高'
     }),
     placeholder: formatMessage({
-      id: 'luckda.lowcode.painter.panel-section.style-panel.width',
+      id: 'luckda.lowcode.painter.panel-section.style-panel.height',
       label: '请输入宽高度'
     })
   }), /*#__PURE__*/React.createElement(Display, {

package/es/lowcode/painter/style/design.less

@@ -86,6 +86,7 @@
   &-simulator {
     min-height: 100%;
     :global {
+      .anticon,
       .ant-form-item,
       .ant-collapse-header,
       .resizer,

package/es/lowcode/preview/index.js

@@ -7,8 +7,7 @@ import Page from "../view/Page";
 import { RUNTIME } from "../constants/index";
 var Preview = function Preview(_ref) {
   var code = _ref.code,
-    userId = _ref.userId,
-    debug = _ref.debug;
+    userId = _ref.userId;
   var _useState = useState(userId),
     _useState2 = _slicedToArray(_useState, 2),
     currentKey = _useState2[0],
@@ -22,8 +21,7 @@ var Preview = function Preview(_ref) {
   return code && currentKey ? /*#__PURE__*/React.createElement(EventBusProvider, {
     runtime: RUNTIME.PREVIEW
   }, /*#__PURE__*/React.createElement(ContextProvider, {
-    code: code,
-    debug: debug
+    code: code
   }, /*#__PURE__*/React.createElement(Page, null))) : null;
 };
 export default Preview;

package/es/lowcode/view/Canvas.js

@@ -30,11 +30,24 @@ var Canvas = function Canvas(_ref) {
     var _advance$events;
     ctx.doAction(advance === null || advance === void 0 || (_advance$events = advance.events) === null || _advance$events === void 0 ? void 0 : _advance$events.onPageMount);
   });
+  var handleStateChanged = useMemoizedFn(function (_ref2) {
+    var _advance$events2;
+    var state = _ref2.state,
+      prevState = _ref2.prevState,
+      diff = _ref2.diff;
+    ctx.doAction(advance === null || advance === void 0 || (_advance$events2 = advance.events) === null || _advance$events2 === void 0 ? void 0 : _advance$events2.onStateChanged, {
+      state: state,
+      prevState: prevState,
+      diff: diff
+    });
+  });
   useEffect(function () {
     ctx.$subscriber(ctx.topics.PAGE_LOAD_MOUNT).once(handleMount).watch();
+    var tid = ctx.$subscriber(ctx.topics.PAGE_STATE_CHANGED).on(handleStateChanged);
     return function () {
-      var _advance$events2;
-      ctx.doAction(advance === null || advance === void 0 || (_advance$events2 = advance.events) === null || _advance$events2 === void 0 ? void 0 : _advance$events2.onPageUnmount);
+      var _advance$events3;
+      ctx.$unsubscriber(ctx.topics.PAGE_STATE_CHANGED, tid);
+      ctx.doAction(advance === null || advance === void 0 || (_advance$events3 = advance.events) === null || _advance$events3 === void 0 ? void 0 : _advance$events3.onPageUnmount);
     };
   }, []);
   return /*#__PURE__*/React.createElement(PageRoot, {

package/es/lowcode/view/lc-components/Form/index.js

@@ -5,7 +5,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["advance"];
 import React, { useRef, forwardRef, Fragment, useImperativeHandle, useEffect } from 'react';
-import { useMemoizedFn, useCreation, useMount } from 'ahooks';
+import { useMemoizedFn, useCreation, useUnmount } from 'ahooks';
 import classNames from 'classnames';
 import { reduce, includes, isNil, cloneDeep, last, startsWith, isString } from 'lodash';
 import { BasicDivider } from 'luck-design';
@@ -17,6 +17,7 @@ import { omitBadProps, executeCode, getLDMetaAttr } from "../../../engine/tools/
 import { useContext, useRemoteSource, modifyNode } from "../../../engine/provider/ContextProvider";
 import buildUploadForm from "../../../../upload/Form";
 import RuntimeComp from "../JSX/RuntimeComp";
+import useCombinedRefs from "../../../engine/tools/useCombinedRefs";
 import defaultMeta from "../../../engine/meta/form.props.default.json";
 import styles from "./index.less";
 var _I18N_PREFIX_ = 'lc.form.validator';
@@ -53,20 +54,8 @@ var getMthodParams = function getMthodParams(methodStr) {
   }
   return [];
 };
-var useCombinedRefs = function useCombinedRefs(forwardedRef) {
-  var innerRef = useRef(null);
-  useEffect(function () {
-    if (!forwardedRef) return;
-    if (typeof forwardedRef === 'function') {
-      forwardedRef(innerRef.current);
-    } else {
-      forwardedRef.current = innerRef.current;
-    }
-  }, [forwardedRef]);
-  return forwardedRef || innerRef;
-};
 var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
-  var _ctx$pagePublicResour2;
+  var _ctx$state2;
   var id = _ref3.id,
     className = _ref3.className,
     blocks = _ref3.blocks,
@@ -102,48 +91,31 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
       return !hidden;
     });
   }, [blocks]);
-  useMount(function () {
-    ctx.doAction(advance.events.onMount, {
+  useUnmount(function () {
+    return ctx.doAction(advance.events.onUnmount, {
       instance: formRef.current
     });
   });
-  useEffect(function () {
-    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref5) {
-      var resource = _ref5.resource,
-        prevResource = _ref5.prevResource;
-      ctx.doAction(advance.events.onPagePublicResourceChanged, {
-        resource: resource,
-        prevResource: prevResource,
-        instance: formRef.current
-      });
-    }).watch();
-    return function () {
-      ctx.$unsubscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED, tid);
-      ctx.doAction(advance.events.onUnmount, {
-        instance: formRef.current
-      });
-    };
-  }, []);
   useImperativeHandle(apiRef, function () {
     return {
-      /**
-       * 获取表格实例
-       * @method
+      /**
+       * 获取表格实例
+       * @method
        */
       getInstance: function getInstance() {
         return formRef.current;
       },
-      /**
-       * 提交表格数据
-       * @method
+      /**
+       * 提交表格数据
+       * @method
        */
       submit: function submit() {
         return new Promise(function (resolve) {
-          var _ctx$pagePublicResour;
+          var _ctx$state;
           promiseRef.current = resolve;
           var instance = formRef.current;
-          var _ref6 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || _initData || {},
-            formMode = _ref6.formMode;
+          var _ref5 = ((_ctx$state = ctx.state) === null || _ctx$state === void 0 ? void 0 : _ctx$state[id]) || initData || _initData || {},
+            formMode = _ref5.formMode;
           if (formMode === 'add') {
             instance.onAdd();
           } else if (formMode === 'update') {
@@ -151,22 +123,22 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
           }
         });
       },
-      /**
-       * @typedef {Object} Field
-       * @property {Object} target - 字段引用
-       * @property {boolean} disabled - 字段不可维护
-       * @property {boolean} required - 字段必填
-       * @property {any} value - 字段值
+      /**
+       * @typedef {Object} Field
+       * @property {Object} target - 字段引用
+       * @property {boolean} disabled - 字段不可维护
+       * @property {boolean} required - 字段必填
+       * @property {any} value - 字段值
        */
-      /**
-       * @typedef {Object} Block
-       * @property {Object} target - 区块引用
-       * @property {function(fieldName): Field} getField - 获取区块下的表单域
+      /**
+       * @typedef {Object} Block
+       * @property {Object} target - 区块引用
+       * @property {function(fieldName): Field} getField - 获取区块下的表单域
        */
-      /**
-       * 获取区块
-       * @param {*} blockId - 区块ID
-       * @returns {Block}
+      /**
+       * 获取区块
+       * @param {*} blockId - 区块ID
+       * @returns {Block}
        */
       getBlock: function getBlock(blockId) {
         var instance = formRef.current;
@@ -246,10 +218,10 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     };
     return executeCode(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
-  var handleDataSourceFormat = useMemoizedFn(function (dataSourceFormat, dataSetKey, _ref7) {
-    var values = _ref7.values,
-      submitData = _ref7.submitData,
-      behaviorKey = _ref7.behaviorKey;
+  var handleDataSourceFormat = useMemoizedFn(function (dataSourceFormat, dataSetKey, _ref6) {
+    var values = _ref6.values,
+      submitData = _ref6.submitData,
+      behaviorKey = _ref6.behaviorKey;
     if (isNil(dataSourceFormat)) return _defineProperty({}, dataSetKey, submitData);
     return executeCode(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData', 'behaviorKey'], dataSetKey, values, submitData, behaviorKey);
   });
@@ -475,7 +447,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
   });
   var beforeSubmit = useMemoizedFn(function (values, data) {
     return new Promise( /*#__PURE__*/function () {
-      var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve) {
+      var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve) {
         var _data;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -503,10 +475,15 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
         }, _callee);
       }));
       return function (_x) {
-        return _ref9.apply(this, arguments);
+        return _ref8.apply(this, arguments);
       };
     }());
   });
+  var afterInit = useMemoizedFn(function () {
+    ctx.doAction(advance.events.onMount, {
+      instance: formRef.current
+    });
+  });
   var afterSubmit = useMemoizedFn(function (success, mainKey, res) {
     ctx.doAction(advance.events.onSaveCallback, {
       success: success,
@@ -538,7 +515,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     renderFormList: renderFormList,
     renderFormExtra: renderFormExtra,
     mainFormLdId: "block_main",
-    initData: ((_ctx$pagePublicResour2 = ctx.pagePublicResource) === null || _ctx$pagePublicResour2 === void 0 ? void 0 : _ctx$pagePublicResour2[id]) || initData || _initData,
+    initData: ((_ctx$state2 = ctx.state) === null || _ctx$state2 === void 0 ? void 0 : _ctx$state2[id]) || initData || _initData,
     ref: formRef,
     readOnly: readOnly,
     showSaveBtn: showSave,
@@ -562,7 +539,8 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
         rest[_key5] = arguments[_key5];
       }
       return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
-    }
+    },
+    afterInit: afterInit
   }));
 });
 LCForm.defaultProps = omitBadProps(defaultMeta);

package/es/lowcode/view/lc-components/Form/meta.json

@@ -604,12 +604,6 @@
         "name": "表单内容发生改变时的回调",
         "desc": "表单内容发生改变时的回调",
         "func": "function onChildChange(instance) {\n\t\n}"
-      },
-      {
-        "key": "onPagePublicResourceChanged",
-        "name": "页面共享资源变化后",
-        "desc": "当页面共享资源发生变化后（pagePublicResourceChanged），执行方法",
-        "func": "function onPagePublicResourceChanged(resource, prevResource, instance) {\n\t\n}"
       }
     ]
   }

package/es/lowcode/view/lc-components/Page/meta.json

@@ -32,6 +32,12 @@
   "css": "background-color: transparent;",
   "advance": {
     "events": [
+      {
+        "key": "onStateChanged",
+        "name": "页面状态变化",
+        "desc": "在页面状态发生变化时，执行方法",
+        "func": "function onStateChanged(state, prevState, diff){\n\t\n}"
+      },
       {
         "key": "onPageMount",
         "name": "页面首次渲染完成",

package/es/lowcode/view/lc-components/PageLayout/index.js

@@ -29,9 +29,9 @@ var LCPageLayout = function LCPageLayout(_ref) {
     $css: css
   }, display === 'tb' ? /*#__PURE__*/React.createElement(Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/React.createElement(MemorySplit, {
     split: "horizontal"
-  }, children) : null) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/React.createElement(Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/React.createElement(React.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/React.createElement(MemorySplit, {
+  }, children) : null) : [/*#__PURE__*/React.createElement(Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/React.createElement(Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/React.createElement(React.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/React.createElement(MemorySplit, {
     split: display === 'ltb' ? 'horizontal' : 'vertical'
-  }, children === null || children === void 0 ? void 0 : children[1], children === null || children === void 0 ? void 0 : children[2])) : null))));
+  }, children === null || children === void 0 ? void 0 : children[1], children === null || children === void 0 ? void 0 : children[2])) : null)]));
 };
 LCPageLayout.defaultProps = omitBadProps(defaultMeta);
 export default LCPageLayout;

package/es/lowcode/view/lc-components/Table/components/TopImex.js

@@ -279,7 +279,7 @@ export var TopExport = function TopExport(_ref5) {
   var handleExportAll = function handleExportAll(procress) {
     return new Promise( /*#__PURE__*/function () {
       var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
-        var isBehavior, strategy, behaviorKey, _exportExcelParams, _exportExcelPrefix, exportExcelResponse, _tableRef$gridApi, joiner, labels, fieldInfo, defaultExcelParams, _exportExcelParams2, _exportExcelPrefix2, _exportExcelResponse;
+        var isBehavior, strategy, behaviorKey, _exportExcelParams, _exportExcelPrefix, exportExcelResponse, _tableRef$current, joiner, labels, fieldInfo, defaultExcelParams, _exportExcelParams2, _exportExcelPrefix2, _exportExcelResponse;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -323,7 +323,7 @@ export var TopExport = function TopExport(_ref5) {
               joiner = apiUrl.indexOf('?') !== -1 ? '&' : '?';
               labels = [];
               fieldInfo = [];
-              tableRef === null || tableRef === void 0 || (_tableRef$gridApi = tableRef.gridApi) === null || _tableRef$gridApi === void 0 || _tableRef$gridApi.columnApi.getAllDisplayedColumns().forEach(function (column) {
+              (_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) {
                 if (column.colId !== 'luck-expand' && column.colId !== 'luck-select' && column.colId !== 'luck-index' && column.colId !== 'luck-actions' && column.colId !== 'fraction_drag'
                 // !column.colDef.draggable
                 ) {