@luck-design-biz/luckda 1.0.0-1-alpha → 1.0.0-10-alpha

package/es/lowcode/painter/services/complexPop.js

@@ -0,0 +1,21 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { stringify } from 'qs';
+import { request } from '@luck-design-biz/base/utils';
+import api from "@/services/ApiConfig";
+export var getFields = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(get) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request("".concat(api.BASE_HOST, "/logic/field/noAuthGetFields?").concat(stringify(get))));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getFields(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();

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

@@ -90,7 +90,7 @@
       .ant-form-item,
       .ant-collapse-header,
       .resizer,
-      .ant-tree-node-content-wrapper {
+      .ant-tree-node-content-wrapper, .ant-modal-footer {
         pointer-events: none;
       }
       .luck-grid-table {

package/es/lowcode/painter/style/page-vars.less

@@ -0,0 +1,25 @@
+.lc-painter-panel-page-vars-drawer {
+  :global {
+    .ant-drawer-header {
+      height: 38px;
+      padding: 8px 16px;
+      .ant-drawer-close {
+        width: 38px !important;
+        height: 38px !important;
+        line-height: 38px !important;
+      }
+    }
+    .ant-drawer-body {
+      height: calc(100% - 38px);
+      overflow-y: auto;
+      padding: 8px 0;
+    }
+
+    input,
+    button,
+    .ant-radio-wrapper,
+    .ant-select-sm {
+      font-size: 12px;
+    }
+  }
+}

package/es/lowcode/preview/index.js

@@ -19,6 +19,7 @@ var Preview = function Preview(_ref) {
     });
   }, [userId]);
   return code && currentKey ? /*#__PURE__*/React.createElement(EventBusProvider, {
+    key: code,
     runtime: RUNTIME.PREVIEW
   }, /*#__PURE__*/React.createElement(ContextProvider, {
     code: code

package/es/lowcode/view/Canvas.js

@@ -1,11 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect } from 'react';
-import { useMemoizedFn } from 'ahooks';
 import styled from 'styled-components';
-import { reduce } from 'lodash';
 import classNames from 'classnames';
-import { useContext, useGet, useStateStore } from "../engine/provider/ContextProvider";
+import { useContext, useGet } from "../engine/provider/ContextProvider";
+import { useStateStore } from "../engine/provider/ContextProvider/usePageVar";
 import PageHeader from "./lc-components/PageHeader";
 import PageContent from "./lc-components/PageContent";
 import PageFooter from "./lc-components/PageFooter";
@@ -20,7 +19,10 @@ var PageRoot = styled.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 = useGet(['props.css', 'props.advance', 'props.enableHeader', 'props.enableFooter', 'props.vars']),
     _useGet2 = _slicedToArray(_useGet, 5),
     pagerootCss = _useGet2[0],
@@ -29,49 +31,24 @@ var Canvas = function Canvas(_ref) {
     enableFooter = _useGet2[3],
     pageVars = _useGet2[4];
   var ctx = useContext();
-  var handleMount = 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 = 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 () {
-    if (pageVars) {
-      useStateStore.getState().initialize(reduce(pageVars, function (ret, val) {
-        if (val.type === 'var') {
-          ret[val.name] = val.data;
-        }
-        return ret;
-      }, {}));
-    }
+    var _advance$events2;
     var unsub = useStateStore.subscribe(function (store) {
       return store.state;
     }, function (state, prevState) {
+      var _advance$events;
       var _diff = diff(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
       });
     });
+    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();
       useStateStore.getState().clear();
-    };
-  }, [pageVars]);
-  useEffect(function () {
-    ctx.$subscriber(ctx.topics.PAGE_LOAD_MOUNT).once(handleMount).watch();
-    return function () {
-      var _advance$events3;
       ctx.doAction(advance === null || advance === void 0 || (_advance$events3 = advance.events) === null || _advance$events3 === void 0 ? void 0 : _advance$events3.onPageUnmount);
     };
   }, []);

package/es/lowcode/view/Loading.js

@@ -1,13 +1,11 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import React from 'react';
 import classNames from 'classnames';
 import styles from "./style/loading.less";
-var Loading = function Loading(_ref) {
-  var className = _ref.className,
-    style = _ref.style;
+var Loading = function Loading() {
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames(styles['lc-painter-loading'], _defineProperty({}, className, !!className)),
-    style: style
+    className: styles.masker
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles['lc-painter-loading']
   }, /*#__PURE__*/React.createElement("div", {
     className: styles['cube']
   }, /*#__PURE__*/React.createElement("div", {
@@ -22,6 +20,6 @@ var Loading = function Loading(_ref) {
     className: classNames(styles['side'], styles['side5'])
   }), /*#__PURE__*/React.createElement("div", {
     className: classNames(styles['side'], styles['side6'])
-  })));
+  }))));
 };
 export default Loading;

package/es/lowcode/view/Page.js

@@ -1,35 +1,45 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className"];
-import React, { useRef, forwardRef } from 'react';
-import { useMemoizedFn } from 'ahooks';
+import React, { forwardRef, useRef, Suspense } from 'react';
+import { useMemoizedFn, useCreation, useBoolean } from 'ahooks';
+import { Skeleton } from 'luck-design/antd';
 import classNames from 'classnames';
-import styled from 'styled-components';
 import { useRemoteSource, useContext } from "../engine/provider/ContextProvider";
+import initDS from "../engine/tools/initDS";
 import Loading from "./Loading";
 import Wrapper from "./lc-components/Wrapper";
 import Canvas from "./Canvas";
 import { LC_BUILDIN_UNIT_KEY } from "../constants";
+import useCombinedRefs from "../engine/tools/useCombinedRefs";
 import ErrorBoundary from "./errorBoundary";
 import styles from "./style/page.less";
-var Masker = styled.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__*/forwardRef(function (_ref2, ref) {
-  var className = _ref2.className,
-    props = _objectWithoutProperties(_ref2, _excluded);
-  var _ref = useRef(null);
-  var _rootRef = ref || _ref;
+var LCPage = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var className = _ref.className,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _rootRef = useCombinedRefs(ref);
+  var _dsRef = useRef();
   var _useRemoteSource = useRemoteSource(),
     loading = _useRemoteSource.loading;
-  var context = useContext();
+  var _useBoolean = useBoolean(false),
+    _useBoolean2 = _slicedToArray(_useBoolean, 2),
+    loadMount = _useBoolean2[0],
+    setTrue = _useBoolean2[1].setTrue;
+  var ctx = useContext();
+  var handlePageLoadMount = useMemoizedFn(function () {
+    _dsRef.current = initDS(ctx);
+    setTrue();
+  });
+  useCreation(function () {
+    ctx.$subscriber(ctx.topics.PAGE_LOAD_MOUNT).once(handlePageLoadMount).watch();
+  }, []);
   var getTargetDom = useMemoizedFn(function () {
     return _rootRef.current;
   });
   var handleClear = useMemoizedFn(function () {
-    context.$publisher(context.topics.COMPONENT_ACTIVE, null);
+    ctx.$publisher(ctx.topics.COMPONENT_ACTIVE, null);
   });
   return /*#__PURE__*/React.createElement(ErrorBoundary, {
     onClear: handleClear
@@ -39,6 +49,18 @@ var LCPage = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   }, /*#__PURE__*/React.createElement("div", _extends({
     ref: _rootRef,
     className: classNames(styles['lc-view-page'], _defineProperty(_defineProperty({}, styles.isloading, loading), className, !!className))
-  }, props), /*#__PURE__*/React.createElement(Canvas, null), loading ? /*#__PURE__*/React.createElement(Masker, null, /*#__PURE__*/React.createElement(Loading, null)) : null)));
+  }, props), /*#__PURE__*/React.createElement(Suspense, {
+    fallback: /*#__PURE__*/React.createElement(Skeleton, {
+      active: true,
+      title: {
+        width: '70%'
+      },
+      paragraph: {
+        rows: 9
+      }
+    })
+  }, loadMount ? /*#__PURE__*/React.createElement(Canvas, {
+    dsRef: _dsRef
+  }) : null))), loading ? /*#__PURE__*/React.createElement(Loading, null) : null);
 });
 export default LCPage;

package/es/lowcode/view/index.js

@@ -9,6 +9,7 @@ var View = function View(_ref) {
   var code = _ref.code,
     props = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React.createElement(EventBusProvider, {
+    key: code,
     runtime: RUNTIME.LIVE
   }, /*#__PURE__*/React.createElement(ContextProvider, {
     code: code

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

@@ -86,13 +86,9 @@ var LCDialog = function LCDialog(_ref) {
     }, _callee);
   })));
   var _footer = useCreation(function () {
-    var _btnGroup$todoList;
     if (!footer) return {
       footer: null
     };
-    if (!(btnGroup !== null && btnGroup !== void 0 && (_btnGroup$todoList = btnGroup.todoList) !== null && _btnGroup$todoList !== void 0 && _btnGroup$todoList.length)) return {
-      confirmLoading: loading
-    };
     return {
       footer: /*#__PURE__*/React.createElement(Footer, null, /*#__PURE__*/React.createElement(LDActions, _extends({}, btnGroup, {
         doAction: function doAction(action) {
@@ -155,7 +151,6 @@ var LCDialog = function LCDialog(_ref) {
   }, /*#__PURE__*/React.createElement(Modal, _extends({
     title: _title,
     visible: open,
-    getContainer: getContainer,
     width: width,
     mask: mask,
     maskStyle: maskStyle,
@@ -164,7 +159,10 @@ var LCDialog = function LCDialog(_ref) {
       overflowY: 'auto',
       marginTop: 0
     },
-    wrapClassName: classNames(styles['lc-component-dialog-wrapper'], _defineProperty({}, wrapClassName, !!wrapClassName))
+    wrapClassName: classNames(styles['lc-component-dialog-wrapper'], _defineProperty({}, wrapClassName, !!wrapClassName)),
+    getContainer: getContainer || function () {
+      return document.getElementById('root') || document.getElementById('react-content') || document.body;
+    }
   }, _footer, {
     onOk: handleOk,
     onCancel: function onCancel() {

package/es/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/es/lowcode/view/lc-components/Form/index.js

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["advance", "state"];
+var _excluded = ["advance", "state", "render"];
 import React, { useRef, forwardRef, Fragment, useImperativeHandle } from 'react';
 import { useMemoizedFn, useCreation, useUnmount } from 'ahooks';
 import classNames from 'classnames';
@@ -228,9 +228,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     return wrapperRef.current;
   });
   var handleDefaultDataSourceFormat = useMemoizedFn(function (defaultDataSourceFormat, defaultValues) {
-    if (isNil(defaultDataSourceFormat)) return function () {
-      return defaultValues;
-    };
+    if (isNil(defaultDataSourceFormat)) return function () {};
     return executeCode(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
   var handleDataSourceFormat = useMemoizedFn(function (type, dataSourceFormat, dataSetKey, _ref6) {
@@ -323,6 +321,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     return reduce(fields, function (result, setting) {
       var advance = setting.advance,
         _state = setting.state,
+        render = setting.render,
         rest = _objectWithoutProperties(setting, _excluded);
       var isShow = true;
       if (ctx.runtime !== RUNTIME.DESIGN && _state) {
@@ -355,6 +354,14 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
         };
       }
       result.push(_objectSpread(_objectSpread({}, _props), {}, {
+        render: render ? function (v, d, i, p) {
+          return /*#__PURE__*/React.createElement(RuntimeComp, {
+            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 ? reduce(advance.events, function (result, value, key) {
           //处理事件
           result[key] = function () {

package/es/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/es/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/es/lowcode/view/lc-components/Table/index.js

@@ -1,8 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+var _excluded = ["render"];
 import React, { useRef, useImperativeHandle, forwardRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useMemoizedFn, useCreation, useRequest, useUnmount } from 'ahooks';
@@ -14,6 +16,7 @@ import Wrapper from "../Wrapper";
 import { LdGrid, LDActions } from "../../../../index";
 import TopFilter from "./components/TopFilter";
 import { TopUpload, TopExport } from "./components/TopImex";
+import RuntimeComp from "../JSX/RuntimeComp";
 import { omitBadProps, executeCode, getLDMetaAttr } from "../../../engine/tools/helper";
 import useCombinedRefs from "../../../engine/tools/useCombinedRefs";
 import defaultMeta from "../../../engine/meta/table.props.default.json";
@@ -380,8 +383,19 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     if (!isNil(columnsRewrite) || !isNil(fields)) {
       temp.columnsRewrite = function (cols) {
         var colsMap = keyBy(cols, 'field');
-        var _cols = isNil(fields) ? cols : fields.map(function (_field) {
-          return _objectSpread(_objectSpread({}, colsMap[_field.field]), _field);
+        var _cols = isNil(fields) ? cols : fields.map(function (_ref4) {
+          var render = _ref4.render,
+            _field = _objectWithoutProperties(_ref4, _excluded);
+          return _objectSpread(_objectSpread({}, colsMap[_field.field]), {}, {
+            render: render ? function (v, d, i, p) {
+              return /*#__PURE__*/React.createElement(RuntimeComp, {
+                value: v,
+                data: d,
+                rowIndex: i,
+                params: p
+              }, render.replace(/(function\s*\w*\s*)\([^)]*\)(\s*{)/, '$1()$2'));
+            } : null
+          }, _field);
         });
         return isNil(columnsRewrite) ? _cols : executeCode(ctx, columnsRewrite, ['columns'], _cols);
       };
@@ -524,7 +538,7 @@ var LCTable = /*#__PURE__*/forwardRef(function (_ref, ref) {
     });
   });
   var _afterQuery = 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/es/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/es/utils/form.js

@@ -12,7 +12,7 @@ var _excluded = ["comName", "property"],
   _excluded9 = ["type", "name"];
 import React from 'react';
 import moment from 'moment';
-import { capitalize, merge, transform, isArray, omit, isNil, clone } from 'lodash';
+import { capitalize, merge, transform, isArray, omit, isNil, clone, cloneDeep } from 'lodash';
 import api from "@/services/ApiConfig";
 import { defaultComName, translator, splitStrToObj, formatCustomProps } from "../helper/form";
 import { getColumnRender } from "./grid";
@@ -31,7 +31,7 @@ export function getFormItem() {
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
-  if (property === 'sint' || property === 'number') props.opt_decimal = 0;
+  if (property === 'sint' || property === 'number' || property === 'long') props.opt_decimal = 0;
   var comType = comName || defaultComName[property];
   var _translator = translator(props),
     name = _translator.name,
@@ -65,7 +65,7 @@ export function getFormItem() {
 export var 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 = cloneDeep(values);
   var data = transform(propsList, function (result, n) {
     var _ref2 = n || {},
       comName = _ref2.comName,
@@ -125,7 +125,7 @@ export var formItemDataFormat = function formItemDataFormat() {
       default:
         if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }
-    omitValues = omit(values, [name, "".concat(name, "_virtual")]);
+    omitValues = omit(omitValues, [name, "".concat(name, "_virtual")]);
   }, {});
   return _objectSpread(_objectSpread({}, omitValues), data);
 };

package/es/utils/grid.js

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