@luck-design-biz/luckda 0.0.25-4 → 0.0.25-7

package/es/components/LDActions/index.less

@@ -6,7 +6,7 @@
 .ldActions {
 
   button:not(:last-child) {
-    margin-right: 8px;
+    margin-right: 2px;
   }
   span {
     cursor: pointer;

package/es/components/LdAutoForm/index.js

@@ -2,9 +2,10 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields"];
 import React, { createRef, useContext } from 'react';
-import { transform } from 'lodash';
+import { reduce, keyBy, isEmpty, pick } from 'lodash';
+import { BasicDivider } from 'luck-design';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from "../../helper/ldBuilder";
 import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
@@ -41,20 +42,33 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
     _ref$relationKey = _ref.relationKey,
     relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
+    fields = _ref.fields,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/createRef();
+  var defaultValues = /*#__PURE__*/createRef({});
   var isMain = ldId === mainFormLdId;
   var basicItems = function () {
+    var fieldsObj = keyBy(fields, 'field');
+    var columnsObj = keyBy(columns, 'field');
+    var keys = isEmpty(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
-    var _nodes = transform(columns, function (result, col) {
-      if (col.isShowInForm) {
-        var customFiled = filedsRewrite.find(function (field) {
-          return field.name === col.aliaName;
+    var _nodes = reduce(keys, function (result, key) {
+      var setting = fieldsObj[key];
+      var col = columnsObj[key];
+      if ((setting === null || setting === void 0 ? void 0 : setting._type) === 'divider') {
+        result.push( /*#__PURE__*/React.createElement(BasicDivider, {
+          title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
+        }));
+      } else if (col.isShowInForm) {
+        var customFiled = filedsRewrite.find(function (_field) {
+          return _field.name === col.aliaName;
         }) || {};
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        result.push(getFormItem(col, _objectSpread(_objectSpread({
+        var newCol = _objectSpread(_objectSpread({}, col), {}, {
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
+        }, pick(setting, ['col', 'row', 'note', 'tip', 'placeholder']));
+        result.push(getFormItem(newCol, _objectSpread(_objectSpread({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
@@ -63,6 +77,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           }
         })));
       }
+      ;
+      return result;
     }, []);
     defaultValues.current = _defaultValues;
     setFieldProps && setFieldProps(_defineProperty({}, ldId, _nodes.map(function (i) {

package/es/components/LdFormList/index.js

@@ -26,7 +26,7 @@ import { LuckDaContext } from "../Builder";
 import { LuckDaPopContext } from "../LdPop";
 import createModel from "./model";
 import { onBatchSubmitAction } from "../../helper/action";
-import { readBehaviorCall } from "../../services";
+import useTodo from "../../lowcode/engine/tools/useTodo";
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -69,6 +69,10 @@ var LdFormList = function LdFormList(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     bizData = _useState6[0],
     setBizData = _useState6[1];
+  var _useTodo = useTodo(),
+    _useTodo2 = _slicedToArray(_useTodo, 2),
+    _ = _useTodo2[0],
+    callBehavior = _useTodo2[1];
   var luckTheme = useCreation(function () {
     return document.body.getAttribute('luck-theme');
   }, []);
@@ -124,7 +128,7 @@ var LdFormList = function LdFormList(_ref) {
     }, bpmButtonProps)));
   };
   useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, _params, response, _yield$callBehavior, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -134,13 +138,14 @@ var LdFormList = function LdFormList(_ref) {
           }
           _params = {
             indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
+            mainDataSetKey: mainDataSetKey
+          }; // 请求是否有工作流服务
+          _context.next = 4;
+          return callBehavior({
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
-            mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
-          }; // 请求是否有工作流服务
-          _context.next = 4;
-          return readBehaviorCall(_params);
+          }, _params);
         case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
@@ -148,13 +153,15 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
+          return callBehavior({
+            moduleCode: rest.moduleCode,
+            datasetCode: mainDataSetKey,
             behaviorKey: 'readBpm'
-          }));
+          }, _params);
         case 8:
-          _yield$readBehaviorCa = _context.sent;
-          code = _yield$readBehaviorCa.code;
-          data = _yield$readBehaviorCa.data;
+          _yield$callBehavior = _context.sent;
+          code = _yield$callBehavior.code;
+          data = _yield$callBehavior.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
             tempObj = _objectSpread(_objectSpread({}, props.formData[mainFormLdId]), {}, {
@@ -261,7 +268,9 @@ var LdFormList = function LdFormList(_ref) {
     var _o$props;
     return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
   }).map(function (formProps) {
-    if (formProps.dataSetKey) {
+    var _formProps$type = formProps.type,
+      type = _formProps$type === void 0 ? 'auto' : _formProps$type;
+    if (includes(['auto', 'writer', 'grid'], type)) {
       var _ref8 = formProps || {},
         ldId = _ref8.id,
         _ref8$header = _ref8.header,
@@ -276,17 +285,15 @@ var LdFormList = function LdFormList(_ref) {
         } : _ref8$renderTopLeft,
         serial = _ref8.serial,
         _props = _objectWithoutProperties(_ref8, _excluded3);
-      var _props$type = _props.type,
-        type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
       var _readOnly = selfReadOnly || serial && !includes(resources, serial);
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
         title: title || ldId,
-        extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
+        extra: type === 'auto' && formProps.dataSetKey && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-      }, renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+      }, formProps.dataSetKey && renderForm(_objectSpread(_objectSpread({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -302,11 +309,11 @@ var LdFormList = function LdFormList(_ref) {
       }, header === 'divider' && /*#__PURE__*/React.createElement(BasicDivider, {
         title: title || ldId,
         id: ldId
-      }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
+      }), type === 'auto' && formProps.dataSetKey && /*#__PURE__*/React.createElement("div", {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), formProps.dataSetKey && renderForm(_objectSpread(_objectSpread({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,

package/es/components/LdGrid/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "_loading", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
@@ -26,6 +26,7 @@ var LdGrid = function LdGrid(_ref) {
     detail = _ref.detail,
     params = _ref.params,
     filters = _ref.filters,
+    _loading = _ref._loading,
     loading = _ref.loading,
     unclosableSet = _ref.unclosableSet,
     onQuery = _ref.onQuery,
@@ -142,7 +143,7 @@ var LdGrid = function LdGrid(_ref) {
     ,
     actionsColumn: _actionsColumn,
     batchOperations: _batchOperations,
-    loading: loading,
+    loading: _loading || loading,
     pagination: isFlow ? false : _objectSpread({
       total: total,
       current: current,

package/es/components/LdGridForm/index.js

@@ -2,9 +2,9 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
-import React, { createRef, useContext, useEffect } from 'react';
-import { transform } from 'lodash';
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields"];
+import React, { createRef, useContext } from 'react';
+import { reduce, keyBy, isEmpty, pick } from 'lodash';
 import classNames from 'classnames';
 import ldBuilder from "../../helper/ldBuilder";
 import { GridForm } from '@luck-design-biz/base/FormList';
@@ -51,10 +51,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     className = _ref.className,
     formRef = _ref.formRef,
     formMode = _ref.formMode,
+    fields = _ref.fields,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/createRef();
+  var defaultValues = /*#__PURE__*/createRef({});
   var isMain = ldId === mainFormLdId;
   var gridColumns = columns.map(function (col) {
     if ((col.comName || defaultComName[col.property]) === 'radio') return _objectSpread(_objectSpread({}, col), {}, {
@@ -63,8 +64,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     return col;
   });
   var _columns = function () {
+    var fieldsObj = keyBy(fields, 'field');
+    var columnsObj = keyBy(gridColumns, 'field');
+    var keys = isEmpty(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
-    var _nodes = transform(gridColumns, function (result, col) {
+    var _nodes = reduce(keys, function (result, key) {
+      var setting = fieldsObj[key];
+      var col = columnsObj[key];
       if (col.isShowInForm) {
         var _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
@@ -75,7 +81,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           mode: 'grid'
         });
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        result.push(getFormColumn(type, col, _objectSpread(_objectSpread({}, customColumn), {}, {
+        var newCol = _objectSpread(_objectSpread({}, col), {}, {
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
+        });
+        result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, ['width', 'align', 'headerAlign', 'pinned', 'tip'])), customColumn), {}, {
           formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
             formRef: formRef,
@@ -83,6 +92,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           })
         })));
       }
+      return result;
     }, []);
     defaultValues.current = _defaultValues;
     setFieldProps && setFieldProps(_defineProperty({}, ldId, _nodes.map(function (col) {

package/es/components/LdTree/index.js

@@ -3,7 +3,7 @@ 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 = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender"],
+var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender", "onlyRoot"],
   _excluded2 = ["onClick"];
 import React, { useState, useRef, useImperativeHandle, forwardRef, useLayoutEffect } from 'react';
 import { isFunction, isNumber, transform, includes, remove, cloneDeep, isNil } from 'lodash';
@@ -61,6 +61,7 @@ var LdTree = function LdTree(_ref) {
     onUnmount = _ref.onUnmount,
     onDataSetChange = _ref.onDataSetChange,
     onTreeNodeRender = _ref.onTreeNodeRender,
+    onlyRoot = _ref.onlyRoot,
     props = _objectWithoutProperties(_ref, _excluded);
   if (!includes(isTree, dataSetKey)) return formatMessage({
     id: 'luckda.ldTree.notTrees',
@@ -221,7 +222,7 @@ var LdTree = function LdTree(_ref) {
     onDrop && onDrop(info, dragInfo);
   });
   var onAdd = useCreation(function () {
-    return !(readOnly || !rootAdd || rootAdd.resource && !includes(resources, rootAdd.resource)) ? function () {
+    return !(readOnly || !rootAdd || rootAdd.resource && !includes(resources, rootAdd.resource) || onlyRoot && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0) ? function () {
       return handleMenuClick(rootAdd);
     } : null;
   }, [readOnly, rootAdd, resources]);

package/es/helper/form.js

@@ -64,11 +64,14 @@ export function translator() {
       required: !!allConfig.isNotNull,
       disabled: !!allConfig.isReadOnly
     },
-    layout: 'block'
+    layout: 'block',
+    col: allConfig.col || 1,
+    row: allConfig.row || 1
   };
   if (!isNil(allConfig['dataFormat'])) _props.dataFormat = allConfig['dataFormat'];
-  // if (allConfig.tip) _props.config.placeholder = allConfig.tip;
-  // if (allConfig.note) _props.extra = allConfig.note;
+  if (allConfig.placeholder) _props.config.placeholder = allConfig.placeholder;
+  if (allConfig.note) _props.extra = allConfig.note;
+  if (allConfig.tip) _props.tip = allConfig.tip;
   /* *********************************** extra ******************************* */
   if (allConfig['opt_length']) _props.config.length = allConfig['opt_length'];
   if (!isNil(allConfig['opt_number_min'])) _props.config.min = allConfig['opt_number_min'];

package/es/locales/zh-CN.js

@@ -23,6 +23,7 @@ export default {
   "luckda.lowcode.painter.panel-section.width-height": "请输入数值",
   "luckda.lowcode.painter.tree.rootAdd": "根节点新增",
   "luckda.lowcode.painter.edit": "编辑",
+  "luckda.lowcode.painter.bind": "绑定动作",
   "luckda.lowcode.painter.panel-section.tableTopFilter.label": "名称",
   "luckda.lowcode.painter.panel-section.tableTopFilter.label.placeholder": "请输入过滤项名称",
   "luckda.lowcode.painter.panel-section.tableTopFilter.value": "值",

package/es/lowcode/constants/api-url.js

@@ -393,13 +393,6 @@ function _fetchAllBehavior() {
 export function fetchAllSerials(_x19) {
   return _fetchAllSerials.apply(this, arguments);
 }
-
-/**
- * 执行行为
- * @param {*} params
- * @param {*} data
- * @returns
- */
 function _fetchAllSerials() {
   _fetchAllSerials = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
     return _regeneratorRuntime().wrap(function _callee16$(_context16) {
@@ -416,6 +409,17 @@ function _fetchAllSerials() {
   }));
   return _fetchAllSerials.apply(this, arguments);
 }
+export function getBehaviorUrl() {
+  var mdCode = window[DATA_MODEL_CODE_KEY];
+  return "".concat(api.API_HOST, "/").concat(mdCode, "/to/behavior/call");
+}
+
+/**
+ * 执行行为
+ * @param {*} params
+ * @param {*} data
+ * @returns
+ */
 export function fetchCallBehavior(_x20, _x21) {
   return _fetchCallBehavior.apply(this, arguments);
 }
@@ -427,12 +431,10 @@ export function fetchCallBehavior(_x20, _x21) {
  */
 function _fetchCallBehavior() {
   _fetchCallBehavior = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params, data) {
-    var mdCode;
     return _regeneratorRuntime().wrap(function _callee17$(_context17) {
       while (1) switch (_context17.prev = _context17.next) {
         case 0:
-          mdCode = window[DATA_MODEL_CODE_KEY];
-          return _context17.abrupt("return", request("".concat(api.API_HOST, "/").concat(mdCode, "/to/behavior/call"), {
+          return _context17.abrupt("return", request(getBehaviorUrl(), {
             method: 'POST',
             data: data,
             params: params,
@@ -440,7 +442,7 @@ function _fetchCallBehavior() {
               'Content-Type': 'application/json;charset=UTF-8'
             }
           }));
-        case 2:
+        case 1:
         case "end":
           return _context17.stop();
       }

package/es/lowcode/engine/factory/panel-item-factory/SelectStrategy.js

@@ -6,15 +6,18 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["options", "onChange"];
+import React from 'react';
 import { Select } from 'luck-design/antd';
 import Strategy from "./Strategy";
 var _TYPE_ = 'select';
 var SelectComp = function SelectComp(_ref) {
   var options = _ref.options,
-    onChange = _ref.onChange,
+    _onChange = _ref.onChange,
     props = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React.createElement(Select, _extends({
-    onChange: onChange,
+    onChange: function onChange(val) {
+      return _onChange(val);
+    },
     getPopupContainer: function getPopupContainer() {
       return document.getElementById('lc-design-workspace');
     }

package/es/lowcode/engine/factory/panel-item-factory/SwitchStrategy.js

@@ -3,17 +3,20 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import React from 'react';
 import { Switch } from 'luck-design/antd';
 import Strategy from "./Strategy";
 var _TYPE_ = 'switch';
 var SwitchComp = function SwitchComp(_ref) {
   var defaultValue = _ref.defaultValue,
-    onChange = _ref.onChange,
+    _onChange = _ref.onChange,
     size = _ref.size;
   return /*#__PURE__*/React.createElement(Switch, {
     defaultChecked: defaultValue,
     size: size,
-    onChange: onChange
+    onChange: function onChange(val) {
+      return _onChange(val);
+    }
   });
 };
 var SelectStrategy = /*#__PURE__*/function (_Strategy) {

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

@@ -8,13 +8,18 @@
   "order": 1,
   "title": "对话框",
   "width": "700px",
-  "height": "60vh",
-  "fullScreen": false,
-  "fullable": true,
+  "height": "50vh",
   "defaultOpen": false,
-  "mask": false,
-  "keyboard": true,
+  "mask": true,
+  "okText": "确定",
+  "cancelText": "取消",
   "footer": true,
+  "btnGroup": {
+    "display": "button",
+    "max": 2,
+    "moreText": "操作",
+    "todoList": []
+  },
   "advance": {
     "events": {}
   }

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

@@ -9,7 +9,7 @@
   "props": [
     {
       "key": "id",
-      "desc": "唯一标识",
+      "name": "唯一标识",
       "type": "string",
       "disabled": true
     },
@@ -22,65 +22,95 @@
     },
     {
       "key": "width",
-      "name": "宽度",
-      "desc": "对话框的宽度",
-      "type": "string",
+      "name": "对话框宽度",
+      "type": "_WidthHeight",
+      "options": [
+        {
+          "label": "px",
+          "value": "px"
+        },
+        {
+          "label": "%",
+          "value": "%"
+        },
+        {
+          "label": "vw",
+          "value": "vw"
+        },
+        {
+          "label": "A",
+          "value": "auto"
+        }
+      ],
       "default": "700px"
     },
     {
       "key": "height",
-      "name": "高度",
-      "desc": "对话框的高度",
-      "type": "string",
-      "default": "60vh"
-    },
-    {
-      "key": "fullScreen",
-      "name": "默认全屏",
-      "desc": "对话框打开默认全屏",
-      "type": "boolean",
-      "default": false
-    },
-    {
-      "key": "fullable",
-      "name": "支持全屏切换",
-      "desc": "可以通过右上角按钮切换全屏状态",
-      "type": "boolean",
-      "default": true
+      "name": "内容区高度",
+      "type": "_WidthHeight",
+      "options": [
+        {
+          "label": "px",
+          "value": "px"
+        },
+        {
+          "label": "vh",
+          "value": "vh"
+        },
+        {
+          "label": "A",
+          "value": "auto"
+        }
+      ],
+      "default": "50vh"
     },
     {
       "key": "defaultOpen",
       "name": "默认显示",
       "desc": "默认是否显示",
-      "type": "boolean",
+      "type": "switch",
       "default": false
     },
     {
       "key": "mask",
       "name": "显示遮罩",
-      "desc": "是否展示遮罩",
-      "type": "boolean",
-      "default": false
+      "type": "switch",
+      "default": true
     },
     {
-      "key": "keyboard",
-      "name": "ESC关闭",
-      "desc": "是否支持键盘 esc 关闭",
-      "type": "boolean",
-      "default": true
+      "key": "okText",
+      "name": "确认文字",
+      "type": "_I18nInput",
+      "default": "确定"
+    },
+    {
+      "key": "cancelText",
+      "name": "取消文字",
+      "type": "_I18nInput",
+      "default": "取消"
     },
     {
       "key": "footer",
-      "name": "底部按钮是否显示",
+      "name": "显示footer",
       "desc": "是否显示底部按钮区域",
-      "type": "boolean",
+      "type": "switch",
       "default": true
     },
     {
       "key": "btnGroup",
       "name": "按钮组",
       "desc": "底部按钮区域的按钮组（参考按钮配置）",
-      "type": "_ActionSelector"
+      "type": "_ActionsEditor",
+      "default": {
+        "display": "button",
+        "max": 2,
+        "moreText": "操作",
+        "todoList": []
+      },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {
@@ -89,31 +119,31 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "()=>{\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "(params)=>{\n\t\n}"
+        "func": "()=>{\n\t\n}"
       },
       {
         "key": "onOpen",
         "name": "对话框打开时",
         "desc": "在对话框打开时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "()=>{\n\t\n}"
       },
       {
         "key": "onClose",
         "name": "对话框关闭时",
         "desc": "在对话框打开时，执行方法，promise反馈false无法截断关闭",
-        "func": "(params)=>{\n\t\n}"
+        "func": "()=>{\n\t\n}"
       },
       {
-        "key": "onButtonClick",
-        "name": "按钮组点击",
-        "desc": "点击按钮组某个按钮时，执行方法",
-        "func": "(buttonKey,params)=>{\n\t\n}"
+        "key": "onOk",
+        "name": "确定按钮点击",
+        "desc": "点击确定按钮时，执行方法",
+        "func": "()=>{\n\t\n}"
       }
     ]
   }