@luck-design-biz/luckda 1.0.1-4 → 1.0.1-5

package/es/components/LdFormList/index.js

@@ -6,11 +6,11 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading", "showConfigBtn"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading", "showConfigBtn", "affixBarZIndex"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
-import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState, useEffect } from 'react';
+import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
 import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
 import { isArray, sortBy, mapValues, reduce, includes } from 'lodash';
@@ -61,6 +61,7 @@ var LdFormList = function LdFormList(_ref) {
     afterSubmitLoading = _ref.afterSubmitLoading,
     _ref$showConfigBtn = _ref.showConfigBtn,
     showConfigBtn = _ref$showConfigBtn === void 0 ? true : _ref$showConfigBtn,
+    affixBarZIndex = _ref.affixBarZIndex,
     props = _objectWithoutProperties(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var currentValueRef = useRef(null);
@@ -275,6 +276,7 @@ var LdFormList = function LdFormList(_ref) {
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout,
+    zIndex: affixBarZIndex,
     getContainer: getContainer
   }), sortBy([].concat(_toConsumableArray(formList), _toConsumableArray(formExtra)), function (o) {
     var _o$props;

package/es/lowcode/engine/meta/form.props.default.json

@@ -10,6 +10,7 @@
   "showSave": true,
   "saveTitle": "保存",
   "settingLayout": "bottom",
+  "getContainer": "page_content",
   "blocks": [
     {
       "id": "block_main",

package/es/lowcode/engine/meta/form.props.json

@@ -75,7 +75,8 @@
                 "meta.group",
                 "build-in"
               ]
-            ]
+            ],
+            "default": "page_content"
           },
           {
             "key": "renderFormLeft",

package/es/lowcode/engine/tools/useCanvasRender.js

@@ -7,6 +7,7 @@ var _excluded = ["props", "children"],
 import React, { useRef } from 'react';
 import { dynamic } from 'umi';
 import { useMemoizedFn, useCreation } from 'ahooks';
+import { Skeleton } from 'luck-design/antd';
 import { upperFirst, isNil } from 'lodash';
 import { useContext } from "../provider/ContextProvider";
 import { LC_BUILDIN_UNIT_KEY_LIST, RUNTIME } from "../../constants";
@@ -55,7 +56,18 @@ export default function useCanvasRender(data, deps) {
               return _loader.apply(this, arguments);
             }
             return loader;
-          }()
+          }(),
+          loading: function loading() {
+            return /*#__PURE__*/React.createElement(Skeleton, {
+              active: true,
+              title: {
+                width: '70%'
+              },
+              paragraph: {
+                rows: 7
+              }
+            });
+          }
         });
       }
       var renderable = true;

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

@@ -90,6 +90,7 @@
       .ant-form-item,
       .ant-collapse-header,
       .resizer,
+      .formlist-affix-bar,
       .ant-tree-node-content-wrapper,
       .ant-modal-header,
       .ant-modal-close,

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

@@ -79,15 +79,18 @@ var LCDialog = function LCDialog(_ref) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           setLoading(true);
-          _context.next = 3;
+          _context.prev = 1;
+          _context.next = 4;
           return ctx.doAction(advance.events.onOk);
-        case 3:
-          setLoading(false);
         case 4:
+          _context.prev = 4;
+          setLoading(false);
+          return _context.finish(4);
+        case 7:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[1,, 4, 7]]);
   })));
   var _footer = useCreation(function () {
     if (!footer) return {

package/es/lowcode/view/lc-components/Form/FunctionDesign.js

@@ -94,7 +94,8 @@ var FunctionDesign = function FunctionDesign(_ref) {
       formMode: 'update',
       ticketData: _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, 'test')
     },
-    ref: ref
+    ref: ref,
+    affixBarZIndex: 10
   }), children);
 };
 export default FunctionDesign;

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

@@ -20,7 +20,6 @@ import RuntimeComp from "../JSX/RuntimeComp";
 import useCombinedRefs from "../../../engine/tools/useCombinedRefs";
 import defaultMeta from "../../../engine/meta/form.props.default.json";
 import { RUNTIME } from "../../../constants";
-import styles from "./index.less";
 var _I18N_PREFIX_ = 'lc.form.validator';
 var Header = function Header(_ref2) {
   var _ref2$header = _ref2.header,
@@ -56,7 +55,7 @@ var getMthodParams = function getMthodParams(methodStr) {
   return [];
 };
 var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
-  var _ctx$state2, _promiseRef$current2;
+  var _ctx$state2;
   var id = _ref3.id,
     className = _ref3.className,
     blocks = _ref3.blocks,
@@ -65,6 +64,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     readOnly = _ref3.readOnly,
     showSave = _ref3.showSave,
     saveTitle = _ref3.saveTitle,
+    affixBarZIndex = _ref3.affixBarZIndex,
     getContainer = _ref3.getContainer,
     settingLayout = _ref3.settingLayout,
     renderFormLeft = _ref3.renderFormLeft,
@@ -111,9 +111,12 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
        * @method
        */
       submit: function submit(_formMode) {
-        return new Promise(function (resolve) {
+        return new Promise(function (resolve, reject) {
           var _ctx$state;
-          promiseRef.current = resolve;
+          promiseRef.current = {
+            resolve: resolve,
+            reject: reject
+          };
           var instance = formRef.current;
           var _ref5 = _formMode ? {
               formMode: _formMode
@@ -565,7 +568,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     wrapperRef: wrapperRef,
     id: id,
     ldId: id,
-    className: classNames(styles['lc-component-form'], _defineProperty({}, className, !!className)),
+    className: classNames('lc-component-form', _defineProperty({}, className, !!className)),
     renderFormList: renderFormList,
     renderFormExtra: renderFormExtra,
     mainFormLdId: "block_main",
@@ -575,6 +578,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     showSaveBtn: showSave,
     saveBtnTitle: saveTitle,
     affixLayout: settingLayout,
+    affixBarZIndex: affixBarZIndex,
     renderAffixLeft: function renderAffixLeft() {
       return renderAffix(renderFormLeft);
     },
@@ -587,15 +591,17 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     onChildChange: onChildChange,
     setVerifyRules: setVerifyRules,
     getContainer: isNil(getContainer) ? null : ctx.componentMap.get(getContainer).api.getSelfDom,
-    afterSubmitLoading: function afterSubmitLoading() {
+    afterSubmitLoading: function afterSubmitLoading(res) {
       var _promiseRef$current;
-      for (var _len5 = arguments.length, rest = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-        rest[_key5] = arguments[_key5];
-      }
-      return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
+      (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 || _promiseRef$current.resolve(res);
+      promiseRef.current = null;
     },
     afterInit: afterInit,
-    validateErrorCallback: (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 ? void 0 : _promiseRef$current2.call(promiseRef),
+    validateErrorCallback: function validateErrorCallback() {
+      var _promiseRef$current2;
+      (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 || _promiseRef$current2.reject();
+      promiseRef.current = null;
+    },
     showConfigBtn: false
   }));
 });

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

@@ -66,7 +66,8 @@
               ["id", "page_root"],
               ["meta.group", "container"],
               ["meta.group", "build-in"]
-            ]
+            ],
+            "default": "page_content"
           },
           {
             "key": "renderFormLeft",

package/lib/components/LdFormList/index.js

@@ -31,7 +31,7 @@ var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
 var _utils2 = require("../../lowcode/engine/provider/ContextProvider/utils");
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading", "showConfigBtn"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading", "showConfigBtn", "affixBarZIndex"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -68,6 +68,7 @@ var LdFormList = function LdFormList(_ref) {
     afterSubmitLoading = _ref.afterSubmitLoading,
     _ref$showConfigBtn = _ref.showConfigBtn,
     showConfigBtn = _ref$showConfigBtn === void 0 ? true : _ref$showConfigBtn,
+    affixBarZIndex = _ref.affixBarZIndex,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var currentValueRef = (0, _react.useRef)(null);
@@ -282,6 +283,7 @@ var LdFormList = function LdFormList(_ref) {
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout,
+    zIndex: affixBarZIndex,
     getContainer: getContainer
   }), (0, _lodash.sortBy)([].concat((0, _toConsumableArray2.default)(formList), (0, _toConsumableArray2.default)(formExtra)), function (o) {
     var _o$props;

package/lib/lowcode/engine/meta/form.props.default.json

@@ -10,6 +10,7 @@
   "showSave": true,
   "saveTitle": "保存",
   "settingLayout": "bottom",
+  "getContainer": "page_content",
   "blocks": [
     {
       "id": "block_main",

package/lib/lowcode/engine/meta/form.props.json

@@ -75,7 +75,8 @@
                 "meta.group",
                 "build-in"
               ]
-            ]
+            ],
+            "default": "page_content"
           },
           {
             "key": "renderFormLeft",

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

@@ -14,6 +14,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard3(require("react"));
 var _umi = require("umi");
 var _ahooks = require("ahooks");
+var _antd = require("luck-design/antd");
 var _lodash = require("lodash");
 var _ContextProvider = require("../provider/ContextProvider");
 var _constants = require("../../constants");
@@ -70,7 +71,18 @@ function useCanvasRender(data, deps) {
               return _loader.apply(this, arguments);
             }
             return loader;
-          }()
+          }(),
+          loading: function loading() {
+            return /*#__PURE__*/_react.default.createElement(_antd.Skeleton, {
+              active: true,
+              title: {
+                width: '70%'
+              },
+              paragraph: {
+                rows: 7
+              }
+            });
+          }
         });
       }
       var renderable = true;

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

@@ -90,6 +90,7 @@
       .ant-form-item,
       .ant-collapse-header,
       .resizer,
+      .formlist-affix-bar,
       .ant-tree-node-content-wrapper,
       .ant-modal-header,
       .ant-modal-close,

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

@@ -87,15 +87,18 @@ var LCDialog = function LCDialog(_ref) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           setLoading(true);
-          _context.next = 3;
+          _context.prev = 1;
+          _context.next = 4;
           return ctx.doAction(advance.events.onOk);
-        case 3:
-          setLoading(false);
         case 4:
+          _context.prev = 4;
+          setLoading(false);
+          return _context.finish(4);
+        case 7:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[1,, 4, 7]]);
   })));
   var _footer = (0, _ahooks.useCreation)(function () {
     if (!footer) return {

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

@@ -101,7 +101,8 @@ var FunctionDesign = function FunctionDesign(_ref) {
       formMode: 'update',
       ticketData: (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, 'test')
     },
-    ref: ref
+    ref: ref,
+    affixBarZIndex: 10
   }), children);
 };
 var _default = exports.default = FunctionDesign;

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

@@ -27,7 +27,6 @@ var _RuntimeComp = _interopRequireDefault(require("../JSX/RuntimeComp"));
 var _useCombinedRefs = _interopRequireDefault(require("../../../engine/tools/useCombinedRefs"));
 var _formPropsDefault = _interopRequireDefault(require("../../../engine/meta/form.props.default.json"));
 var _constants = require("../../../constants");
-var _index2 = _interopRequireDefault(require("./index.less"));
 var _excluded = ["advance", "state", "render"];
 var _I18N_PREFIX_ = 'lc.form.validator';
 var Header = function Header(_ref2) {
@@ -64,7 +63,7 @@ var getMthodParams = function getMthodParams(methodStr) {
   return [];
 };
 var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
-  var _ctx$state2, _promiseRef$current2;
+  var _ctx$state2;
   var id = _ref3.id,
     className = _ref3.className,
     blocks = _ref3.blocks,
@@ -73,6 +72,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     readOnly = _ref3.readOnly,
     showSave = _ref3.showSave,
     saveTitle = _ref3.saveTitle,
+    affixBarZIndex = _ref3.affixBarZIndex,
     getContainer = _ref3.getContainer,
     settingLayout = _ref3.settingLayout,
     renderFormLeft = _ref3.renderFormLeft,
@@ -119,9 +119,12 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
        * @method
        */
       submit: function submit(_formMode) {
-        return new Promise(function (resolve) {
+        return new Promise(function (resolve, reject) {
           var _ctx$state;
-          promiseRef.current = resolve;
+          promiseRef.current = {
+            resolve: resolve,
+            reject: reject
+          };
           var instance = formRef.current;
           var _ref5 = _formMode ? {
               formMode: _formMode
@@ -573,7 +576,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     wrapperRef: wrapperRef,
     id: id,
     ldId: id,
-    className: (0, _classnames.default)(_index2.default['lc-component-form'], (0, _defineProperty2.default)({}, className, !!className)),
+    className: (0, _classnames.default)('lc-component-form', (0, _defineProperty2.default)({}, className, !!className)),
     renderFormList: renderFormList,
     renderFormExtra: renderFormExtra,
     mainFormLdId: "block_main",
@@ -583,6 +586,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     showSaveBtn: showSave,
     saveBtnTitle: saveTitle,
     affixLayout: settingLayout,
+    affixBarZIndex: affixBarZIndex,
     renderAffixLeft: function renderAffixLeft() {
       return renderAffix(renderFormLeft);
     },
@@ -595,15 +599,17 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     onChildChange: onChildChange,
     setVerifyRules: setVerifyRules,
     getContainer: (0, _lodash.isNil)(getContainer) ? null : ctx.componentMap.get(getContainer).api.getSelfDom,
-    afterSubmitLoading: function afterSubmitLoading() {
+    afterSubmitLoading: function afterSubmitLoading(res) {
       var _promiseRef$current;
-      for (var _len5 = arguments.length, rest = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-        rest[_key5] = arguments[_key5];
-      }
-      return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
+      (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 || _promiseRef$current.resolve(res);
+      promiseRef.current = null;
     },
     afterInit: afterInit,
-    validateErrorCallback: (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 ? void 0 : _promiseRef$current2.call(promiseRef),
+    validateErrorCallback: function validateErrorCallback() {
+      var _promiseRef$current2;
+      (_promiseRef$current2 = promiseRef.current) === null || _promiseRef$current2 === void 0 || _promiseRef$current2.reject();
+      promiseRef.current = null;
+    },
     showConfigBtn: false
   }));
 });

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

@@ -66,7 +66,8 @@
               ["id", "page_root"],
               ["meta.group", "container"],
               ["meta.group", "build-in"]
-            ]
+            ],
+            "default": "page_content"
           },
           {
             "key": "renderFormLeft",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "1.0.1-4",
+  "version": "1.0.1-5",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",
@@ -81,7 +81,7 @@
     "@babel/plugin-transform-strict-mode": "^7.18.6",
     "@babel/polyfill": "^7.12.1",
     "@babel/traverse": "^7.24.1",
-    "@luck-design-biz/base": "0.0.49-2",
+    "@luck-design-biz/base": "0.0.49-9",
     "@luck-design-biz/bpm": "0.0.5",
     "@luck-helper/ui-design": "0.0.6",
     "@types/classnames": "^2.3.1",

package/es/lowcode/view/lc-components/Form/index.less

@@ -1,5 +0,0 @@
-.lc-component-form{
-}
-.lc-component-form.runtime-form {
-  
-}

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

@@ -1,5 +0,0 @@
-.lc-component-form{
-}
-.lc-component-form.runtime-form {
-  
-}