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

package/es/lowcode/painter/DesignToolbar.js

@@ -17,9 +17,8 @@ import JsonEditor from "../painter/components/code-editor/JsonEditor";
 import PreviewIframe from "./components/PreviewIframe";
 import { LC_BUILDIN_UNIT_KEY, COOKIE_VIRTUAL_ACCOUNT_KEY } from "../constants";
 import styles from "./style/design.less";
-import { fetchClearCache, fetchUpdatePageData } from "../constants/api-url";
+import { fetchClearCache, fetchUpdatePageData, fetchSearchUser } from "../constants/api-url";
 import { getLDMetaAttr } from "../engine/tools/helper";
-import { readAllUser } from '@luck-design-biz/base/lib/sys/services';
 var DesignToolbar = function DesignToolbar(_ref) {
   var locale = _ref.locale,
     onLangChange = _ref.onLangChange;
@@ -168,19 +167,19 @@ var DesignToolbar = function DesignToolbar(_ref) {
   });
   var _useDebounceFn = useDebounceFn( /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
-        var _yield$readAllUser, code, list, detail;
+        var _yield$fetchSearchUse, code, list, detail;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return readAllUser({
+              return 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/es/lowcode/painter/Outline.js

@@ -171,7 +171,6 @@ var Outline = function Outline(_ref) {
         handleSelect(null);
       } else {
         // 选中节点是模态视图下的子组件，则打开该组件的模态视图组件
-        handleSelect(node.props.eventKey);
         var _split3 = split(getPathById(pageData, node.props.eventKey), '/'),
           _split4 = _slicedToArray(_split3, 1),
           parentModal = _split4[0];
@@ -179,6 +178,7 @@ var Outline = function Outline(_ref) {
           toggle: true,
           id: parentModal
         });
+        handleSelect(node.props.eventKey);
       }
     },
     expandedKeys: modalExpandedKeys,
@@ -186,11 +186,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/es/lowcode/painter/components/code-editor/BaseEditor.js

@@ -4,7 +4,10 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["onChange", "isFullscreen", "style"],
   _excluded2 = ["children", "language", "options"];
 import React, { useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
+import { useMemoizedFn } from 'ahooks';
 import * as monaco from 'monaco-editor';
+import prettier from 'prettier/standalone';
+import parserBabel from 'prettier/parser-babel';
 
 /**
  * BaseEditor 组件是一个封装了 monaco 编辑器的 React 组件，支持前向 ref 引用。
@@ -52,6 +55,14 @@ var BaseEditor = /*#__PURE__*/forwardRef(function (_ref, ref) {
     rest = _objectWithoutProperties(props, _excluded2);
   var editorRef = useRef(null);
   var editorInstance = useRef(null);
+  var prettierFormetter = useMemoizedFn(function (unformattedCode) {
+    return prettier.format(unformattedCode, {
+      parser: 'babel',
+      plugins: [parserBabel],
+      tabWidth: 2,
+      useTabs: false
+    });
+  });
 
   // 初始化编辑器实例
   useEffect(function () {
@@ -60,7 +71,9 @@ var BaseEditor = /*#__PURE__*/forwardRef(function (_ref, ref) {
       editorInstance.current = monaco.editor.create(editorRef.current, _objectSpread({
         value: code,
         language: language,
-        automaticLayout: true
+        automaticLayout: true,
+        autoIndent: true,
+        tabSize: 2
       }, options), {
         storageService: {
           get: function get() {},
@@ -74,6 +87,14 @@ var BaseEditor = /*#__PURE__*/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/es/lowcode/painter/panel-section/FieldState.js

@@ -0,0 +1,62 @@
+import React, { useRef } from 'react';
+import { useMemoizedFn } from 'ahooks';
+import { Segmented, Icon } from 'luck-design/antd';
+import styled from 'styled-components';
+import PopConfirm from "../components/PopConfirm";
+import FullScreenEditor from "../components/code-editor/FullScreenEditor";
+import JSEditor from "../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 = styled.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 = useRef();
+  var handleChange = useMemoizedFn(function (key, val) {
+    var retVal = defaultValue || {};
+    retVal[key] = val;
+    onChange(retVal);
+  });
+  return /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(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.createElement(PopConfirm, {
+    placement: "left",
+    title: /*#__PURE__*/React.createElement(FullScreenEditor, {
+      ref: editorRef,
+      EditorComponent: JSEditor,
+      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.createElement(Icon, {
+    type: "code"
+  })));
+};
+export default FieldState;

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

@@ -3,20 +3,32 @@ 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 = ["id", "children", "className"];
-import React from 'react';
+import React, { useRef, useImperativeHandle } from 'react';
 import { useCreation } from 'ahooks';
 import Index from "./index";
 import { suid } from '@luck-design-biz/base/utils';
 import { useContext, addNode } from "../../../engine/provider/ContextProvider";
 import classNames from 'classnames';
-import styles from "./index.less";
+import "./index.less";
 import boxDefaultMeta from "../../../engine/meta/box.props.default.json";
 var FunctionDesign = function FunctionDesign(_ref) {
   var id = _ref.id,
     children = _ref.children,
     className = _ref.className,
     props = _objectWithoutProperties(_ref, _excluded);
+  var apiRef = useRef();
   var ctx = useContext();
+  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';
+      }
+    };
+  }, []);
   useCreation(function () {
     if (children !== null && children !== void 0 && children.length) return;
     ctx.$subscriber(ctx.topics.COMPONENT_APPEND).once(function (_ref2) {
@@ -29,11 +41,14 @@ var FunctionDesign = function FunctionDesign(_ref) {
   }, []);
   return /*#__PURE__*/React.createElement(Index, _extends({
     id: id,
-    wrapClassName: classNames(styles['runtime-design'], _defineProperty({}, className, !!className)),
+    wrapClassName: classNames('runtime-design', _defineProperty({}, className, !!className)),
     getContainer: false,
     maskStyle: {
       position: 'absolute'
     }
-  }, props), children);
+  }, props, {
+    defaultOpen: true,
+    $apiRef: apiRef
+  }), children);
 };
 export default FunctionDesign;

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

@@ -35,7 +35,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 = useContext();
   var apiRef = useRef();
   var domRef = useRef();
@@ -149,7 +150,7 @@ var LCDialog = function LCDialog(_ref) {
     id: id,
     displayName: "Dialog",
     getTargetDom: getTargetDom,
-    api: apiRef
+    api: $apiRef || apiRef
   }, /*#__PURE__*/React.createElement(Modal, _extends({
     title: _title,
     visible: open,

package/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/lowcode/view/lc-components/Form/index.js

@@ -3,8 +3,8 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["advance"];
-import React, { useRef, forwardRef, Fragment, useImperativeHandle, useEffect } from 'react';
+var _excluded = ["advance", "state"];
+import React, { useRef, forwardRef, Fragment, useImperativeHandle } from 'react';
 import { useMemoizedFn, useCreation, useUnmount } from 'ahooks';
 import classNames from 'classnames';
 import { reduce, includes, isNil, cloneDeep, last, startsWith, isString } from 'lodash';
@@ -19,6 +19,7 @@ import buildUploadForm from "../../../../upload/Form";
 import RuntimeComp from "../JSX/RuntimeComp";
 import useCombinedRefs from "../../../engine/tools/useCombinedRefs";
 import defaultMeta from "../../../engine/meta/form.props.default.json";
+import { RUNTIME } from "../../../constants";
 import styles from "./index.less";
 var _I18N_PREFIX_ = 'lc.form.validator';
 var Header = function Header(_ref2) {
@@ -319,10 +320,20 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
     return props;
   };
   var transEventsInfields = function transEventsInfields(fields) {
-    return (fields === null || fields === void 0 ? void 0 : fields.map(function (setting) {
+    return reduce(fields, function (result, setting) {
       var advance = setting.advance,
+        _state = setting.state,
         rest = _objectWithoutProperties(setting, _excluded);
-      var props = reduce(rest, function (result, value, key) {
+      var isShow = true;
+      if (ctx.runtime !== RUNTIME.DESIGN && _state) {
+        if (_state.value === 'hidden') {
+          isShow = _state.code ? !executeCode(ctx, _state.code) : false;
+        }
+        if (_state.value === 'normal' && _state.code) {
+          isShow = executeCode(ctx, _state.code);
+        }
+      }
+      var _props = reduce(rest, function (result, value, key) {
         //处理方法
         result[key] = isString(value) && startsWith(value, 'function') ? function () {
           for (var _len = arguments.length, _props = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -332,8 +343,19 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
         } : value;
         return result;
       }, {});
-      if (advance !== null && advance !== void 0 && advance.events) return _objectSpread(_objectSpread({}, props), {}, {
-        events: 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 ? executeCode(ctx, _state.code) : true
+        };
+      }
+      if ((_state === null || _state === void 0 ? void 0 : _state.value) === 'disabled') {
+        _props.config = {
+          disabled: _state.code ? executeCode(ctx, _state.code) : true
+        };
+      }
+      result.push(_objectSpread(_objectSpread({}, _props), {}, {
+        events: advance !== null && advance !== void 0 && advance.events ? reduce(advance.events, function (result, value, key) {
           //处理事件
           result[key] = function () {
             for (var _len2 = arguments.length, props = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
@@ -345,10 +367,10 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref3, ref) {
             }, {}));
           };
           return result;
-        }, {})
-      });
-      return props;
-    })) || [];
+        }, {}) : null
+      }));
+      return result;
+    }, []);
   };
   var renderFormList = useMemoizedFn(function (formConfig) {
     return reduce(_blocks, function (result, item) {

package/lib/components/LdAutoForm/index.js

@@ -81,7 +81,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         result.push( /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
           title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
         }));
-      } else if (col !== null && col !== void 0 && col.isShowInForm) {
+      } else if (col !== null && col !== void 0 && col.isShowInForm && setting !== null && setting !== void 0 && setting.isShow) {
         var customFiled = filedsRewrite.find(function (_field) {
           return _field.name === col.aliaName;
         }) || {};