@luck-design-biz/luckda 0.0.25-21 → 0.0.25-23

package/lib/lowcode/painter/DesignToolbar.js

@@ -26,7 +26,6 @@ var _constants = require("../constants");
 var _design = _interopRequireDefault(require("./style/design.less"));
 var _apiUrl = require("../constants/api-url");
 var _helper = require("../engine/tools/helper");
-var _services = require("@luck-design-biz/base/lib/sys/services");
 var _excluded = ["key", "label"];
 var DesignToolbar = function DesignToolbar(_ref) {
   var locale = _ref.locale,
@@ -176,19 +175,19 @@ var DesignToolbar = function DesignToolbar(_ref) {
   });
   var _useDebounceFn = (0, _ahooks.useDebounceFn)( /*#__PURE__*/function () {
       var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(value) {
-        var _yield$readAllUser, code, list, detail;
+        var _yield$fetchSearchUse, code, list, detail;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return (0, _services.readAllUser)({
+              return (0, _apiUrl.fetchSearchUser)({
                 sname: value
               });
             case 2:
-              _yield$readAllUser = _context2.sent;
-              code = _yield$readAllUser.code;
-              list = _yield$readAllUser.list;
-              detail = _yield$readAllUser.detail;
+              _yield$fetchSearchUse = _context2.sent;
+              code = _yield$fetchSearchUse.code;
+              list = _yield$fetchSearchUse.list;
+              detail = _yield$fetchSearchUse.detail;
               if (code === 1) {
                 setUserOptions(list.map(function (id) {
                   var item = detail[id];

package/lib/lowcode/painter/Outline.js

@@ -179,7 +179,6 @@ var Outline = function Outline(_ref) {
         handleSelect(null);
       } else {
         // 选中节点是模态视图下的子组件，则打开该组件的模态视图组件
-        handleSelect(node.props.eventKey);
         var _split3 = (0, _lodash.split)((0, _dataProcess.getPathById)(pageData, node.props.eventKey), '/'),
           _split4 = (0, _slicedToArray2.default)(_split3, 1),
           parentModal = _split4[0];
@@ -187,6 +186,7 @@ var Outline = function Outline(_ref) {
           toggle: true,
           id: parentModal
         });
+        handleSelect(node.props.eventKey);
       }
     },
     expandedKeys: modalExpandedKeys,
@@ -194,11 +194,11 @@ var Outline = function Outline(_ref) {
       var expanded = _ref6.expanded,
         node = _ref6.node;
       if (expanded && node.props.pos.split('-').length === 2) {
-        handleSelect(null);
         ctx.$publisher(ctx.topics.COMPONENT_MODAL_TOGGLE, {
           toggle: true,
           id: node.props.eventKey
         });
+        handleSelect(node.props.eventKey);
       }
       setModalExpandedKeys(_keys);
     }

package/lib/lowcode/painter/components/code-editor/BaseEditor.js

@@ -10,7 +10,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
 var monaco = _interopRequireWildcard(require("monaco-editor"));
+var _standalone = _interopRequireDefault(require("prettier/standalone"));
+var _parserBabel = _interopRequireDefault(require("prettier/parser-babel"));
 var _excluded = ["onChange", "isFullscreen", "style"],
   _excluded2 = ["children", "language", "options"];
 /**
@@ -59,6 +62,14 @@ var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     rest = (0, _objectWithoutProperties2.default)(props, _excluded2);
   var editorRef = (0, _react.useRef)(null);
   var editorInstance = (0, _react.useRef)(null);
+  var prettierFormetter = (0, _ahooks.useMemoizedFn)(function (unformattedCode) {
+    return _standalone.default.format(unformattedCode, {
+      parser: 'babel',
+      plugins: [_parserBabel.default],
+      tabWidth: 2,
+      useTabs: false
+    });
+  });
 
   // 初始化编辑器实例
   (0, _react.useEffect)(function () {
@@ -67,7 +78,9 @@ var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       editorInstance.current = monaco.editor.create(editorRef.current, (0, _objectSpread2.default)({
         value: code,
         language: language,
-        automaticLayout: true
+        automaticLayout: true,
+        autoIndent: true,
+        tabSize: 2
       }, options), {
         storageService: {
           get: function get() {},
@@ -81,6 +94,14 @@ var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
           onDidChangeStorage: function onDidChangeStorage() {}
         }
       });
+      var originalGetValue = editorInstance.current.getValue.bind(editorInstance.current);
+      editorInstance.current.getValue = function () {
+        return prettierFormetter(originalGetValue());
+      };
+      editorInstance.current.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KeyF, function () {
+        var formattedCode = prettierFormetter(originalGetValue());
+        editorInstance.current.setValue(formattedCode);
+      });
       editorInstance.current.onDidChangeModelContent(function (event) {
         if (onChange) onChange(editorInstance.current.getValue(), event);
       });

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

@@ -0,0 +1,70 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
+var _antd = require("luck-design/antd");
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _PopConfirm = _interopRequireDefault(require("../components/PopConfirm"));
+var _FullScreenEditor = _interopRequireDefault(require("../components/code-editor/FullScreenEditor"));
+var _JSEditor = _interopRequireDefault(require("../components/code-editor/JSEditor"));
+var _OPTIONS_ = [{
+  label: '普通',
+  value: 'normal'
+}, {
+  label: '禁用',
+  value: 'disabled'
+}, {
+  label: '只读',
+  value: 'readonly'
+}, {
+  label: '隐藏',
+  value: 'hidden'
+}];
+var _DEFAULT_FUNC_ = 'function isTrue() {\n return true; \n}';
+var Wrapper = _styledComponents.default.div.withConfig({
+  displayName: "Wrapper",
+  componentId: "luckda-6530__sc-xdk08r-0"
+})(["width:100%;display:flex;justify-content:space-between;align-items:center;padding:0 16px;"]);
+var FieldState = function FieldState(_ref) {
+  var defaultValue = _ref.defaultValue,
+    onChange = _ref.onChange;
+  var editorRef = (0, _react.useRef)();
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (key, val) {
+    var retVal = defaultValue || {};
+    retVal[key] = val;
+    onChange(retVal);
+  });
+  return /*#__PURE__*/_react.default.createElement(Wrapper, null, /*#__PURE__*/_react.default.createElement(_antd.Segmented, {
+    style: {
+      width: '90%'
+    },
+    options: _OPTIONS_,
+    defaultValue: (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.value) || 'normal',
+    onChange: function onChange(val) {
+      return handleChange('value', val);
+    }
+  }), /*#__PURE__*/_react.default.createElement(_PopConfirm.default, {
+    placement: "left",
+    title: /*#__PURE__*/_react.default.createElement(_FullScreenEditor.default, {
+      ref: editorRef,
+      EditorComponent: _JSEditor.default,
+      width: "600px",
+      height: "400px"
+    }, (defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.code) || _DEFAULT_FUNC_),
+    showBtn: true,
+    onConfirm: function onConfirm() {
+      var val = editorRef.current.editor.getValue();
+      editorRef.current.editor.setValue(val);
+      handleChange('code', val);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+    type: "code"
+  })));
+};
+var _default = exports.default = FieldState;

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

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,13 +10,13 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _index = _interopRequireDefault(require("./index"));
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _index2 = _interopRequireDefault(require("./index.less"));
+require("./index.less");
 var _boxPropsDefault = _interopRequireDefault(require("../../../engine/meta/box.props.default.json"));
 var _excluded = ["id", "children", "className"];
 var FunctionDesign = function FunctionDesign(_ref) {
@@ -23,7 +24,19 @@ var FunctionDesign = function FunctionDesign(_ref) {
     children = _ref.children,
     className = _ref.className,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var apiRef = (0, _react.useRef)();
   var ctx = (0, _ContextProvider.useContext)();
+  (0, _react.useImperativeHandle)(apiRef, function () {
+    return {
+      open: true,
+      doOpen: function doOpen() {
+        ctx.componentMap.get(id).api.getSelfDom().closest('.ant-modal-root').style.display = 'block';
+      },
+      doClose: function doClose() {
+        ctx.componentMap.get(id).api.getSelfDom().closest('.ant-modal-root').style.display = 'none';
+      }
+    };
+  }, []);
   (0, _ahooks.useCreation)(function () {
     if (children !== null && children !== void 0 && children.length) return;
     ctx.$subscriber(ctx.topics.COMPONENT_APPEND).once(function (_ref2) {
@@ -36,11 +49,14 @@ var FunctionDesign = function FunctionDesign(_ref) {
   }, []);
   return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({
     id: id,
-    wrapClassName: (0, _classnames.default)(_index2.default['runtime-design'], (0, _defineProperty2.default)({}, className, !!className)),
+    wrapClassName: (0, _classnames.default)('runtime-design', (0, _defineProperty2.default)({}, className, !!className)),
     getContainer: false,
     maskStyle: {
       position: 'absolute'
     }
-  }, props), children);
+  }, props, {
+    defaultOpen: true,
+    $apiRef: apiRef
+  }), children);
 };
 var _default = exports.default = FunctionDesign;

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

@@ -43,7 +43,8 @@ var LCDialog = function LCDialog(_ref) {
     destroyOnClose = _ref.destroyOnClose,
     footer = _ref.footer,
     btnGroup = _ref.btnGroup,
-    advance = _ref.advance;
+    advance = _ref.advance,
+    $apiRef = _ref.$apiRef;
   var ctx = (0, _ContextProvider.useContext)();
   var apiRef = (0, _react.useRef)();
   var domRef = (0, _react.useRef)();
@@ -157,7 +158,7 @@ var LCDialog = function LCDialog(_ref) {
     id: id,
     displayName: "Dialog",
     getTargetDom: getTargetDom,
-    api: apiRef
+    api: $apiRef || apiRef
   }, /*#__PURE__*/_react.default.createElement(_antd.Modal, (0, _extends2.default)({
     title: _title,
     visible: open,

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

@@ -1,3 +1,8 @@
-.lc-component-dialog-wrapper.runtime-design {
-  position: absolute !important;
+:global {
+  .runtime-design {
+    position: absolute !important;
+  }
+  div.ant-modal-root:has(> .runtime-design) {
+    display: none;
+  }
 }

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

@@ -113,6 +113,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -89,6 +89,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -107,6 +107,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -106,6 +106,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -100,6 +100,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -123,6 +123,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -110,6 +110,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -83,6 +83,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -83,6 +83,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -96,6 +96,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -108,6 +108,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -93,6 +93,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -99,6 +99,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -127,6 +127,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -132,6 +132,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -97,6 +97,17 @@
           "type": "_I18nInput"
         }
       ]
+    },
+    {
+      "key": "state",
+      "name": "状态",
+      "desc": "表单项的初始化状态",
+      "type": "_FieldState",
+      "default": { "value": "normal" },
+      "wrapper": "collapse",
+      "wrapperProps": {
+        "suppressIcon": true
+      }
     }
   ],
   "advance": {

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

@@ -26,8 +26,9 @@ var _Form = _interopRequireDefault(require("../../../../upload/Form"));
 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"];
+var _excluded = ["advance", "state"];
 var _I18N_PREFIX_ = 'lc.form.validator';
 var Header = function Header(_ref2) {
   var _ref2$header = _ref2.header,
@@ -327,10 +328,20 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
     return props;
   };
   var transEventsInfields = function transEventsInfields(fields) {
-    return (fields === null || fields === void 0 ? void 0 : fields.map(function (setting) {
+    return (0, _lodash.reduce)(fields, function (result, setting) {
       var advance = setting.advance,
+        _state = setting.state,
         rest = (0, _objectWithoutProperties2.default)(setting, _excluded);
-      var props = (0, _lodash.reduce)(rest, function (result, value, key) {
+      var isShow = true;
+      if (ctx.runtime !== _constants.RUNTIME.DESIGN && _state) {
+        if (_state.value === 'hidden') {
+          isShow = _state.code ? !(0, _helper.executeCode)(ctx, _state.code) : false;
+        }
+        if (_state.value === 'normal' && _state.code) {
+          isShow = (0, _helper.executeCode)(ctx, _state.code);
+        }
+      }
+      var _props = (0, _lodash.reduce)(rest, function (result, value, key) {
         //处理方法
         result[key] = (0, _lodash.isString)(value) && (0, _lodash.startsWith)(value, 'function') ? function () {
           for (var _len = arguments.length, _props = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -340,8 +351,19 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
         } : value;
         return result;
       }, {});
-      if (advance !== null && advance !== void 0 && advance.events) return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-        events: (0, _lodash.reduce)(advance.events, function (result, value, key) {
+      _props.isShow = isShow;
+      if ((_state === null || _state === void 0 ? void 0 : _state.value) === 'readonly') {
+        _props.config = {
+          readOnly: _state.code ? (0, _helper.executeCode)(ctx, _state.code) : true
+        };
+      }
+      if ((_state === null || _state === void 0 ? void 0 : _state.value) === 'disabled') {
+        _props.config = {
+          disabled: _state.code ? (0, _helper.executeCode)(ctx, _state.code) : true
+        };
+      }
+      result.push((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+        events: advance !== null && advance !== void 0 && advance.events ? (0, _lodash.reduce)(advance.events, function (result, value, key) {
           //处理事件
           result[key] = function () {
             for (var _len2 = arguments.length, props = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
@@ -353,10 +375,10 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
             }, {}));
           };
           return result;
-        }, {})
-      });
-      return props;
-    })) || [];
+        }, {}) : null
+      }));
+      return result;
+    }, []);
   };
   var renderFormList = (0, _ahooks.useMemoizedFn)(function (formConfig) {
     return (0, _lodash.reduce)(_blocks, function (result, item) {