@luck-design-biz/luckda 0.0.25-13 → 0.0.25-15

package/lib/lowcode/painter/panel-section/ImpExpAlone.js

@@ -16,7 +16,6 @@ var _ContextProvider = require("../../engine/provider/ContextProvider");
 var _impexp = _interopRequireDefault(require("../style/impexp.less"));
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.impexp';
 var ImpExp = function ImpExp(_ref) {
-  var _ref2;
   var defaultValue = _ref.defaultValue,
     onChange = _ref.onChange;
   var _useSetState = (0, _ahooks.useSetState)(defaultValue || {}),
@@ -44,13 +43,15 @@ var ImpExp = function ImpExp(_ref) {
   var handleSegmentChange = (0, _ahooks.useMemoizedFn)(function (field, e) {
     var _value = field;
     setState({
-      type: _value
+      type: _value,
+      customType: false,
+      customParam: undefined
     });
   });
-  var handleSwitchChange = (0, _ahooks.useMemoizedFn)(function (field, e) {
-    var _value = field;
+  var handleSwitchChange = (0, _ahooks.useMemoizedFn)(function (e) {
+    var _value = e.target.value;
     setState({
-      customType: _value,
+      customType: _value === '2',
       customParam: undefined
     });
   });
@@ -68,12 +69,18 @@ var ImpExp = function ImpExp(_ref) {
     onChange: handleSegmentChange,
     defaultValue: state.type,
     block: true
-  })), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
-    label: "\u81EA\u5B9A\u4E49",
+  })), state.type === 'import' && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+    suppressPadding: true
+  }, /*#__PURE__*/_react.default.createElement(_antd.Radio.Group, {
+    onChange: handleSwitchChange,
+    defaultValue: !state.customType ? '1' : '2'
+  }, /*#__PURE__*/_react.default.createElement(_antd.Radio, {
+    value: "1"
+  }, "\u6A21\u7248ID"), /*#__PURE__*/_react.default.createElement(_antd.Radio, {
+    value: "2"
+  }, "\u81EA\u5B9A\u4E49\u884C\u4E3A"))), state.type === 'import' && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     suppressPadding: true
-  }, /*#__PURE__*/_react.default.createElement(_antd.Col, {
-    span: 14
-  }, !state.customType && state.type === 'import' ? /*#__PURE__*/_react.default.createElement(_antd.Input, {
+  }, !state.customType ? /*#__PURE__*/_react.default.createElement(_antd.Input, {
     size: "small",
     value: (0, _lodash.isString)(state.customParam) ? state.customParam : '',
     onChange: function onChange(e) {
@@ -91,24 +98,33 @@ var ImpExp = function ImpExp(_ref) {
       id: "".concat(_I18N_PREFIX_, ".expType.placeholder"),
       label: '请选择自定义行为'
     })
-  }, (_ref2 = state.type === 'export' ? expTypeList : impTypeList) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (opt) {
+  }, impTypeList.map(function (opt) {
     return /*#__PURE__*/_react.default.createElement(_antd.Select.Option, {
       key: opt.key,
       value: opt.value
     }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
       title: opt.label
     }, opt.label));
-  }))), state.type === 'import' && /*#__PURE__*/_react.default.createElement(_antd.Col, {
-    span: 4,
-    style: {
-      textAlign: 'center'
-    }
-  }, /*#__PURE__*/_react.default.createElement(_antd.Switch, {
+  }))), state.type === 'export' && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+    suppressPadding: true
+  }, /*#__PURE__*/_react.default.createElement(_antd.Select, {
     size: "small",
-    defaultChecked: !!state.customType,
-    onChange: handleSwitchChange,
-    checkedChildren: "\u884C\u4E3A",
-    unCheckedChildren: "\u6A21\u7248"
+    style: {
+      width: '100%'
+    },
+    value: (0, _lodash.isString)(state.customParam) ? state.customParam : undefined,
+    onChange: handleSelectChange,
+    placeholder: (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".expType.placeholder"),
+      label: '请选择自定义行为'
+    })
+  }, expTypeList === null || expTypeList === void 0 ? void 0 : expTypeList.map(function (opt) {
+    return /*#__PURE__*/_react.default.createElement(_antd.Select.Option, {
+      key: opt.key,
+      value: opt.value
+    }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+      title: opt.label
+    }, opt.label));
   }))));
 };
 var _default = exports.default = ImpExp;

package/lib/lowcode/painter/panel-section/PageLayoutDisplay.js

@@ -13,7 +13,7 @@ var _ahooks = require("ahooks");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _antd = require("luck-design/antd");
 var _pageLayoutDisplay = _interopRequireDefault(require("../style/page-layout-display.less"));
-var _TYPES_ = ['lr', 'lmr', 'ltb'];
+var _TYPES_ = ['lr', 'tb', 'lmr', 'ltb'];
 var PageLayoutDisplay = function PageLayoutDisplay(_ref) {
   var defaultValue = _ref.defaultValue,
     onChange = _ref.onChange;
@@ -52,6 +52,23 @@ var PageLayoutDisplay = function PageLayoutDisplay(_ref) {
         flex: 3
       },
       className: _pageLayoutDisplay.default['item-block']
+    })), _type === 'tb' && /*#__PURE__*/_react.default.createElement("div", {
+      style: {
+        flex: 1,
+        display: 'flex',
+        flexDirection: 'column'
+      }
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      style: {
+        height: '50%',
+        borderBottom: '1px solid #eee'
+      },
+      className: _pageLayoutDisplay.default['item-block']
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      style: {
+        height: '50%'
+      },
+      className: _pageLayoutDisplay.default['item-block']
     })), _type === 'lmr' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       style: {
         flex: 1,

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

@@ -24,7 +24,7 @@ var FunctionDesign = function FunctionDesign(_ref) {
     return !children || _react.default.Children.count(children) === 0;
   }, [children]);
   return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({
-    className: (0, _classnames.default)(_index2.default['lc-component-box-design'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _index2.default.placeholder, isEmpty), "className", !!className)),
+    className: (0, _classnames.default)(_index2.default['lc-component-box-design'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _index2.default.placeholder, isEmpty), className, !!className)),
     style: (0, _objectSpread2.default)({
       minHeight: 60
     }, style)

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

@@ -28,12 +28,12 @@ var _formPropsDefault = _interopRequireDefault(require("../../../engine/meta/for
 var _index2 = _interopRequireDefault(require("./index.less"));
 var _excluded = ["advance"];
 var _I18N_PREFIX_ = 'lc.form.validator';
-var Header = function Header(_ref) {
-  var _ref$header = _ref.header,
-    header = _ref$header === void 0 ? 'collapse' : _ref$header,
-    title = _ref.title,
-    ldId = _ref.ldId,
-    children = _ref.children;
+var Header = function Header(_ref2) {
+  var _ref2$header = _ref2.header,
+    header = _ref2$header === void 0 ? 'collapse' : _ref2$header,
+    title = _ref2.title,
+    ldId = _ref2.ldId,
+    children = _ref2.children;
   if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
     title: title || ldId,
     id: ldId,
@@ -61,28 +61,37 @@ var getMthodParams = function getMthodParams(methodStr) {
   }
   return [];
 };
-var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
+var useCombinedRefs = function useCombinedRefs(forwardedRef) {
+  var innerRef = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    if (!forwardedRef) return;
+    if (typeof forwardedRef === 'function') {
+      forwardedRef(innerRef.current);
+    } else {
+      forwardedRef.current = innerRef.current;
+    }
+  }, [forwardedRef]);
+  return forwardedRef || innerRef;
+};
+var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
   var _ctx$pagePublicResour2;
-  var id = _ref2.id,
-    parentId = _ref2.parentId,
-    width = _ref2.width,
-    height = _ref2.height,
-    className = _ref2.className,
-    blocks = _ref2.blocks,
-    advance = _ref2.advance,
-    initData = _ref2.initData,
-    readOnly = _ref2.readOnly,
-    showSave = _ref2.showSave,
-    saveTitle = _ref2.saveTitle,
-    getContainer = _ref2.getContainer,
-    settingLayout = _ref2.settingLayout,
-    renderFormLeft = _ref2.renderFormLeft,
-    renderFormRight = _ref2.renderFormRight,
-    children = _ref2.children;
+  var id = _ref3.id,
+    className = _ref3.className,
+    blocks = _ref3.blocks,
+    advance = _ref3.advance,
+    initData = _ref3.initData,
+    readOnly = _ref3.readOnly,
+    showSave = _ref3.showSave,
+    saveTitle = _ref3.saveTitle,
+    getContainer = _ref3.getContainer,
+    settingLayout = _ref3.settingLayout,
+    renderFormLeft = _ref3.renderFormLeft,
+    renderFormRight = _ref3.renderFormRight,
+    children = _ref3.children;
   var apiRef = (0, _react.useRef)();
-  var boxRef = (0, _react.useRef)();
+  var wrapperRef = (0, _react.useRef)();
+  var formRef = useCombinedRefs(ref);
   var promiseRef = (0, _react.useRef)(null);
-  var formRef = (0, _react.useRef)();
   var ctx = (0, _ContextProvider.useContext)();
   var remoteSource = (0, _ContextProvider.useRemoteSource)();
   var _initData = (0, _ahooks.useCreation)(function () {
@@ -96,30 +105,30 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     })) || [];
   }, [remoteSource.serials]);
   var _blocks = (0, _ahooks.useCreation)(function () {
-    return blocks.filter(function (_ref3) {
-      var hidden = _ref3.hidden;
+    return blocks.filter(function (_ref4) {
+      var hidden = _ref4.hidden;
       return !hidden;
     });
   }, [blocks]);
   (0, _ahooks.useMount)(function () {
     ctx.doAction(advance.events.onMount, {
-      instance: (ref || formRef).current
+      instance: formRef.current
     });
   });
   (0, _react.useEffect)(function () {
-    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref4) {
-      var resource = _ref4.resource,
-        prevResource = _ref4.prevResource;
+    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref5) {
+      var resource = _ref5.resource,
+        prevResource = _ref5.prevResource;
       ctx.doAction(advance.events.onPagePublicResourceChanged, {
         resource: resource,
         prevResource: prevResource,
-        instance: (ref || formRef).current
+        instance: formRef.current
       });
     }).watch();
     return function () {
       ctx.$unsubscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED, tid);
       ctx.doAction(advance.events.onUnmount, {
-        instance: (ref || formRef).current
+        instance: formRef.current
       });
     };
   }, []);
@@ -130,7 +139,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
        * @method
        */
       getInstance: function getInstance() {
-        return (ref || formRef).current;
+        return formRef.current;
       },
       /**
        * 提交表格数据
@@ -140,9 +149,9 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
         return new Promise(function (resolve) {
           var _ctx$pagePublicResour;
           promiseRef.current = resolve;
-          var instance = (ref || formRef).current;
-          var _ref5 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || _initData || {},
-            formMode = _ref5.formMode;
+          var instance = formRef.current;
+          var _ref6 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || _initData || {},
+            formMode = _ref6.formMode;
           if (formMode === 'add') {
             instance.onAdd();
           } else if (formMode === 'update') {
@@ -168,7 +177,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
        * @returns {Block}
        */
       getBlock: function getBlock(blockId) {
-        var instance = (ref || formRef).current;
+        var instance = formRef.current;
         var block = instance.formRefs[blockId];
         if (!block) {
           console.e('未发现区块');
@@ -237,7 +246,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     };
   });
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
-    return boxRef.current;
+    return wrapperRef.current;
   });
   var handleDefaultDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (defaultDataSourceFormat, defaultValues) {
     if ((0, _lodash.isNil)(defaultDataSourceFormat)) return function () {
@@ -245,10 +254,10 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     };
     return (0, _helper.executeCode)(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
-  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, dataSetKey, _ref6) {
-    var values = _ref6.values,
-      submitData = _ref6.submitData,
-      behaviorKey = _ref6.behaviorKey;
+  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, dataSetKey, _ref7) {
+    var values = _ref7.values,
+      submitData = _ref7.submitData,
+      behaviorKey = _ref7.behaviorKey;
     if ((0, _lodash.isNil)(dataSourceFormat)) return (0, _defineProperty2.default)({}, dataSetKey, submitData);
     return (0, _helper.executeCode)(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData', 'behaviorKey'], dataSetKey, values, submitData, behaviorKey);
   });
@@ -259,8 +268,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     if ((0, _lodash.isNil)(actionsColumnReset)) return columns;
     return (0, _helper.executeCode)(ctx, actionsColumnReset, ['columns'], columns);
   });
-  var handleGridFormReady = (0, _ahooks.useMemoizedFn)(function (onGridFormReady, ref, params, gridForm) {
-    if (!(0, _lodash.isNil)(onGridFormReady)) return (0, _helper.executeCode)(ctx, onGridFormReady, ['ref', 'params', 'gridForm'], ref, params, gridForm);
+  var handleGridFormReady = (0, _ahooks.useMemoizedFn)(function (onGridFormReady, _ref, params, gridForm) {
+    if (!(0, _lodash.isNil)(onGridFormReady)) return (0, _helper.executeCode)(ctx, onGridFormReady, ['ref', 'params', 'gridForm'], _ref, params, gridForm);
   });
   var handleResetActions = (0, _ahooks.useMemoizedFn)(function (resetActions, data, index, actionList, params) {
     if ((0, _lodash.isNil)(resetActions)) return actionList;
@@ -286,8 +295,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     props.config.rules = props.config.rules || [];
     if ((_verifyListObj$length = verifyListObj.length) !== null && _verifyListObj$length !== void 0 && _verifyListObj$length.expression) props.config.rules.push({
       validator: function validator(rule, value, callback) {
-        var _current;
-        var length = (0, _helper.executeCode)(ctx, verifyListObj.length.expression, ['cValue'], (_current = (ref || formRef).current) === null || _current === void 0 ? void 0 : _current.getCValue());
+        var _formRef$current;
+        var length = (0, _helper.executeCode)(ctx, verifyListObj.length.expression, ['cValue'], (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getCValue());
         if (value.length > length) callback("".concat((0, _utils.formatMessage)({
           id: "".concat(_I18N_PREFIX_, ".maxLength"),
           label: '字数不得超过'
@@ -300,8 +309,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     });
     if ((_verifyListObj$min = verifyListObj.min) !== null && _verifyListObj$min !== void 0 && _verifyListObj$min.expression) props.config.rules.push({
       validator: function validator(rule, value, callback) {
-        var _current2;
-        var min = (0, _helper.executeCode)(ctx, verifyListObj.min.expression, ['cValue'], (_current2 = (ref || formRef).current) === null || _current2 === void 0 ? void 0 : _current2.getCValue());
+        var _formRef$current2;
+        var min = (0, _helper.executeCode)(ctx, verifyListObj.min.expression, ['cValue'], (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getCValue());
         if (value < min) callback((0, _utils.formatMessage)({
           id: "".concat(_I18N_PREFIX_, ".numberBelowMin"),
           label: '低于最小值'
@@ -311,8 +320,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     });
     if ((_verifyListObj$max = verifyListObj.max) !== null && _verifyListObj$max !== void 0 && _verifyListObj$max.expression) props.config.rules.push({
       validator: function validator(rule, value, callback) {
-        var _current3;
-        var max = (0, _helper.executeCode)(ctx, verifyListObj.max.expression, ['cValue'], (_current3 = (ref || formRef).current) === null || _current3 === void 0 ? void 0 : _current3.getCValue());
+        var _formRef$current3;
+        var max = (0, _helper.executeCode)(ctx, verifyListObj.max.expression, ['cValue'], (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getCValue());
         if (value > max) callback((0, _utils.formatMessage)({
           id: "".concat(_I18N_PREFIX_, ".numberExceedMax"),
           label: '超过最大值'
@@ -325,8 +334,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     if (verifyListObj.mobile) props.config.type = 'mobile';
     if ((_verifyListObj$rules = verifyListObj.rules) !== null && _verifyListObj$rules !== void 0 && _verifyListObj$rules.expression) props.config.rules.push({
       validator: function validator(rule, value, callback) {
-        var _current4;
-        (0, _helper.executeCode)(ctx, verifyListObj.rules.expression, ['cValue', 'rule', 'value', 'callback'], (_current4 = (ref || formRef).current) === null || _current4 === void 0 ? void 0 : _current4.getCValue(), rule, value, callback);
+        var _formRef$current4;
+        (0, _helper.executeCode)(ctx, verifyListObj.rules.expression, ['cValue', 'rule', 'value', 'callback'], (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getCValue(), rule, value, callback);
       }
     });
     return props;
@@ -401,8 +410,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
           columnsReset: function columnsReset(columns) {
             return handleColumnsReset(item.columnsReset, columns);
           },
-          onGridFormReady: function onGridFormReady(ref, params, gridForm) {
-            return handleGridFormReady(item.onGridFormReady, ref, params, gridForm);
+          onGridFormReady: function onGridFormReady(_ref, params, gridForm) {
+            return handleGridFormReady(item.onGridFormReady, _ref, params, gridForm);
           }
         });
         if (item.actionsColumnReset) data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
@@ -474,7 +483,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   });
   var beforeSubmit = (0, _ahooks.useMemoizedFn)(function (values, data) {
     return new Promise( /*#__PURE__*/function () {
-      var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve) {
+      var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve) {
         var _data;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -502,7 +511,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
         }, _callee);
       }));
       return function (_x) {
-        return _ref8.apply(this, arguments);
+        return _ref9.apply(this, arguments);
       };
     }());
   });
@@ -529,13 +538,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     displayName: "Form",
     getTargetDom: getTargetDom,
     api: apiRef
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    ref: boxRef,
-    style: {
-      width: width,
-      height: height
-    }
   }, /*#__PURE__*/_react.default.createElement(_index.LdFormList, {
+    wrapperRef: wrapperRef,
     id: id,
     ldId: id,
     className: (0, _classnames.default)(_index2.default['lc-component-form'], (0, _defineProperty2.default)({}, className, !!className)),
@@ -543,7 +547,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     renderFormExtra: renderFormExtra,
     mainFormLdId: "block_main",
     initData: ((_ctx$pagePublicResour2 = ctx.pagePublicResource) === null || _ctx$pagePublicResour2 === void 0 ? void 0 : _ctx$pagePublicResour2[id]) || initData || _initData,
-    ref: ref || formRef,
+    ref: formRef,
     readOnly: readOnly,
     showSaveBtn: showSave,
     saveBtnTitle: saveTitle,
@@ -567,7 +571,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
       }
       return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
     }
-  })));
+  }));
 });
 LCForm.defaultProps = (0, _helper.omitBadProps)(_formPropsDefault.default);
 var _default = exports.default = LCForm;

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

@@ -1,7 +1,7 @@
 {
   "component": "Form",
-  "name": "表单",
-  "desc": "表单组件是用于收集、验证和提交用户输入数据的重要组件。",
+  "name": "复杂表单",
+  "desc": "复杂表单组件是用于收集、验证和提交用户输入数据的重要组件。",
   "icon": "icon-form",
   "group": "advance",
   "groupName": "高级",

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

@@ -35,9 +35,11 @@ var LCPageLayout = function LCPageLayout(_ref) {
   }, /*#__PURE__*/_react.default.createElement(StyledLayout, {
     wrapperRef: ref,
     $css: css
-  }, /*#__PURE__*/_react.default.createElement(_base.Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
+  }, display === 'tb' ? /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
+    split: "horizontal"
+  }, children === null || children === void 0 ? void 0 : children[0], children === null || children === void 0 ? void 0 : children[1]) : null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_base.Layout.Sider, null, children === null || children === void 0 ? void 0 : children[0]), /*#__PURE__*/_react.default.createElement(_base.Layout.Main, null, (children === null || children === void 0 ? void 0 : children.length) === display.split('').length ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, display === 'lr' ? children === null || children === void 0 ? void 0 : children[1] : /*#__PURE__*/_react.default.createElement(_base.MemorySplit, {
     split: display === 'ltb' ? 'horizontal' : 'vertical'
-  }, children === null || children === void 0 ? void 0 : children[1], children === null || children === void 0 ? void 0 : children[2])) : null)));
+  }, children === null || children === void 0 ? void 0 : children[1], children === null || children === void 0 ? void 0 : children[2])) : null))));
 };
 LCPageLayout.defaultProps = (0, _helper.omitBadProps)(_pagelayoutPropsDefault.default);
 var _default = exports.default = LCPageLayout;

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

@@ -223,7 +223,7 @@ var TopUpload = exports.TopUpload = function TopUpload(_ref4) {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Button, {
     type: "primary",
     onClick: function onClick() {
-      if (!options.import) {
+      if (!(0, _lodash.isString)(options.import)) {
         return _antd.message.info("\u672A\u914D\u7F6E".concat(options.importType ? '行为' : '模版', "\uFF01"));
       }
       setVisible(true);
@@ -424,6 +424,9 @@ var TopExport = exports.TopExport = function TopExport(_ref5) {
   return /*#__PURE__*/_react.default.createElement(_antd.Button, {
     type: "primary",
     onClick: function onClick() {
+      if ((0, _lodash.isString)(options.export) && !options.export) {
+        return _antd.message.info("\u672A\u914D\u7F6E\u884C\u4E3A\uFF01");
+      }
       doExportAll(handleExportAll);
     }
   }, "\u5BFC\u51FA");