@luck-design-biz/luckda 0.0.25-9 → 0.0.25-af-2

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

@@ -7,20 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.executeCode = executeCode;
 exports.getCtx = getCtx;
 exports.getFuncBody = getFuncBody;
-exports.getLDMetaAttr = getLDMetaAttr;
-exports.isColor = isColor;
 exports.isPromise = isPromise;
 exports.listReducer = listReducer;
 exports.omitBadProps = omitBadProps;
-exports.parseCSS = parseCSS;
-exports.setLDMetaAttrs = setLDMetaAttrs;
 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"));
 var _lodash = require("lodash");
-var _postcss = _interopRequireDefault(require("postcss"));
-var _constants = require("../../constants");
 function isPromise(value) {
   return !!value && (0, _typeof2.default)(value) === 'object' && typeof value.then === 'function';
 }
@@ -30,91 +24,69 @@ function omitBadProps(props) {
 }
 function listReducer(state, action) {
   switch (action.type) {
-    case 'insert':
+    case 'add':
       {
         var _action$callback;
-        var newState = (0, _toConsumableArray2.default)(state);
-        newState.splice(action.payload.index + 1, 0, action.payload.data);
+        var newState = [].concat((0, _toConsumableArray2.default)(state), [action.payload]);
         (_action$callback = action.callback) === null || _action$callback === void 0 || _action$callback.call(action, newState);
         return newState;
       }
-    case 'add':
+    case 'delete':
       {
         var _action$callback2;
-        var _newState = [].concat((0, _toConsumableArray2.default)(state), [action.payload]);
+        var _newState = state.filter(function (item) {
+          return item.id !== action.payload;
+        });
         (_action$callback2 = action.callback) === null || _action$callback2 === void 0 || _action$callback2.call(action, _newState);
         return _newState;
       }
-    case 'delete':
+    case 'edit':
       {
         var _action$callback3;
-        var _newState2 = state.filter(function (item) {
-          return item.id !== action.payload;
+        var _newState2 = state.map(function (item) {
+          return item.id === action.payload.id ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), action.payload.data) : item;
         });
         (_action$callback3 = action.callback) === null || _action$callback3 === void 0 || _action$callback3.call(action, _newState2);
         return _newState2;
       }
-    case 'edit':
+    case 'active':
       {
         var _action$callback4;
         var _newState3 = state.map(function (item) {
+          item.active = false;
           return item.id === action.payload.id ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), action.payload.data) : item;
         });
         (_action$callback4 = action.callback) === null || _action$callback4 === void 0 || _action$callback4.call(action, _newState3);
         return _newState3;
       }
-    case 'batchEdit':
+    case 'new':
       {
         var _action$callback5;
-        var _newState4 = state.map(function (item) {
-          var newItem = action.payload.items.find(function (_id) {
-            return _id === item.id;
-          });
-          if (newItem) {
-            return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), action.payload.data);
-          }
-          return item;
-        });
+        var _newState4 = (0, _toConsumableArray2.default)(action.payload);
         (_action$callback5 = action.callback) === null || _action$callback5 === void 0 || _action$callback5.call(action, _newState4);
         return _newState4;
       }
-    case 'active':
-      {
-        var _action$callback6;
-        var _newState5 = state.map(function (item) {
-          item.active = false;
-          return item.id === action.payload.id ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), action.payload.data) : item;
-        });
-        (_action$callback6 = action.callback) === null || _action$callback6 === void 0 || _action$callback6.call(action, _newState5);
-        return _newState5;
-      }
-    case 'init':
-    case 'new':
-      {
-        var _action$callback7;
-        (_action$callback7 = action.callback) === null || _action$callback7 === void 0 || _action$callback7.call(action, action.payload);
-        return action.payload;
-      }
     case 'sort':
       {
-        var _action$callback8;
+        var _action$callback6;
         var sortItems = action.payload;
         var newItems = state.sort(function (a, b) {
           var indexA = sortItems.indexOf(a.id);
           var indexB = sortItems.indexOf(b.id);
           return indexA - indexB;
         });
-        var _newState6 = (0, _toConsumableArray2.default)(newItems);
-        (_action$callback8 = action.callback) === null || _action$callback8 === void 0 || _action$callback8.call(action, _newState6);
-        return _newState6;
+        (_action$callback6 = action.callback) === null || _action$callback6 === void 0 || _action$callback6.call(action, _newState5);
+        var _newState5 = (0, _toConsumableArray2.default)(newItems);
+        return _newState5;
       }
     default:
       throw new Error();
   }
 }
 function getCtx(context) {
-  return context;
-  // return omitBy(context, (_, key) => startsWith(key, '_'));
+  return (0, _lodash.omitBy)(context, function (_, key) {
+    return (0, _lodash.startsWith)(key, '_');
+  });
 }
 function getFuncBody(funcCode) {
   var regex = /{([\s\S]*?)}(?![\s\S]*})/;
@@ -137,52 +109,4 @@ function executeCode(context, code, argsName) {
   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]));
-}
-function parseCSS(cssString) {
-  // 创建一个空对象来存储解析后的样式
-  var parsedStyles = {};
-  if (cssString) {
-    try {
-      // 解析CSS字符串
-      var ast = _postcss.default.parse(cssString);
-
-      // 遍历AST中的每个规则
-      ast.walkDecls(function (decl) {
-        // 将每个声明的属性和值存储在对象中
-        parsedStyles[decl.prop] = decl.value;
-      });
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  // 返回包含所有样式的对象
-  return parsedStyles;
-}
-;
-function isColor(str) {
-  var hexRegex = /^#(?:[A-Fa-f0-9]{3,4}){1,2}$/;
-  var rgbaRegex = /^rgba?\(\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})(,\s*(0|1|0?\.\d+))?\s*\)$/;
-  return hexRegex.test(str) || rgbaRegex.test(str);
-}
-function setLDMetaAttrs(data) {
-  var meta = document.querySelector("meta[name=\"".concat(_constants.META_TAG_NAME, "\"]"));
-  if (!meta) {
-    meta = document.createElement('meta');
-  }
-  meta.name = _constants.META_TAG_NAME;
-  meta.content = new URLSearchParams(data).toString().replaceAll('&', ',');
-  document.head.appendChild(meta);
-}
-function getLDMetaAttr(name) {
-  if ((0, _lodash.isNil)(name)) return void 0;
-  var meta = document.querySelector("meta[name=\"".concat(_constants.META_TAG_NAME, "\"]"));
-  var params = new URLSearchParams(meta.content.replaceAll(',', '&'));
-  if ((0, _lodash.isArray)(name)) {
-    return name.map(function (n) {
-      return params.get(n);
-    });
-  }
-  return params.get(name);
-}
-;
+}

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 _useState = (0, _react.useState)(initialState),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    state = _useState2[0],
-    setState = _useState2[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) {
@@ -20,12 +21,12 @@ var usePromiseState = function usePromiseState(initialState) {
       setState(_state);
     });
   }, []);
-  (0, _ahooks.useUpdateLayoutEffect)(function () {
+  (0, _ahooks.useDeepCompareEffect)(function () {
     if (promiseRef.current) {
       promiseRef.current(state);
       promiseRef.current = null;
     }
   }, [state]);
-  return [state, setStatePromise];
+  return [state, setStatePromise, resetState];
 };
 var _default = exports.default = usePromiseState;

package/lib/lowcode/index.js

@@ -10,12 +10,6 @@ Object.defineProperty(exports, "Painter", {
     return _painter.default;
   }
 });
-Object.defineProperty(exports, "Preview", {
-  enumerable: true,
-  get: function get() {
-    return _preview.default;
-  }
-});
 Object.defineProperty(exports, "View", {
   enumerable: true,
   get: function get() {
@@ -25,7 +19,6 @@ Object.defineProperty(exports, "View", {
 exports.default = launcher;
 var _painter = _interopRequireDefault(require("./painter"));
 var _view = _interopRequireDefault(require("./view"));
-var _preview = _interopRequireDefault(require("./preview"));
 // export * as dataProcess  from './engine/tools/dataProcess';
 
 function launcher() {}

package/lib/lowcode/painter/Components.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -14,10 +13,8 @@ var _antd = require("luck-design/antd");
 var _ahooks = require("ahooks");
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../engine/provider/ContextProvider");
-var _core = require("@dnd-kit/core");
 var _components = _interopRequireDefault(require("./style/components.less"));
 var _componentsList = _interopRequireDefault(require("../engine/meta/components-list.json"));
-var _DragDropContext = require("./components/DragDrop/DragDropContext");
 var TabPane = _antd.Tabs.TabPane;
 var Search = _antd.Input.Search;
 var BaseCom = function BaseCom(_ref) {
@@ -39,7 +36,7 @@ var BaseCom = function BaseCom(_ref) {
     }).filter(function (group) {
       return group.components.length > 0;
     });
-  }, [searchTerm]);
+  }, [_componentsList.default]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: _components.default['components-search']
   }, /*#__PURE__*/_react.default.createElement(Search, {
@@ -55,53 +52,30 @@ var BaseCom = function BaseCom(_ref) {
       key: group.group,
       className: _components.default['components-wrapper']
     }, /*#__PURE__*/_react.default.createElement("h3", null, group.groupName), group.components.map(function (item) {
-      return /*#__PURE__*/_react.default.createElement(CompItem, {
+      return /*#__PURE__*/_react.default.createElement("div", {
         key: item.component,
-        item: item,
-        onComponentClick: onComponentClick
-      });
+        className: _components.default['components-item'],
+        onClick: function onClick() {
+          return onComponentClick(item);
+        }
+      }, /*#__PURE__*/_react.default.createElement("div", {
+        className: _components.default['icon-wrapper']
+      }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+        type: item.icon || 'home'
+      })), /*#__PURE__*/_react.default.createElement("div", {
+        className: _components.default['text-content']
+      }, /*#__PURE__*/_react.default.createElement("span", null, item.name)));
     }));
   })));
 };
-var CompItem = function CompItem(_ref2) {
-  var item = _ref2.item,
-    onComponentClick = _ref2.onComponentClick;
-  // console.log('CompItem', item.component);
-  var _useDraggable = (0, _core.useDraggable)({
-      id: 'comlist-' + item.component,
-      data: {
-        component: item,
-        action: _DragDropContext.Action.ADD
-      }
-    }),
-    attributes = _useDraggable.attributes,
-    listeners = _useDraggable.listeners,
-    transform = _useDraggable.transform,
-    setNodeRef = _useDraggable.setNodeRef;
-  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
-    ref: setNodeRef
-  }, listeners, attributes, {
-    key: item.component,
-    className: _components.default['components-item'],
-    onClick: function onClick() {
-      return onComponentClick(item);
-    }
-  }), /*#__PURE__*/_react.default.createElement("div", {
-    className: _components.default['icon-wrapper']
-  }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
-    type: item.icon || 'home'
-  })), /*#__PURE__*/_react.default.createElement("div", {
-    className: _components.default['text-content']
-  }, /*#__PURE__*/_react.default.createElement("span", null, item.name)));
-};
 
-/**
- * 组件清单
+/**
+ * 组件清单
  */
-var Components = function Components(_ref3) {
-  var _ref3$dataset = _ref3.dataset,
-    dataset = _ref3$dataset === void 0 ? 'test' : _ref3$dataset;
-  var context = (0, _ContextProvider.useContext)();
+var Components = function Components(_ref2) {
+  var _ref2$dataset = _ref2.dataset,
+    dataset = _ref2$dataset === void 0 ? 'test' : _ref2$dataset;
+  var context = (0, _ContextProvider.useLDContext)();
   var onComponentClick = (0, _ahooks.useMemoizedFn)(function (data) {
     context.$publisher(context.topics.COMPONENT_SETTING_CLICK, {
       data: data
@@ -129,10 +103,10 @@ var Components = function Components(_ref3) {
     onComponentClick: onComponentClick
   })), /*#__PURE__*/_react.default.createElement(TabPane, {
     tab: (0, _utils.formatMessage)({
-      id: 'ccm.dev.page.set.components.custom',
-      label: '自定义组件'
+      id: 'ccm.dev.page.set.components.dataset',
+      label: '数据集字段'
     }),
     key: "dataset"
-  }, "\u656C\u8BF7\u671F\u5F85")));
+  })));
 };
 var _default = exports.default = Components;

package/lib/lowcode/painter/Design.js

@@ -12,8 +12,6 @@ var _umi = require("umi");
 var _ahooks = require("ahooks");
 var _moment = _interopRequireDefault(require("moment"));
 var _antd = require("luck-design/antd");
-var _utils = require("@luck-design-biz/base/utils");
-var _ContextProvider = require("../engine/provider/ContextProvider");
 var _DesignToolbar = _interopRequireDefault(require("./DesignToolbar"));
 var _DesignOperator = _interopRequireDefault(require("./DesignOperator"));
 var _Page = _interopRequireDefault(require("../view/Page"));
@@ -21,7 +19,6 @@ var _design = _interopRequireDefault(require("./style/design.less"));
 var Design = function Design() {
   var _localeInfo$locale;
   var simulatorRef = (0, _react.useRef)(null);
-  var remoteSource = (0, _ContextProvider.useRemoteSource)();
   var _useState = (0, _react.useState)(function () {
       return (0, _umi.getLocale)();
     }),
@@ -34,35 +31,6 @@ var Design = function Design() {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     intl = _useState4[0],
     setIntl = _useState4[1];
-  var unblock = (0, _ahooks.useMemoizedFn)(function () {
-    if (remoteSource.backLength > 0) return confirm("".concat((0, _utils.formatMessage)({
-      id: 'app.base.operate.comfire.leave',
-      label: '离开当前页面？'
-    }), "\n").concat((0, _utils.formatMessage)({
-      id: 'app.base.operate.comfire.message.leave',
-      label: '系统可能不会保存您所做的更改。'
-    })));
-    return true;
-  });
-  var handleBeforeUnload = (0, _ahooks.useMemoizedFn)(function (event) {
-    if (remoteSource.backLength > 0) {
-      event.preventDefault();
-      event.returnValue = null;
-      return null;
-    }
-  });
-  (0, _react.useEffect)(function () {
-    window.addEventListener('beforeunload', handleBeforeUnload);
-    _umi.history.block(function () {
-      return unblock();
-    });
-    return function () {
-      window.removeEventListener('beforeunload', handleBeforeUnload);
-      _umi.history.block(function () {
-        return true;
-      });
-    };
-  }, []);
   var handleLangChange = (0, _ahooks.useMemoizedFn)(function (_locale) {
     if (_moment.default !== null && _moment.default !== void 0 && _moment.default.locale) {
       var _localeInfo$_locale;
@@ -78,15 +46,15 @@ var Design = function Design() {
     onLangChange: handleLangChange
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: _design.default['lc-painter-design-workspace']
-  }, /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, {
+  }, /*#__PURE__*/_react.default.createElement(_DesignOperator.default, {
+    target: simulatorRef
+  }), /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, {
     locale: ((_localeInfo$locale = _umi.localeInfo[locale]) === null || _localeInfo$locale === void 0 ? void 0 : _localeInfo$locale.antd) || {}
   }, /*#__PURE__*/_react.default.createElement(_umi.RawIntlProvider, {
     value: intl
   }, /*#__PURE__*/_react.default.createElement(_Page.default, {
     ref: simulatorRef,
     className: _design.default['lc-painter-design-simulator']
-  }, /*#__PURE__*/_react.default.createElement(_DesignOperator.default, {
-    canvas: simulatorRef
-  }))))));
+  })))));
 };
 var _default = exports.default = Design;