@luck-design-biz/luckda 0.0.24-2 → 0.0.25

package/lib/lowcode/engine/provider/{ContextProvider.js → ContextProvider/index.js}

@@ -12,12 +12,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _ahooks = require("ahooks");
-var _EventBusProvider = require("./EventBusProvider");
-var _usePromiseState3 = _interopRequireDefault(require("../tools/usePromiseState"));
-var _action = require("../../../helper/action");
-var topics = _interopRequireWildcard(require("../../constants/event-topics"));
-var _dataProcess = require("../tools/dataProcess");
-var _apiUrl = require("../../constants/api-url");
+var _EventBusProvider = require("../EventBusProvider");
+var _usePromiseState3 = _interopRequireDefault(require("../../tools/usePromiseState"));
+var topics = _interopRequireWildcard(require("../../../constants/event-topics"));
+var _dataProcess = require("../../tools/dataProcess");
+var _helper = require("../../tools/helper");
+var _apiUrl = require("../../../constants/api-url");
 var _excluded = ["source"];
 var Context = exports.Context = /*#__PURE__*/(0, _react.createContext)(null);
 var useLDContext = exports.useLDContext = function useLDContext() {
@@ -42,6 +42,14 @@ var _default = exports.default = function _default(_ref) {
    */
   var _pageinfo = (0, _react.useRef)(null);
 
+  /**
+   * 页面公共资源
+   */
+  var _useSetState = (0, _ahooks.useSetState)(null),
+    _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
+    pagePublicResource = _useSetState2[0],
+    _setPagePublicResource = _useSetState2[1];
+
   /**
    * 组件列表
    */
@@ -63,7 +71,7 @@ var _default = exports.default = function _default(_ref) {
    * id:string 组件id
    * component:ReactNode 组件
    */
-  var register = (0, _ahooks.useMemoizedFn)(function (id, component) {
+  var _register = (0, _ahooks.useMemoizedFn)(function (id, component) {
     _componentList.current.push([id, component]);
   });
 
@@ -71,7 +79,7 @@ var _default = exports.default = function _default(_ref) {
    * 注销组件
    * id:string 组件id
    */
-  var unregister = (0, _ahooks.useMemoizedFn)(function (id) {
+  var _unregister = (0, _ahooks.useMemoizedFn)(function (id) {
     _componentList.current = _componentList.current.filter(function (_ref2) {
       var _ref3 = (0, _slicedToArray2.default)(_ref2, 1),
         _id = _ref3[0];
@@ -118,6 +126,17 @@ var _default = exports.default = function _default(_ref) {
    * return:object
    */
   var getUrlParams = (0, _ahooks.useMemoizedFn)(function () {});
+  var doAction = (0, _ahooks.useMemoizedFn)(function (action) {
+    (0, _helper.executeCode)(ctx, action.actionCode);
+    Promise.all(action.actionPool.map(function (actionKey) {
+      return new Promise(function (resolve) {
+        setTimeout(function () {
+          console.log("doAction:".concat(actionKey));
+          resolve(actionKey);
+        }, 400);
+      });
+    })).then();
+  });
   var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchPageData, {
       manual: true
     }),
@@ -140,38 +159,49 @@ var _default = exports.default = function _default(_ref) {
       }
     });
   }, [code]);
-  return /*#__PURE__*/_react.default.createElement(Context.Provider, {
-    value: new Proxy((0, _objectSpread2.default)({
-      _setPageData: _setPageData,
-      loading: loading,
-      pageData: pageData,
-      history: _umi.history,
-      topics: topics,
-      register: register,
-      unregister: unregister,
-      getElementById: getElementById,
-      getParentElement: getParentElement,
-      getElementPathById: getElementPathById,
-      getModule: getModule,
-      getDataSetById: getDataSetById,
-      doAction: _action.doAction,
-      getUrlParams: getUrlParams
-    }, eventBus), {
-      get: function get(target, property, receiver) {
-        if (PRIVATE_KEYS.includes(property)) {
-          var _privateGetter$curren;
-          return (_privateGetter$curren = _privateGetter.current) === null || _privateGetter$curren === void 0 ? void 0 : _privateGetter$curren[property]();
-        }
-        return Reflect.get(target, property, receiver);
-      },
-      set: function set(target, property, receiver) {
-        console.log('set', target, property, receiver);
-        if (PRIVATE_KEYS.includes(property)) {
-          throw new Error("\u5C5E\u6027 \"".concat(property, "\" \u662F\u53EA\u8BFB\u7684"));
-        } else {
-          return Reflect.set(target, property, receiver);
-        }
+  var ctx = new Proxy((0, _objectSpread2.default)({
+    _setPageData: _setPageData,
+    _register: _register,
+    _unregister: _unregister,
+    loading: loading,
+    pageData: pageData,
+    pagePublicResource: pagePublicResource,
+    history: _umi.history,
+    topics: topics,
+    getElementById: getElementById,
+    /**
+     * @method
+     * @param {string} id - 组件id
+     * @return {object}
+     */
+    getParentElement: getParentElement,
+    getElementPathById: getElementPathById,
+    getModule: getModule,
+    getDataSetById: getDataSetById,
+    doAction: doAction,
+    /**
+     * @method
+     * @return {object}
+     */
+    getUrlParams: getUrlParams
+  }, eventBus), {
+    get: function get(target, property, receiver) {
+      if (PRIVATE_KEYS.includes(property)) {
+        var _privateGetter$curren;
+        return (_privateGetter$curren = _privateGetter.current) === null || _privateGetter$curren === void 0 ? void 0 : _privateGetter$curren[property]();
       }
-    })
+      return Reflect.get(target, property, receiver);
+    },
+    set: function set(target, property, receiver) {
+      console.log('set', target, property, receiver);
+      if (PRIVATE_KEYS.includes(property)) {
+        throw new Error("\u5C5E\u6027 \"".concat(property, "\" \u662F\u53EA\u8BFB\u7684"));
+      } else {
+        return Reflect.set(target, property, receiver);
+      }
+    }
+  });
+  return /*#__PURE__*/_react.default.createElement(Context.Provider, {
+    value: ctx
   }, children);
 };

package/lib/lowcode/engine/tools/helper.js

@@ -4,9 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.executeCode = executeCode;
+exports.getCtx = getCtx;
+exports.getFuncBody = getFuncBody;
 exports.isPromise = isPromise;
 exports.listReducer = listReducer;
 exports.omitBadProps = omitBadProps;
+var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
@@ -78,4 +82,31 @@ function listReducer(state, action) {
     default:
       throw new Error();
   }
+}
+function getCtx(context) {
+  return (0, _lodash.omitBy)(context, function (_, key) {
+    return (0, _lodash.startsWith)(key, '_');
+  });
+}
+function getFuncBody(funcCode) {
+  var regex = /{([\s\S]*?)}(?![\s\S]*})/;
+  var matches = funcCode.match(regex);
+  if (matches) {
+    return matches[1].replace(/\s*\n\s*/g, ' ').trim();
+  }
+  return '';
+}
+function executeCode(context, code, argsName) {
+  if (!(0, _lodash.isString)(code)) {
+    throw new Error('executeCode编码参数无效');
+  }
+  for (var _len = arguments.length, args = new Array(_len > 3 ? _len - 3 : 0), _key = 3; _key < _len; _key++) {
+    args[_key - 3] = arguments[_key];
+  }
+  if ((0, _lodash.isNil)(argsName) && args.length > 0 || !(0, _lodash.isNil)(argsName) && !(0, _lodash.isArray)(argsName) || (0, _lodash.isArray)(argsName) && argsName.length !== (args === null || args === void 0 ? void 0 : args.length)) {
+    throw new Error('executeCode参数不匹配');
+  }
+  var ctx = getCtx(context);
+  var func = (0, _construct2.default)(Function, (0, _toConsumableArray2.default)(argsName || []).concat(['ctx', getFuncBody(code)]));
+  return func.apply(void 0, args.concat([ctx]));
 }

package/lib/lowcode/engine/tools/usePromiseState.js

@@ -9,10 +9,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _ahooks = require("ahooks");
 var usePromiseState = function usePromiseState(initialState) {
-  var _useSafeState = (0, _ahooks.useSafeState)(initialState),
-    _useSafeState2 = (0, _slicedToArray2.default)(_useSafeState, 2),
-    state = _useSafeState2[0],
-    setState = _useSafeState2[1];
+  var _useResetState = (0, _ahooks.useResetState)(initialState),
+    _useResetState2 = (0, _slicedToArray2.default)(_useResetState, 3),
+    state = _useResetState2[0],
+    setState = _useResetState2[1],
+    resetState = _useResetState2[2];
   var promiseRef = (0, _react.useRef)(null);
   var setStatePromise = (0, _react.useCallback)(function (_state) {
     return new Promise(function (resolve) {
@@ -26,6 +27,6 @@ var usePromiseState = function usePromiseState(initialState) {
       promiseRef.current = null;
     }
   }, [state]);
-  return [state, setStatePromise];
+  return [state, setStatePromise, resetState];
 };
 var _default = exports.default = usePromiseState;

package/lib/lowcode/painter/Panel.js

@@ -1,13 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -16,29 +14,36 @@ var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
+var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../engine/provider/ContextProvider");
-var _PanelItem = _interopRequireDefault(require("./components/PanelItem"));
-var _panelItemFactory = _interopRequireDefault(require("../engine/factory/panel-item-factory"));
+var _AttrsPanel = _interopRequireDefault(require("./components/AttrsPanel"));
+var _StylePanel = _interopRequireDefault(require("./panel-section/StylePanel"));
+var _AdvancePanel = _interopRequireDefault(require("./components/AdvancePanel"));
 var _dataProcess = require("../engine/tools/dataProcess");
 var _panel = _interopRequireDefault(require("./style/panel.less"));
-var _StylePanel = _interopRequireDefault(require("./panel-section/StylePanel"));
-var _excluded = ["type", "key", "name", "desc", "default", "props", "panelItem", "next", "repositioning"];
+var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel';
 var _TAB_LIST_ = [{
-  title: '属性',
+  title: (0, _utils.formatMessage)({
+    id: "".concat(_I18N_PREFIX_, ".attrs"),
+    label: '属性'
+  }),
   key: 'attrs'
 }, {
-  title: '样式',
+  title: (0, _utils.formatMessage)({
+    id: "".concat(_I18N_PREFIX_, ".styles"),
+    label: '样式'
+  }),
   key: 'styles'
 }, {
-  title: '高级',
+  title: (0, _utils.formatMessage)({
+    id: "".concat(_I18N_PREFIX_, ".advance"),
+    label: '高级'
+  }),
   key: 'advance'
 }];
 var Panel = function Panel() {
-  var _nextRef$current, _nextRef$current2;
   var activeTabRef = (0, _react.useRef)(null);
   var underLineRef = (0, _react.useRef)(null);
-  var nextRef = (0, _react.useRef)(null);
-  var factory = (0, _react.useRef)(new _panelItemFactory.default());
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     activeNode = _useState2[0],
@@ -47,13 +52,10 @@ var Panel = function Panel() {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     activeTabKey = _useState4[0],
     setActiveTabKey = _useState4[1];
-  var _useBoolean = (0, _ahooks.useBoolean)(false),
-    _useBoolean2 = (0, _slicedToArray2.default)(_useBoolean, 2),
-    open = _useBoolean2[0],
-    _useBoolean2$ = _useBoolean2[1],
-    setTrue = _useBoolean2$.setTrue,
-    setFalse = _useBoolean2$.setFalse;
   var context = (0, _ContextProvider.useLDContext)();
+  var meta = (0, _ahooks.useCreation)(function () {
+    return (0, _lodash.isNil)(activeNode) ? null : require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
+  }, [activeNode]);
   var handleChange = (0, _ahooks.useMemoizedFn)(function (field, value, repositioning) {
     var component = context.componentMap.get(activeNode.node.id);
     var _component$api$getSel = component.api.getSelfAndParentLCData(),
@@ -69,85 +71,10 @@ var Panel = function Panel() {
         id: activeNode.node.id
       });
     });
-    if (nextRef.current.autoClose) {
-      setFalse();
-    }
-  });
-  var handleStyleChange = (0, _ahooks.useMemoizedFn)(function (newStyle, newCss) {
-    console.log('style', newStyle, newCss);
-    // setCss(newCss);
-  });
-  var goNext = (0, _ahooks.useMemoizedFn)(function (_next) {
-    if (!_next) return;
-    nextRef.current = {
-      name: _next.name,
-      autoClose: _next.autoClose,
-      NextComp: renderPanelItems(_next.props)
-    };
-    setTrue();
-  });
-  var renderPanelItems = (0, _ahooks.useMemoizedFn)(function (items) {
-    return items.map(function (_ref) {
-      var type = _ref.type,
-        key = _ref.key,
-        name = _ref.name,
-        desc = _ref.desc,
-        defaultValue = _ref.default,
-        props = _ref.props,
-        panelItem = _ref.panelItem,
-        _next2 = _ref.next,
-        repositioning = _ref.repositioning,
-        rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-      var Comp = factory.current.getPanelItemFor((0, _lodash.startsWith)(type, '_') ? 'dynamic' : type, type);
-      if (type === 'group') {
-        return /*#__PURE__*/_react.default.createElement(Comp, {
-          key: key,
-          field: key,
-          label: name,
-          next: _next2 ? function () {
-            return goNext(_next2);
-          } : null,
-          defaultCollapsed: defaultValue,
-          desc: desc
-        }, renderPanelItems(props || []));
-      }
-      var _context$componentMap = context.componentMap.get(activeNode.node.id).api.getSelfAndParentLCData(),
-        node = _context$componentMap.node;
-      return /*#__PURE__*/_react.default.createElement(_PanelItem.default, (0, _extends2.default)({
-        key: key,
-        field: key,
-        label: name,
-        desc: desc
-      }, panelItem), Comp && /*#__PURE__*/_react.default.createElement(Comp, (0, _extends2.default)({
-        defaultValue: (0, _lodash.isNil)(node.props[key]) ? defaultValue : node.props[key],
-        next: function next() {
-          return goNext(_next2);
-        },
-        onChange: function onChange(value) {
-          return handleChange(key, value, repositioning);
-        },
-        size: "small"
-      }, rest)));
-    });
   });
-  var PropsComps = (0, _ahooks.useCreation)(function () {
-    setActiveTabKey('attrs');
-    var _meta;
-    try {
-      _meta = require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
-    } catch (e) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
-    }
-    return renderPanelItems(_meta.props);
-  }, [activeNode]);
-  (0, _react.useEffect)(function () {
-    if (!open) {
-      nextRef.current = null;
-    }
-  }, [open]);
   (0, _react.useEffect)(function () {
     var _id = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
-      setFalse();
+      setActiveTabKey('attrs');
       if (!payload.id) {
         setActiveNode(null);
         return;
@@ -162,7 +89,7 @@ var Panel = function Panel() {
       });
     }).watch();
     return function () {
-      context.$unsubscriber(context.topics.COMPONENT_ACTIVE, _id);
+      return context.$unsubscriber(context.topics.COMPONENT_ACTIVE, _id);
     };
   }, []);
   (0, _react.useLayoutEffect)(function () {
@@ -177,9 +104,9 @@ var Panel = function Panel() {
     style: {
       fontSize: 12
     }
-  }, activeNode === null || activeNode === void 0 ? void 0 : activeNode.level.map(function (_ref2) {
-    var id = _ref2.id,
-      name = _ref2.name;
+  }, activeNode === null || activeNode === void 0 ? void 0 : activeNode.level.map(function (_ref) {
+    var id = _ref.id,
+      name = _ref.name;
     return /*#__PURE__*/_react.default.createElement(_antd.Breadcrumb.Item, {
       key: id,
       className: (0, _classnames.default)((0, _defineProperty2.default)({}, _panel.default['active-node-level'], id !== activeNode.node.id)),
@@ -204,7 +131,7 @@ var Panel = function Panel() {
     className: (0, _classnames.default)(_panel.default['lc-painter-panel-tabbar'], (0, _defineProperty2.default)({}, _panel.default.hidden, !activeNode))
   }, /*#__PURE__*/_react.default.createElement("ul", {
     className: _panel.default.headerList
-  }, (activeNode !== null && activeNode !== void 0 && activeNode.node.style ? _TAB_LIST_ : [_TAB_LIST_[0], _TAB_LIST_[2]]).map(function (_item) {
+  }, (activeNode !== null && activeNode !== void 0 && activeNode.node.css ? _TAB_LIST_ : [_TAB_LIST_[0], _TAB_LIST_[2]]).map(function (_item) {
     return /*#__PURE__*/_react.default.createElement("li", {
       key: _item.key,
       ref: activeTabKey === _item.key ? activeTabRef : null,
@@ -216,38 +143,28 @@ var Panel = function Panel() {
   })), /*#__PURE__*/_react.default.createElement("div", {
     ref: underLineRef,
     className: _panel.default.underline
-  })), activeTabKey === _TAB_LIST_[0].key && /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(_panel.default['lc-painter-panel-content'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _panel.default.hidden, !activeNode), _panel.default.showNext, open))
-  }, PropsComps, /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
-    visible: open,
-    width: 320,
-    mask: false,
-    closable: false,
-    getContainer: false,
-    destroyOnClose: true,
-    style: {
-      position: 'absolute'
-    },
-    bodyStyle: {
-      padding: 0,
-      height: '100%'
+  })), activeTabKey === _TAB_LIST_[0].key && /*#__PURE__*/_react.default.createElement(_AttrsPanel.default, {
+    meta: meta,
+    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node,
+    onChange: function onChange(field, value, repositioning) {
+      return handleChange(field, value, repositioning);
     }
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: _panel.default['next-content']
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: _panel.default['next-content-header'],
-    onClick: setFalse
-  }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
-    type: "left"
-  }), (_nextRef$current = nextRef.current) === null || _nextRef$current === void 0 ? void 0 : _nextRef$current.name, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
-    type: "close"
-  })), /*#__PURE__*/_react.default.createElement("div", {
-    className: _panel.default['next-content-body']
-  }, (_nextRef$current2 = nextRef.current) === null || _nextRef$current2 === void 0 ? void 0 : _nextRef$current2.NextComp)))), activeTabKey === _TAB_LIST_[1].key && /*#__PURE__*/_react.default.createElement(_StylePanel.default, {
-    onChange: handleStyleChange,
-    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.style
-  }), activeTabKey === _TAB_LIST_[2].key && /*#__PURE__*/_react.default.createElement("div", null, "\u9AD8\u7EA7\u9762\u677F"), /*#__PURE__*/_react.default.createElement("div", {
+  }), activeTabKey === _TAB_LIST_[1].key && /*#__PURE__*/_react.default.createElement(_StylePanel.default, {
+    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.css,
+    onChange: function onChange(_, newCss) {
+      return handleChange('css', newCss);
+    }
+  }), activeTabKey === _TAB_LIST_[2].key && /*#__PURE__*/_react.default.createElement(_AdvancePanel.default, {
+    meta: meta,
+    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node,
+    onChange: function onChange(val) {
+      return handleChange('advance', val);
+    }
+  }), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(_panel.default['lc-painter-panel-empty'], (0, _defineProperty2.default)({}, _panel.default.hidden, !!activeNode))
-  }, "\u8BF7\u5728\u5DE6\u4FA7\u753B\u5E03\u9009\u4E2D\u8282\u70B9"));
+  }, (0, _utils.formatMessage)({
+    id: "".concat(_I18N_PREFIX_, ".empty"),
+    label: '请在左侧画布选中节点'
+  })));
 };
 var _default = exports.default = Panel;

package/lib/lowcode/painter/Ribbon.js

@@ -22,7 +22,7 @@ var _DRAWER_PROPS = {
   placement: 'left',
   mask: false,
   getContainer: false,
-  zIndex: 10000,
+  zIndex: 2000,
   headerStyle: {
     borderBottom: 'none'
   },