@luck-design-biz/luckda 0.0.25-6 → 0.0.25-8

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

@@ -1,60 +1,155 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _index = require("../../../../index");
+var _ContextProvider = require("../../../engine/provider/ContextProvider");
+var _usePromiseState5 = _interopRequireDefault(require("../../../engine/tools/usePromiseState"));
 var _Wrapper = _interopRequireDefault(require("../Wrapper"));
-var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["id", "children", "getContainer", "wrapClassName", "maskStyle"];
+var _index2 = _interopRequireDefault(require("./index.less"));
+var Footer = _styledComponents.default.div.withConfig({
+  displayName: "Footer",
+  componentId: "luckda-6530__sc-1aeozvd-0"
+})(["width:100%;display:flex;justify-content:flex-end;"]);
 var LCDialog = function LCDialog(_ref) {
   var id = _ref.id,
     children = _ref.children,
+    title = _ref.title,
+    width = _ref.width,
+    height = _ref.height,
     getContainer = _ref.getContainer,
     wrapClassName = _ref.wrapClassName,
     maskStyle = _ref.maskStyle,
-    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+    defaultOpen = _ref.defaultOpen,
+    mask = _ref.mask,
+    okText = _ref.okText,
+    cancelText = _ref.cancelText,
+    footer = _ref.footer,
+    btnGroup = _ref.btnGroup,
+    advance = _ref.advance;
+  var ctx = (0, _ContextProvider.useContext)();
   var apiRef = (0, _react.useRef)();
   var domRef = (0, _react.useRef)();
-  var _useBoolean = (0, _ahooks.useBoolean)(false),
-    _useBoolean2 = (0, _slicedToArray2.default)(_useBoolean, 2),
-    open = _useBoolean2[0],
-    _useBoolean2$ = _useBoolean2[1],
-    setTrue = _useBoolean2$.setTrue,
-    setFalse = _useBoolean2$.setFalse,
-    toggle = _useBoolean2$.toggle;
+  var _usePromiseState = (0, _usePromiseState5.default)(defaultOpen),
+    _usePromiseState2 = (0, _slicedToArray2.default)(_usePromiseState, 2),
+    open = _usePromiseState2[0],
+    setOpen = _usePromiseState2[1];
+  var _usePromiseState3 = (0, _usePromiseState5.default)(title),
+    _usePromiseState4 = (0, _slicedToArray2.default)(_usePromiseState3, 2),
+    _title = _usePromiseState4[0],
+    _setTitle = _usePromiseState4[1];
+  (0, _react.useEffect)(function () {
+    ctx.doAction(advance.events.onMount);
+    return function () {
+      _setTitle(title);
+      ctx.doAction(advance.events.onUnmount);
+    };
+  }, []);
+  (0, _ahooks.useUpdateEffect)(function () {
+    if (open) {
+      ctx.doAction(advance.events.onOpen);
+    } else {
+      ctx.doAction(advance.events.onClose);
+    }
+  }, [open]);
+  var handleOk = (0, _ahooks.useMemoizedFn)(function () {
+    ctx.doAction(advance.events.onOk);
+  });
+  var _footer = (0, _ahooks.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 {};
+    return {
+      footer: /*#__PURE__*/_react.default.createElement(Footer, null, /*#__PURE__*/_react.default.createElement(_index.LDActions, (0, _extends2.default)({}, btnGroup, {
+        doAction: function doAction(action) {
+          return ctx.doAction(action);
+        }
+      })), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+        onClick: function onClick() {
+          return setOpen(false);
+        },
+        style: {
+          marginLeft: 8
+        }
+      }, cancelText), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+        type: "primary",
+        onClick: handleOk
+      }, okText))
+    };
+  }, [footer, btnGroup]);
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     var _domRef$current;
     return (_domRef$current = domRef.current) === null || _domRef$current === void 0 ? void 0 : _domRef$current.closest('.ant-modal-content');
   });
   (0, _react.useImperativeHandle)(apiRef, function () {
     return {
+      /**
+       * 弹窗打开状态
+       * @property
+       */
       open: open,
-      doOpen: setTrue,
-      doClose: setFalse,
-      toggle: toggle
+      /**
+       * 打开弹窗
+       * @method
+       */
+      doOpen: function doOpen() {
+        return setOpen(true);
+      },
+      /**
+       * 关闭弹窗
+       * @method
+       */
+      doClose: function doClose() {
+        return setOpen(false);
+      },
+      /**
+       * 设置弹窗标题
+       * @method
+       * @param {stirng} title -标题
+       */
+      setTitle: function setTitle(_title) {
+        return _setTitle(_title);
+      }
     };
-  });
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_Wrapper.default, {
     id: id,
     displayName: "Dialog",
     getTargetDom: getTargetDom,
     api: apiRef
-  }, /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+  }, /*#__PURE__*/_react.default.createElement(_antd.Modal, (0, _extends2.default)({
+    title: _title,
     visible: open,
     getContainer: getContainer,
+    width: width,
+    mask: mask,
     maskStyle: maskStyle,
-    wrapClassName: (0, _classnames.default)(_index.default['lc-component-dialog-wrapper'], (0, _defineProperty2.default)({}, wrapClassName, !!wrapClassName))
-  }, /*#__PURE__*/_react.default.createElement("div", {
+    bodyStyle: {
+      height: height,
+      overflowY: 'auto',
+      marginTop: 0
+    },
+    wrapClassName: (0, _classnames.default)(_index2.default['lc-component-dialog-wrapper'], (0, _defineProperty2.default)({}, wrapClassName, !!wrapClassName))
+  }, _footer, {
+    onOk: handleOk,
+    onCancel: function onCancel() {
+      return setOpen(false);
+    }
+  }), /*#__PURE__*/_react.default.createElement("div", {
     style: {
       height: 0,
       width: 0,

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

@@ -9,7 +9,7 @@
   "props": [
     {
       "key": "id",
-      "desc": "唯一标识",
+      "name": "唯一标识",
       "type": "string",
       "disabled": true
     },
@@ -22,65 +22,88 @@
     },
     {
       "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 +112,31 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onMount() {\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onUnmount() {\n\t\n}"
       },
       {
         "key": "onOpen",
         "name": "对话框打开时",
         "desc": "在对话框打开时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onOpen() {\n\t\n}"
       },
       {
         "key": "onClose",
         "name": "对话框关闭时",
         "desc": "在对话框打开时，执行方法，promise反馈false无法截断关闭",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onClose() {\n\t\n}"
       },
       {
-        "key": "onButtonClick",
-        "name": "按钮组点击",
-        "desc": "点击按钮组某个按钮时，执行方法",
-        "func": "(buttonKey,params)=>{\n\t\n}"
+        "key": "onOk",
+        "name": "确定按钮点击",
+        "desc": "点击确定按钮时，执行方法",
+        "func": "function onOk() {\n\t\n}"
       }
     ]
   }

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

@@ -100,43 +100,31 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onMount() {\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "(params)=>{\n\t\n}"
-      },
-      {
-        "key": "onMount",
-        "name": "组件首次渲染时",
-        "desc": "在组件首次渲染时，执行方法",
-        "func": "(params)=>{\n\t\n}"
-      },
-      {
-        "key": "onUnmount",
-        "name": "组件卸载时",
-        "desc": "在组件卸载时，执行方法。",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onUnmount() {\n\t\n}"
       },
       {
         "key": "onOpen",
         "name": "抽屉打开时",
         "desc": "在抽屉打开时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onOpen() {\n\t\n}"
       },
       {
         "key": "onClose",
         "name": "抽屉关闭时",
         "desc": "在抽屉打开时，执行方法，promise反馈false无法截断关闭",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onClose() {\n\t\n}"
       },
       {
-        "key": "onButtonClick",
-        "name": "按钮组点击",
-        "desc": "点击按钮组某个按钮时，执行方法",
-        "func": "(buttonKey,params)=>{\n\t\n}"
+        "key": "onOk",
+        "name": "确定按钮点击",
+        "desc": "点击确定按钮时，执行方法",
+        "func": "function onOk() {\n\t\n}"
       }
     ]
   }

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

@@ -16,7 +16,6 @@ var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
-var _dataProcess = require("../../../engine/tools/dataProcess");
 var _boxPropsDefault = _interopRequireDefault(require("../../../engine/meta/box.props.default.json"));
 var _index = _interopRequireDefault(require("./index"));
 var _excluded = ["children", "blocks", "id"];
@@ -27,38 +26,32 @@ var FunctionDesign = function FunctionDesign(_ref) {
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var ref = (0, _react.useRef)(null);
   var ctx = (0, _ContextProvider.useContext)();
-  var _usePageData = (0, _ContextProvider.usePageData)(),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 2),
-    setPageData = _usePageData2[1].setPageData;
+  var current = (0, _ContextProvider.useGet)({
+    id: id
+  });
   var previousBlocks = (0, _ahooks.usePrevious)((0, _lodash.cloneDeep)(blocks), function (prev, next) {
     return !(0, _lodash.isEqual)(prev, next);
   });
   (0, _ahooks.useUpdateLayoutEffect)(function () {
-    var diffDataset = (0, _lodash.differenceWith)(blocks, previousBlocks, function (arrVal, othVal) {
-      var _arrVal$dataset, _othVal$dataset;
-      return arrVal.id === othVal.id && ((_arrVal$dataset = arrVal.dataset) === null || _arrVal$dataset === void 0 ? void 0 : _arrVal$dataset.code) === ((_othVal$dataset = othVal.dataset) === null || _othVal$dataset === void 0 ? void 0 : _othVal$dataset.code);
-    });
-    diffDataset.forEach(function (df) {
-      var _df$dataset;
-      ((_df$dataset = df.dataset) === null || _df$dataset === void 0 ? void 0 : _df$dataset.code) && ref.current.doQueryOne(df.id);
-    });
-    var diffColReset = (0, _lodash.differenceWith)(blocks, previousBlocks, function (arrVal, othVal) {
-      return arrVal.id === othVal.id && arrVal.actionsColumnReset === othVal.actionsColumnReset;
-    });
-    diffColReset.forEach(function (df) {
-      var _ctx$componentMap$get2;
-      var _ctx$componentMap$get = (_ctx$componentMap$get2 = ctx.componentMap.get(id)) === null || _ctx$componentMap$get2 === void 0 ? void 0 : _ctx$componentMap$get2.api.getForm().getFormRef(df.id).formRef.current,
-        gridApi = _ctx$componentMap$get.gridApi;
-      gridApi.api.refreshCells({
-        columns: ['luck-actions'],
-        force: true
-      });
+    var blocksObj = (0, _lodash.keyBy)(blocks, 'id');
+    var previousBlocksObj = (0, _lodash.keyBy)(previousBlocks, 'id');
+    (0, _lodash.forEach)(blocksObj, function (value, key) {
+      var _value$dataset, _previousBlocksObj$ke, _value$dataset2, _previousBlocksObj$ke2;
+      if (((_value$dataset = value.dataset) === null || _value$dataset === void 0 ? void 0 : _value$dataset.code) !== ((_previousBlocksObj$ke = previousBlocksObj[key]) === null || _previousBlocksObj$ke === void 0 || (_previousBlocksObj$ke = _previousBlocksObj$ke.dataset) === null || _previousBlocksObj$ke === void 0 ? void 0 : _previousBlocksObj$ke.code)) ((_value$dataset2 = value.dataset) === null || _value$dataset2 === void 0 ? void 0 : _value$dataset2.code) && ref.current.doQueryOne(key);
+      if (value.actionsColumnReset !== ((_previousBlocksObj$ke2 = previousBlocksObj[key]) === null || _previousBlocksObj$ke2 === void 0 ? void 0 : _previousBlocksObj$ke2.actionsColumnReset)) {
+        var _ctx$componentMap$get2;
+        var _ctx$componentMap$get = (_ctx$componentMap$get2 = ctx.componentMap.get(id)) === null || _ctx$componentMap$get2 === void 0 ? void 0 : _ctx$componentMap$get2.api.getForm().getFormRef(key).formRef.current,
+          gridApi = _ctx$componentMap$get.gridApi;
+        gridApi.api.refreshCells({
+          columns: ['luck-actions'],
+          force: true
+        });
+      }
     });
   }, [JSON.stringify(blocks)]);
   (0, _react.useEffect)(function () {
     var cmid = ctx.$subscriber(ctx.topics.COMPONENT_MODIFY).on(function (_ref2) {
       var compId = _ref2.id,
-        pageData = _ref2.pageData,
         newValue = _ref2.newValue,
         oldValue = _ref2.oldValue;
       if (compId !== id || !newValue.hasOwnProperty('blocks')) return;
@@ -68,25 +61,21 @@ var FunctionDesign = function FunctionDesign(_ref) {
           newItem = _differenceBy2[0];
         if (newItem.type === 'blank') {
           var boxId = "box_".concat((0, _utils.suid)());
-          (0, _dataProcess.add)(pageData, id, boxId, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _boxPropsDefault.default), {}, {
+          (0, _ContextProvider.addNode)(id, boxId, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _boxPropsDefault.default), {}, {
             buildIn: true,
             formBoxId: newItem.id
           }));
-          setPageData(pageData);
         }
       } else if (newValue.blocks.length < oldValue.blocks.length) {
         var _differenceBy3 = (0, _lodash.differenceBy)(oldValue.blocks, newValue.blocks, 'id'),
           _differenceBy4 = (0, _slicedToArray2.default)(_differenceBy3, 1),
           removeItem = _differenceBy4[0];
         if (removeItem.type === 'blank') {
-          var _findNodeAndParent = (0, _dataProcess.findNodeAndParent)(id, pageData),
-            current = _findNodeAndParent.node;
           var _boxId = current.children.find(function (childId) {
-            return current[childId].props.tabId === removeItem.id;
+            return current[childId].props.formBoxId === removeItem.id;
           });
           ctx.$publisher(ctx.topics.COMPONENT_DELETE, {
-            id: _boxId,
-            pageData: pageData
+            id: _boxId
           });
         }
       }

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _index = _interopRequireDefault(require("./index"));
@@ -12,6 +14,11 @@ var _excluded = ["children"];
 var FunctionPreview = function FunctionPreview(_ref) {
   var children = _ref.children,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/_react.default.createElement(_index.default, props, children);
+  return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({}, props, {
+    initData: {
+      formMode: 'update',
+      ticketData: (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, 'test')
+    }
+  }), children);
 };
 var _default = exports.default = FunctionPreview;