@luck-design-biz/luckda 0.0.25-1 → 0.0.25-10

package/es/lowcode/painter/DesignToolbar.js

@@ -1,26 +1,32 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+var _excluded = ["key", "label"];
 import React, { useRef, useEffect, useState } from 'react';
+import { useLocation } from 'umi';
 import classNames from 'classnames';
-import { useMemoizedFn } from 'ahooks';
-import { Select, Button, Icon, Divider, Modal, message } from 'luck-design/antd';
+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 { useContext, usePageData, useRemoteSource } from "../engine/provider/ContextProvider";
+import { useContext, useGet, resetPageData, useTemporalStore } from "../engine/provider/ContextProvider";
 import JsonEditor from "../painter/components/code-editor/JsonEditor";
-import { LC_BUILDIN_UNIT_KEY } from "../constants";
-import { updatePageData } from "./services/toolbar";
+import Preview from "../preview";
+import { LC_BUILDIN_UNIT_KEY, COOKIE_VIRTUAL_ACCOUNT_KEY } from "../constants";
 import styles from "./style/design.less";
+import { fetchClearCache, fetchUpdatePageData } from "../constants/api-url";
+import { getLDMetaAttr } from "../engine/tools/helper";
+import { readAllUser } from '@luck-design-biz/base/lib/sys/services';
 var DesignToolbar = function DesignToolbar(_ref) {
   var locale = _ref.locale,
     onLangChange = _ref.onLangChange;
+  var location = useLocation();
   var editorRef = useRef();
   var context = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 2),
-    pageData = _usePageData2[0],
-    setPageData = _usePageData2[1].setPageData;
-  var _ref2 = useRemoteSource() || {},
-    pageinfo = _ref2.pageinfo;
+  var pageData = useGet();
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     langList = _useState2[0],
@@ -33,42 +39,154 @@ var DesignToolbar = function DesignToolbar(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     show = _useState6[0],
     setShow = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    showPreview = _useState8[0],
+    setShowPreview = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    userOptions = _useState10[0],
+    setUserOptions = _useState10[1];
+  var _useTemporalStore = useTemporalStore(function (state) {
+      return {
+        undo: state.undo,
+        redo: state.redo,
+        pastStates: state.pastStates,
+        futureStates: state.futureStates,
+        clear: state.clear
+      };
+    }),
+    canUndo = _useTemporalStore.canUndo,
+    canRedo = _useTemporalStore.canRedo,
+    undo = _useTemporalStore.undo,
+    redo = _useTemporalStore.redo,
+    clear = _useTemporalStore.clear;
+  var _useCookieState = useCookieState(COOKIE_VIRTUAL_ACCOUNT_KEY),
+    _useCookieState2 = _slicedToArray(_useCookieState, 2),
+    userId = _useCookieState2[0],
+    setUserId = _useCookieState2[1];
+  var _useRequest = useRequest(fetchClearCache, {
+      manual: true
+    }),
+    clearCacheLoading = _useRequest.loading,
+    runClearCache = _useRequest.run;
+  var _useRequest2 = useRequest(fetchUpdatePageData, {
+      manual: true,
+      debounceWait: 300
+    }),
+    updatePageDataLoading = _useRequest2.loading,
+    runAsync = _useRequest2.runAsync;
   useEffect(function () {
-    var topicId = context.$subscriber(context.topics.LANG_SETTING_SELECT).on(function (_ref3) {
-      var _langList = _ref3.langList;
+    var topicId = context.$subscriber(context.topics.LANG_SETTING_SELECT).on(function (_ref2) {
+      var _langList = _ref2.langList;
       return setLangList(_langList);
     }).watch();
     return function () {
       return context.$unsubscriber(context.topics.LANG_SETTING_SELECT, topicId);
     };
   }, []);
-  var handleSave = useMemoizedFn(function () {
-    var _pageinfo$relationshi;
-    updatePageData({}, {
-      pageData: JSON.stringify(pageData),
-      pageCode: pageinfo === null || pageinfo === void 0 || (_pageinfo$relationshi = pageinfo.relationship) === null || _pageinfo$relationshi === void 0 ? void 0 : _pageinfo$relationshi.pageCode
-    }).then(function (_ref4) {
-      var code = _ref4.code;
-      if (code === 1) {
-        showPop(formatMessage({
-          id: 'app.base.tip.operate.success'
-        }), null, 'success');
+  useEffect(function () {
+    if (!showPreview) {
+      setUserId(void 0);
+    }
+  }, [showPreview]);
+  var handleSave = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _yield$runAsync, code;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return runAsync({
+            pageData: JSON.stringify(pageData),
+            pageCode: getLDMetaAttr('pageCode')
+          });
+        case 2:
+          _yield$runAsync = _context.sent;
+          code = _yield$runAsync.code;
+          if (code === 1) {
+            clear();
+            showPop(formatMessage({
+              id: 'app.base.tip.operate.success'
+            }), null, 'success');
+          }
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), []);
+  var handleClearCache = useMemoizedFn(function () {
+    Modal.confirm({
+      title: formatMessage({
+        id: 'luckda.lowcode.design.toolbar.clear.tip',
+        label: '清除提示'
+      }),
+      content: formatMessage({
+        id: 'luckda.lowcode.design.toolbar.clear',
+        label: '确定清除当前页面及模块缓存么？'
+      }),
+      getContainer: function getContainer() {
+        return document.getElementById('lc-design-workspace');
+      },
+      zIndex: 3000,
+      onOk: function onOk() {
+        return runClearCache({
+          moduleCode: getLDMetaAttr('moduleCode')
+        });
       }
     });
-  }, []);
+  });
   var handleOk = useMemoizedFn(function () {
     var code = editorRef.current.editor.getValue();
     try {
       var data = JSON.parse(code);
-      setPageData(data);
+      resetPageData(data);
       setShow(false);
     } catch (e) {
+      console.error(e);
       message.warning(formatMessage({
         id: 'luckda.lowcode.error.pagedata',
         label: '页面数据错误'
       }));
     }
   });
+  var _useDebounceFn = useDebounceFn( /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
+        var _yield$readAllUser, code, list, detail;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return readAllUser({
+                sname: value
+              });
+            case 2:
+              _yield$readAllUser = _context2.sent;
+              code = _yield$readAllUser.code;
+              list = _yield$readAllUser.list;
+              detail = _yield$readAllUser.detail;
+              if (code === 1) {
+                setUserOptions(list.map(function (id) {
+                  var item = detail[id];
+                  return _objectSpread(_objectSpread({}, item), {}, {
+                    key: "".concat(item.indocno),
+                    label: item.sname
+                  });
+                }));
+              }
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      return function (_x) {
+        return _ref4.apply(this, arguments);
+      };
+    }(), {
+      wait: 500
+    }),
+    handleSearch = _useDebounceFn.run;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: styles['lc-painter-design-toolbar']
   }, /*#__PURE__*/React.createElement(Select, {
@@ -100,6 +218,35 @@ var DesignToolbar = function DesignToolbar(_ref) {
     type: "mobile"
   })), /*#__PURE__*/React.createElement(Divider, {
     type: "vertical"
+  }), /*#__PURE__*/React.createElement("span", {
+    className: classNames(styles['toolbar-item'], _defineProperty({}, styles.disabled, !canUndo)),
+    onClick: function onClick() {
+      return canUndo && undo();
+    }
+  }, /*#__PURE__*/React.createElement("svg", {
+    viewBox: "0 0 1024 1024",
+    width: "20",
+    height: "20",
+    fill: "currentColor",
+    style: {
+      transform: 'rotateY(180deg)'
+    }
+  }, /*#__PURE__*/React.createElement("path", {
+    d: "M946.8 420L651.9 125.1c-19.5-19.5-52.7-5.7-52.7 21.8v174c-79.3-1.8-501.8 14.9-532.3 569.6-0.9 17.2 22.1 24.3 30.6 9.3C255 621 396.6 553.3 599.1 561.5v175.2c0 27.5 33.3 41.3 52.8 21.9l294.8-294.9c12.1-12.1 12.1-31.6 0.1-43.7z"
+  }))), /*#__PURE__*/React.createElement("span", {
+    className: classNames(styles['toolbar-item'], _defineProperty({}, styles.disabled, !canRedo)),
+    onClick: function onClick() {
+      return canRedo && redo();
+    }
+  }, /*#__PURE__*/React.createElement("svg", {
+    viewBox: "0 0 1024 1024",
+    width: "20",
+    height: "20",
+    fill: "currentColor"
+  }, /*#__PURE__*/React.createElement("path", {
+    d: "M946.8 420L651.9 125.1c-19.5-19.5-52.7-5.7-52.7 21.8v174c-79.3-1.8-501.8 14.9-532.3 569.6-0.9 17.2 22.1 24.3 30.6 9.3C255 621 396.6 553.3 599.1 561.5v175.2c0 27.5 33.3 41.3 52.8 21.9l294.8-294.9c12.1-12.1 12.1-31.6 0.1-43.7z"
+  }))), /*#__PURE__*/React.createElement(Divider, {
+    type: "vertical"
   }), /*#__PURE__*/React.createElement("span", {
     style: {
       width: 'auto',
@@ -108,18 +255,38 @@ var DesignToolbar = function DesignToolbar(_ref) {
     className: styles['toolbar-item'],
     onClick: function onClick() {
       context.$publisher(context.topics.COMPONENT_ACTIVE, {
-        id: LC_BUILDIN_UNIT_KEY.PAGE_ROOT
+        target: LC_BUILDIN_UNIT_KEY.PAGE_ROOT
       });
     }
-  }, "\u9875\u9762\u5C5E\u6027"), /*#__PURE__*/React.createElement(Divider, {
+  }, formatMessage({
+    id: 'luckda.lowcode.design.toolbar.pageAttrs',
+    label: '页面属性'
+  })), /*#__PURE__*/React.createElement(Divider, {
     type: "vertical"
   }), /*#__PURE__*/React.createElement(Button, {
     size: "small",
     style: {
       fontSize: 12,
       margin: '0 4px 0 2px'
+    },
+    loading: clearCacheLoading,
+    onClick: handleClearCache
+  }, formatMessage({
+    id: 'luckda.lowcode.design.toolbar.clear',
+    label: '清除缓存'
+  })), /*#__PURE__*/React.createElement(Button, {
+    size: "small",
+    style: {
+      fontSize: 12,
+      margin: '0 4px 0 2px'
+    },
+    onClick: function onClick() {
+      return setShowPreview(true);
     }
-  }, "\u9884\u89C8"), /*#__PURE__*/React.createElement(Button, {
+  }, formatMessage({
+    id: 'luckda.lowcode.design.toolbar.preview',
+    label: '预览'
+  })), /*#__PURE__*/React.createElement(Button, {
     size: "small",
     type: "primary",
     style: {
@@ -132,7 +299,10 @@ var DesignToolbar = function DesignToolbar(_ref) {
       padding: '0 7px'
     },
     onClick: handleSave
-  }, "\u4FDD\u5B58"), /*#__PURE__*/React.createElement("div", {
+  }, formatMessage({
+    id: 'luckda.lowcode.design.toolbar.save',
+    label: '保存'
+  })), /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'inline-block'
     },
@@ -140,7 +310,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       return setShow(true);
     }
   }, /*#__PURE__*/React.createElement(Icon, {
-    type: "eye"
+    type: updatePageDataLoading ? 'loading' : 'eye'
   })))), /*#__PURE__*/React.createElement(Modal, {
     visible: show,
     width: 1024,
@@ -148,15 +318,89 @@ var DesignToolbar = function DesignToolbar(_ref) {
       return document.getElementById('lc-design-workspace');
     },
     zIndex: 3000,
-    bodyStyle: {
-      height: '70vh'
-    },
     onOk: handleOk,
     onCancel: function onCancel() {
       return setShow(false);
     }
   }, /*#__PURE__*/React.createElement(JsonEditor, {
-    ref: editorRef
-  }, JSON.stringify(pageData, null, '\t'))));
+    ref: editorRef,
+    style: {
+      height: '70vh'
+    }
+  }, JSON.stringify(pageData, null, '\t'))), /*#__PURE__*/React.createElement(Drawer, {
+    title: /*#__PURE__*/React.createElement("div", {
+      id: "preview-drawer-header",
+      style: {
+        display: 'flex',
+        height: 54,
+        alignItems: 'center',
+        justifyContent: 'space-between'
+      }
+    }, /*#__PURE__*/React.createElement("h3", {
+      style: {
+        marginBottom: 0
+      }
+    }, formatMessage({
+      id: 'luckda.lowcode.design.toolbar.pagePreview',
+      label: '页面预览'
+    })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
+      placeholder: formatMessage({
+        id: 'luckda.lowcode.design.toolbar.selectUser',
+        label: '请选择模拟登录人'
+      }),
+      allowClear: true,
+      style: {
+        width: 180
+      },
+      dropdownStyle: {
+        zIndex: 3100
+      },
+      filterOption: false,
+      labelInValue: true,
+      showSearch: true,
+      getPopupContainer: function getPopupContainer() {
+        return document.getElementById('preview-drawer-header').closest('.ant-drawer-wrapper-body');
+      },
+      onSearch: handleSearch,
+      onChange: function onChange(_, _opt) {
+        if (_opt) {
+          setUserId(_opt.props.sloginid);
+        } else {
+          setUserId(void 0);
+        }
+      }
+    }, userOptions.map(function (_ref5) {
+      var key = _ref5.key,
+        label = _ref5.label,
+        rest = _objectWithoutProperties(_ref5, _excluded);
+      return /*#__PURE__*/React.createElement(Select.Option, _extends({
+        key: key,
+        value: key
+      }, rest), label);
+    })))),
+    placement: "bottom",
+    height: "94vh",
+    footer: false,
+    zIndex: 3000,
+    headerStyle: {
+      padding: '0 48px 0 24px'
+    },
+    bodyStyle: {
+      height: 'calc(100% - 54px)',
+      backgroundColor: '#F0F2F5'
+    },
+    visible: showPreview,
+    destroyOnClose: true,
+    onClose: function onClose() {
+      return setShowPreview(false);
+    },
+    getContainer: function getContainer() {
+      return document.getElementById('lc-design-workspace');
+    }
+  }, /*#__PURE__*/React.createElement(Preview, {
+    code: location.query.code,
+    userId: userId || 'no-user',
+    debug: true
+  })));
 };
 export default DesignToolbar;

package/es/lowcode/painter/Outline.js

@@ -5,11 +5,11 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["props", "children"];
 import React, { useRef, useState, useEffect } from 'react';
 import { useMemoizedFn, useDeepCompareLayoutEffect, useLatest } from 'ahooks';
-import { uniq, split, reduce } from 'lodash';
+import { uniq, split, reduce, isString } from 'lodash';
 import classNames from 'classnames';
 import { Card, Tree, Icon } from 'luck-design/antd';
 import { formatMessage } from '@luck-design-biz/base/utils';
-import { useContext, usePageData } from "../engine/provider/ContextProvider";
+import { useContext, useGet } from "../engine/provider/ContextProvider";
 import { LC_BUILDIN_UNIT_KEY, LC_BUILDIN_UNIT_KEY_LIST } from "../constants";
 import { getPathById } from "../engine/tools/dataProcess";
 import styles from "./style/outline.less";
@@ -19,9 +19,7 @@ var Outline = function Outline(_ref) {
   var open = _ref.open;
   var clickBySelf = useRef(false);
   var ctx = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 1),
-    pageData = _usePageData2[0];
+  var pageData = useGet();
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     pageAndModal = _useState2[0],
@@ -42,18 +40,22 @@ var Outline = function Outline(_ref) {
   var lastPageExpandedKeysRef = useLatest(pageExpandedKeys);
   useEffect(function () {
     var _id = ctx.$subscriber(ctx.topics.COMPONENT_ACTIVE).on(function (payload) {
-      setSelectedKey(payload.id);
+      if (!isString(payload.target)) {
+        setSelectedKey(null);
+        return;
+      }
+      setSelectedKey(payload.target);
       if (clickBySelf.current) {
         clickBySelf.current = false;
         return;
       }
-      var _split = split(getPathById(pageData, payload.id), '/'),
+      var _split = split(getPathById(pageData, payload.target), '/'),
         _split2 = _slicedToArray(_split, 1),
         _root = _split2[0];
       if (!LC_BUILDIN_UNIT_KEY_LIST.includes(_root)) {
-        setModalExpandedKeys(uniq([].concat(_toConsumableArray(latestModalExpandedKeysRef.current), _toConsumableArray(split(getPathById(pageData, payload.id), '/')))));
+        setModalExpandedKeys(uniq([].concat(_toConsumableArray(latestModalExpandedKeysRef.current), _toConsumableArray(split(getPathById(pageData, payload.target), '/')))));
       } else {
-        setPageExpandedKeys(uniq([].concat(_toConsumableArray(lastPageExpandedKeysRef.current), _toConsumableArray(split(getPathById(pageData, payload.id), '/')))));
+        setPageExpandedKeys(uniq([].concat(_toConsumableArray(lastPageExpandedKeysRef.current), _toConsumableArray(split(getPathById(pageData, payload.target), '/')))));
       }
     }).watch();
     return function () {
@@ -63,7 +65,7 @@ var Outline = function Outline(_ref) {
   var handleSelect = useMemoizedFn(function (_key) {
     clickBySelf.current = true;
     ctx.$publisher(ctx.topics.COMPONENT_ACTIVE, _key ? {
-      id: _key
+      target: _key
     } : null);
   });
   var render = useMemoizedFn(function (_ref2) {