@luck-design-biz/luckda 1.0.0-5-alpha → 1.0.0-7-alpha

package/lib/lowcode/preview/index.js

@@ -27,6 +27,7 @@ var Preview = function Preview(_ref) {
     });
   }, [userId]);
   return code && currentKey ? /*#__PURE__*/_react.default.createElement(_EventBusProvider.default, {
+    key: code,
     runtime: _index.RUNTIME.PREVIEW
   }, /*#__PURE__*/_react.default.createElement(_ContextProvider.default, {
     code: code

package/lib/lowcode/view/Canvas.js

@@ -9,11 +9,10 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _ahooks = require("ahooks");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
-var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ContextProvider = require("../engine/provider/ContextProvider");
+var _usePageVar = require("../engine/provider/ContextProvider/usePageVar");
 var _PageHeader = _interopRequireDefault(require("./lc-components/PageHeader"));
 var _PageContent = _interopRequireDefault(require("./lc-components/PageContent"));
 var _PageFooter = _interopRequireDefault(require("./lc-components/PageFooter"));
@@ -28,7 +27,10 @@ var PageRoot = _styledComponents.default.div.withConfig({
   return props.$css;
 });
 var Canvas = function Canvas(_ref) {
-  var className = _ref.className;
+  var _dsRef$current;
+  var className = _ref.className,
+    dsRef = _ref.dsRef;
+  (_dsRef$current = dsRef.current) === null || _dsRef$current === void 0 || _dsRef$current.read();
   var _useGet = (0, _ContextProvider.useGet)(['props.css', 'props.advance', 'props.enableHeader', 'props.enableFooter', 'props.vars']),
     _useGet2 = (0, _slicedToArray2.default)(_useGet, 5),
     pagerootCss = _useGet2[0],
@@ -37,49 +39,24 @@ var Canvas = function Canvas(_ref) {
     enableFooter = _useGet2[3],
     pageVars = _useGet2[4];
   var ctx = (0, _ContextProvider.useContext)();
-  var handleMount = (0, _ahooks.useMemoizedFn)(function () {
-    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 = (0, _ahooks.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
-    });
-  });
   (0, _react.useEffect)(function () {
-    if (pageVars) {
-      _ContextProvider.useStateStore.getState().initialize((0, _lodash.reduce)(pageVars, function (ret, val) {
-        if (val.type === 'var') {
-          ret[val.name] = val.data;
-        }
-        return ret;
-      }, {}));
-    }
-    var unsub = _ContextProvider.useStateStore.subscribe(function (store) {
+    var _advance$events2;
+    var unsub = _usePageVar.useStateStore.subscribe(function (store) {
       return store.state;
     }, function (state, prevState) {
+      var _advance$events;
       var _diff = (0, _diff2.default)(prevState, state);
-      handleStateChanged({
+      ctx.doAction(advance === null || advance === void 0 || (_advance$events = advance.events) === null || _advance$events === void 0 ? void 0 : _advance$events.onStateChanged, {
         state: state,
         prevState: prevState,
         diff: _diff
       });
     });
-    return function () {
-      unsub();
-      _ContextProvider.useStateStore.getState().clear();
-    };
-  }, [pageVars]);
-  (0, _react.useEffect)(function () {
-    ctx.$subscriber(ctx.topics.PAGE_LOAD_MOUNT).once(handleMount).watch();
+    ctx.doAction(advance === null || advance === void 0 || (_advance$events2 = advance.events) === null || _advance$events2 === void 0 ? void 0 : _advance$events2.onPageMount);
     return function () {
       var _advance$events3;
+      unsub();
+      _usePageVar.useStateStore.getState().clear();
       ctx.doAction(advance === null || advance === void 0 || (_advance$events3 = advance.events) === null || _advance$events3 === void 0 ? void 0 : _advance$events3.onPageUnmount);
     };
   }, []);

package/lib/lowcode/view/Loading.js

@@ -5,16 +5,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _loading = _interopRequireDefault(require("./style/loading.less"));
-var Loading = function Loading(_ref) {
-  var className = _ref.className,
-    style = _ref.style;
+var Loading = function Loading() {
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(_loading.default['lc-painter-loading'], (0, _defineProperty2.default)({}, className, !!className)),
-    style: style
+    className: _loading.default.masker
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: _loading.default['lc-painter-loading']
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: _loading.default['cube']
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -29,6 +27,6 @@ var Loading = function Loading(_ref) {
     className: (0, _classnames.default)(_loading.default['side'], _loading.default['side5'])
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(_loading.default['side'], _loading.default['side6'])
-  })));
+  }))));
 };
 var _default = exports.default = Loading;

package/lib/lowcode/view/Page.js

@@ -8,36 +8,46 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
+var _antd = require("luck-design/antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _ContextProvider = require("../engine/provider/ContextProvider");
+var _initDS = _interopRequireDefault(require("../engine/tools/initDS"));
 var _Loading = _interopRequireDefault(require("./Loading"));
 var _Wrapper = _interopRequireDefault(require("./lc-components/Wrapper"));
 var _Canvas = _interopRequireDefault(require("./Canvas"));
 var _constants = require("../constants");
+var _useCombinedRefs = _interopRequireDefault(require("../engine/tools/useCombinedRefs"));
 var _errorBoundary = _interopRequireDefault(require("./errorBoundary"));
 var _page = _interopRequireDefault(require("./style/page.less"));
 var _excluded = ["className"];
-var Masker = _styledComponents.default.div.withConfig({
-  displayName: "Masker",
-  componentId: "luckda-6530__sc-yswm45-0"
-})(["position:absolute;top:0;left:0;width:100%;height:100%;z-index:2400;background:rgba(0,0,0,0.45);cursor:none;"]);
-var LCPage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
-  var className = _ref2.className,
-    props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
-  var _ref = (0, _react.useRef)(null);
-  var _rootRef = ref || _ref;
+var LCPage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var className = _ref.className,
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var _rootRef = (0, _useCombinedRefs.default)(ref);
+  var _dsRef = (0, _react.useRef)();
   var _useRemoteSource = (0, _ContextProvider.useRemoteSource)(),
     loading = _useRemoteSource.loading;
-  var context = (0, _ContextProvider.useContext)();
+  var _useBoolean = (0, _ahooks.useBoolean)(false),
+    _useBoolean2 = (0, _slicedToArray2.default)(_useBoolean, 2),
+    loadMount = _useBoolean2[0],
+    setTrue = _useBoolean2[1].setTrue;
+  var ctx = (0, _ContextProvider.useContext)();
+  var handlePageLoadMount = (0, _ahooks.useMemoizedFn)(function () {
+    _dsRef.current = (0, _initDS.default)(ctx);
+    setTrue();
+  });
+  (0, _ahooks.useCreation)(function () {
+    ctx.$subscriber(ctx.topics.PAGE_LOAD_MOUNT).once(handlePageLoadMount).watch();
+  }, []);
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     return _rootRef.current;
   });
   var handleClear = (0, _ahooks.useMemoizedFn)(function () {
-    context.$publisher(context.topics.COMPONENT_ACTIVE, null);
+    ctx.$publisher(ctx.topics.COMPONENT_ACTIVE, null);
   });
   return /*#__PURE__*/_react.default.createElement(_errorBoundary.default, {
     onClear: handleClear
@@ -47,6 +57,18 @@ var LCPage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   }, /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: _rootRef,
     className: (0, _classnames.default)(_page.default['lc-view-page'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _page.default.isloading, loading), className, !!className))
-  }, props), /*#__PURE__*/_react.default.createElement(_Canvas.default, null), loading ? /*#__PURE__*/_react.default.createElement(Masker, null, /*#__PURE__*/_react.default.createElement(_Loading.default, null)) : null)));
+  }, props), /*#__PURE__*/_react.default.createElement(_react.Suspense, {
+    fallback: /*#__PURE__*/_react.default.createElement(_antd.Skeleton, {
+      active: true,
+      title: {
+        width: '70%'
+      },
+      paragraph: {
+        rows: 9
+      }
+    })
+  }, loadMount ? /*#__PURE__*/_react.default.createElement(_Canvas.default, {
+    dsRef: _dsRef
+  }) : null))), loading ? /*#__PURE__*/_react.default.createElement(_Loading.default, null) : null);
 });
 var _default = exports.default = LCPage;

package/lib/lowcode/view/index.js

@@ -16,6 +16,7 @@ var View = function View(_ref) {
   var code = _ref.code,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement(_EventBusProvider.default, {
+    key: code,
     runtime: _index.RUNTIME.LIVE
   }, /*#__PURE__*/_react.default.createElement(_ContextProvider.default, {
     code: code

package/lib/lowcode/view/lc-components/FieldComplex/meta.json

@@ -18,6 +18,13 @@
       "type": "switch",
       "default": true
     },
+    {
+      "key": "showPop",
+      "name": "辅助选择",
+      "type": "_ComplexPop",
+      "wrapper": "hidden",
+      "default": true
+    },
     {
       "key": "generalSetting",
       "name": "通用配置",

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

@@ -28,7 +28,7 @@ var _useCombinedRefs = _interopRequireDefault(require("../../../engine/tools/use
 var _formPropsDefault = _interopRequireDefault(require("../../../engine/meta/form.props.default.json"));
 var _constants = require("../../../constants");
 var _index2 = _interopRequireDefault(require("./index.less"));
-var _excluded = ["advance", "state"];
+var _excluded = ["advance", "state", "render"];
 var _I18N_PREFIX_ = 'lc.form.validator';
 var Header = function Header(_ref2) {
   var _ref2$header = _ref2.header,
@@ -236,9 +236,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     return wrapperRef.current;
   });
   var handleDefaultDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (defaultDataSourceFormat, defaultValues) {
-    if ((0, _lodash.isNil)(defaultDataSourceFormat)) return function () {
-      return defaultValues;
-    };
+    if ((0, _lodash.isNil)(defaultDataSourceFormat)) return function () {};
     return (0, _helper.executeCode)(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
   var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (type, dataSourceFormat, dataSetKey, _ref6) {
@@ -331,6 +329,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     return (0, _lodash.reduce)(fields, function (result, setting) {
       var advance = setting.advance,
         _state = setting.state,
+        render = setting.render,
         rest = (0, _objectWithoutProperties2.default)(setting, _excluded);
       var isShow = true;
       if (ctx.runtime !== _constants.RUNTIME.DESIGN && _state) {
@@ -363,6 +362,14 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
         };
       }
       result.push((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+        render: render ? function (v, d, i, p) {
+          return /*#__PURE__*/_react.default.createElement(_RuntimeComp.default, {
+            value: v,
+            data: d,
+            rowIndex: i,
+            params: p
+          }, render.replace(/(function\s*\w*\s*)\([^)]*\)(\s*{)/, '$1()$2'));
+        } : null,
         events: advance !== null && advance !== void 0 && advance.events ? (0, _lodash.reduce)(advance.events, function (result, value, key) {
           //处理事件
           result[key] = function () {

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

@@ -244,7 +244,7 @@
                 "name": "格式化默认数据",
                 "desc": "格式化新增时默认数据",
                 "type": "_JSEditor",
-                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return defaultValues; \n}",
+                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return {}; \n}",
                 "mustConfirm": true,
                 "wrapper": "collapse",
                 "wrapperProps": { "suppressIcon": true }
@@ -335,7 +335,7 @@
                 "name": "格式化默认数据",
                 "desc": "格式化新增时默认数据",
                 "type": "_JSEditor",
-                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return defaultValues; \n}",
+                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return {}; \n}",
                 "mustConfirm": true,
                 "wrapper": "collapse",
                 "wrapperProps": { "suppressIcon": true }
@@ -446,7 +446,7 @@
                 "name": "格式化默认数据",
                 "desc": "格式化新增时默认数据",
                 "type": "_JSEditor",
-                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return defaultValues; \n}",
+                "defaultCode": "function defaultDataSourceFormat(defaultValues) { \n return {}; \n}",
                 "mustConfirm": true,
                 "wrapper": "collapse",
                 "wrapperProps": { "suppressIcon": true }

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

@@ -27,6 +27,12 @@
           "default": "false"
         }
       ]
+    },
+    {
+      "key": "vars",
+      "name": "页面数据源",
+      "type": "_PageVars",
+      "wrapper": "collapse"
     }
   ],
   "css": "background-color: transparent;",

package/lib/lowcode/view/lc-components/Table/index.js

@@ -1,13 +1,14 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -22,11 +23,13 @@ var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _index = require("../../../../index");
 var _TopFilter = _interopRequireDefault(require("./components/TopFilter"));
 var _TopImex = require("./components/TopImex");
+var _RuntimeComp = _interopRequireDefault(require("../JSX/RuntimeComp"));
 var _helper = require("../../../engine/tools/helper");
 var _useCombinedRefs = _interopRequireDefault(require("../../../engine/tools/useCombinedRefs"));
 var _tablePropsDefault = _interopRequireDefault(require("../../../engine/meta/table.props.default.json"));
 var _constants = require("../../../constants");
 var _apiUrl2 = require("../../../constants/api-url");
+var _excluded = ["render"];
 var moduleCode = (0, _helper.getLDMetaAttr)('moduleCode');
 var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var id = _ref.id,
@@ -388,8 +391,19 @@ var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     if (!(0, _lodash.isNil)(columnsRewrite) || !(0, _lodash.isNil)(fields)) {
       temp.columnsRewrite = function (cols) {
         var colsMap = (0, _lodash.keyBy)(cols, 'field');
-        var _cols = (0, _lodash.isNil)(fields) ? cols : fields.map(function (_field) {
-          return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colsMap[_field.field]), _field);
+        var _cols = (0, _lodash.isNil)(fields) ? cols : fields.map(function (_ref4) {
+          var render = _ref4.render,
+            _field = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
+          return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colsMap[_field.field]), {}, {
+            render: render ? function (v, d, i, p) {
+              return /*#__PURE__*/_react.default.createElement(_RuntimeComp.default, {
+                value: v,
+                data: d,
+                rowIndex: i,
+                params: p
+              }, render.replace(/(function\s*\w*\s*)\([^)]*\)(\s*{)/, '$1()$2'));
+            } : null
+          }, _field);
         });
         return (0, _lodash.isNil)(columnsRewrite) ? _cols : (0, _helper.executeCode)(ctx, columnsRewrite, ['columns'], _cols);
       };
@@ -532,7 +546,7 @@ var LCTable = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     });
   });
   var _afterQuery = (0, _ahooks.useMemoizedFn)(function (res) {
-    if (res.code === 1 && !res.list.includes(instanceRef.current.expectRowKey)) {
+    if (res.code === 1 && instanceRef.current && !res.list.includes(instanceRef.current.expectRowKey)) {
       instanceRef.current.expectRowKey = res.list[0];
       ctx.doAction(advance.events.onExpectRowChanged, {
         data: res.detail[res.list[0]]

package/lib/lowcode/view/style/loading.less

@@ -1,3 +1,17 @@
+.masker {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+  background-color: transparent;
+  backdrop-filter: blur(6px);
+  cursor: none;
+}
+*:has(> .masker) {
+  position: relative;
+}
 .lc-painter-loading {
   position: absolute;
   height: 64px;

package/lib/utils/form.js

@@ -73,7 +73,7 @@ function getFormItem() {
 var formItemDataFormat = exports.formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var omitValues = {};
+  var omitValues = (0, _lodash.cloneDeep)(values);
   var data = (0, _lodash.transform)(propsList, function (result, n) {
     var _ref2 = n || {},
       comName = _ref2.comName,
@@ -133,7 +133,7 @@ var formItemDataFormat = exports.formItemDataFormat = function formItemDataForma
       default:
         if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }
-    omitValues = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
+    omitValues = (0, _lodash.omit)(omitValues, [name, "".concat(name, "_virtual")]);
   }, {});
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, omitValues), data);
 };

package/lib/utils/grid.js

@@ -46,7 +46,7 @@ function getColumnRender(name, type) {
       break;
     case 'year':
       render = function render(text) {
-        return text;
+        return _moment.default.isMoment(text) ? text.format('YYYY') : text;
       };
       break;
     case 'user':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "1.0.0-5-alpha",
+  "version": "1.0.0-7-alpha",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",