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

package/es/lowcode/painter/DesignToolbar.js

@@ -12,12 +12,13 @@ import classNames from 'classnames';
 import { useMemoizedFn, useRequest, useDebounceFn, useCookieState } from 'ahooks';
 import { Select, Button, Icon, Divider, Modal, message, Drawer } from 'luck-design/antd';
 import { showPop, formatMessage } from '@luck-design-biz/base/utils';
-import { useContext, useGet, resetPageData, useRemoteSource } from "../engine/provider/ContextProvider";
+import { useContext, useGet, resetPageData } from "../engine/provider/ContextProvider";
 import JsonEditor from "../painter/components/code-editor/JsonEditor";
 import Preview from "../preview";
 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 { getLDMetaAttr } from "../engine/tools/helper";
 import { readAllUser } from '@luck-design-biz/base/lib/sys/services';
 var DesignToolbar = function DesignToolbar(_ref) {
   var locale = _ref.locale,
@@ -26,8 +27,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
   var editorRef = useRef();
   var context = useContext();
   var pageData = useGet();
-  var _ref2 = useRemoteSource() || {},
-    pageinfo = _ref2.pageinfo;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     langList = _useState2[0],
@@ -64,8 +63,8 @@ var DesignToolbar = function DesignToolbar(_ref) {
     updatePageDataLoading = _useRequest2.loading,
     runAsync = _useRequest2.runAsync;
   useEffect(function () {
-    var topicId = context.$subscriber(context.topics.LANG_SETTING_SELECT).on(function (_ref3) {
-      var _langList = _ref3.langList;
+    var topicId = context.$subscriber(context.topics.LANG_SETTING_SELECT).on(function (_ref2) {
+      var _langList = _ref2.langList;
       return setLangList(_langList);
     }).watch();
     return function () {
@@ -78,7 +77,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
     }
   }, [showPreview]);
   var handleSave = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _pageinfo$relationshi;
     var _yield$runAsync, code;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -86,7 +84,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
           _context.next = 2;
           return runAsync({
             pageData: JSON.stringify(pageData),
-            pageCode: pageinfo === null || pageinfo === void 0 || (_pageinfo$relationshi = pageinfo.relationship) === null || _pageinfo$relationshi === void 0 ? void 0 : _pageinfo$relationshi.pageCode
+            pageCode: getLDMetaAttr('pageCode')
           });
         case 2:
           _yield$runAsync = _context.sent;
@@ -118,7 +116,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       zIndex: 3000,
       onOk: function onOk() {
         return runClearCache({
-          moduleCode: pageinfo.relationship.moduleCode
+          moduleCode: getLDMetaAttr('moduleCode')
         });
       }
     });
@@ -138,7 +136,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
     }
   });
   var _useDebounceFn = useDebounceFn( /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
         var _yield$readAllUser, code, list, detail;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -168,7 +166,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
         }, _callee2);
       }));
       return function (_x) {
-        return _ref5.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }(), {
       wait: 500
@@ -213,7 +211,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
     className: styles['toolbar-item'],
     onClick: function onClick() {
       context.$publisher(context.topics.COMPONENT_ACTIVE, {
-        id: LC_BUILDIN_UNIT_KEY.PAGE_ROOT
+        target: LC_BUILDIN_UNIT_KEY.PAGE_ROOT
       });
     }
   }, formatMessage({
@@ -327,10 +325,10 @@ var DesignToolbar = function DesignToolbar(_ref) {
           setUserId(void 0);
         }
       }
-    }, userOptions.map(function (_ref6) {
-      var key = _ref6.key,
-        label = _ref6.label,
-        rest = _objectWithoutProperties(_ref6, _excluded);
+    }, userOptions.map(function (_ref5) {
+      var key = _ref5.key,
+        label = _ref5.label,
+        rest = _objectWithoutProperties(_ref5, _excluded);
       return /*#__PURE__*/React.createElement(Select.Option, _extends({
         key: key,
         value: key

package/es/lowcode/painter/Outline.js

@@ -5,7 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["props", "children"];
 import React, { useRef, useState, useEffect } from 'react';
 import { useMemoizedFn, useDeepCompareLayoutEffect, useLatest } from 'ahooks';
-import { uniq, split, reduce } from 'lodash';
+import { uniq, split, reduce, isString } from 'lodash';
 import classNames from 'classnames';
 import { Card, Tree, Icon } from 'luck-design/antd';
 import { formatMessage } from '@luck-design-biz/base/utils';
@@ -40,18 +40,22 @@ var Outline = function Outline(_ref) {
   var lastPageExpandedKeysRef = useLatest(pageExpandedKeys);
   useEffect(function () {
     var _id = ctx.$subscriber(ctx.topics.COMPONENT_ACTIVE).on(function (payload) {
-      setSelectedKey(payload.id);
+      if (!isString(payload.target)) {
+        setSelectedKey(null);
+        return;
+      }
+      setSelectedKey(payload.target);
       if (clickBySelf.current) {
         clickBySelf.current = false;
         return;
       }
-      var _split = split(getPathById(pageData, payload.id), '/'),
+      var _split = split(getPathById(pageData, payload.target), '/'),
         _split2 = _slicedToArray(_split, 1),
         _root = _split2[0];
       if (!LC_BUILDIN_UNIT_KEY_LIST.includes(_root)) {
-        setModalExpandedKeys(uniq([].concat(_toConsumableArray(latestModalExpandedKeysRef.current), _toConsumableArray(split(getPathById(pageData, payload.id), '/')))));
+        setModalExpandedKeys(uniq([].concat(_toConsumableArray(latestModalExpandedKeysRef.current), _toConsumableArray(split(getPathById(pageData, payload.target), '/')))));
       } else {
-        setPageExpandedKeys(uniq([].concat(_toConsumableArray(lastPageExpandedKeysRef.current), _toConsumableArray(split(getPathById(pageData, payload.id), '/')))));
+        setPageExpandedKeys(uniq([].concat(_toConsumableArray(lastPageExpandedKeysRef.current), _toConsumableArray(split(getPathById(pageData, payload.target), '/')))));
       }
     }).watch();
     return function () {
@@ -61,7 +65,7 @@ var Outline = function Outline(_ref) {
   var handleSelect = useMemoizedFn(function (_key) {
     clickBySelf.current = true;
     ctx.$publisher(ctx.topics.COMPONENT_ACTIVE, _key ? {
-      id: _key
+      target: _key
     } : null);
   });
   var render = useMemoizedFn(function (_ref2) {

package/es/lowcode/painter/Panel.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -5,7 +6,7 @@ import React, { useRef, useState, useEffect, useLayoutEffect } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import { Breadcrumb } from 'luck-design/antd';
 import classNames from 'classnames';
-import { takeRight, isNil, reduce, get, set } from 'lodash';
+import { takeRight, isNil, reduce, get, isString } from 'lodash';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import { useContext, useTask, addNode, deleteNode } from "../engine/provider/ContextProvider";
 import AttrsPanel from "./components/AttrsPanel";
@@ -34,6 +35,7 @@ var _TAB_LIST_ = [{
   key: 'advance'
 }];
 var Panel = function Panel() {
+  var _activeNode$$target;
   var activeTabRef = useRef(null);
   var underLineRef = useRef(null);
   var _useState = useState(null),
@@ -47,8 +49,24 @@ var Panel = function Panel() {
   var context = useContext();
   var task = useTask('modify');
   var meta = useCreation(function () {
+    if (isNil(activeNode)) return null;
     try {
-      return isNil(activeNode) ? null : require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
+      var _meta = require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
+      if (!isNil(activeNode === null || activeNode === void 0 ? void 0 : activeNode.$target)) {
+        var setValueKey = function setValueKey(items) {
+          items.forEach(function (item) {
+            if (item.next) {
+              setValueKey(item.next.props);
+            } else if (item.props) {
+              setValueKey(item.props);
+            } else {
+              item.valueKey = "".concat(activeNode.$target.keyPath, ".").concat(item.key);
+            }
+          });
+        };
+        setValueKey(_meta.props);
+      }
+      return _meta;
     } catch (e) {
       return null;
     }
@@ -76,41 +94,59 @@ var Panel = function Panel() {
         deleteNode(LC_BUILDIN_UNIT_KEY.PAGE_FOOTER);
       }
     }
-    var component = context.componentMap.get(activeNode.node.id);
+    var targetId = isNil(activeNode.$target) ? activeNode.node.id : activeNode.$target.ancestorId;
+    var component = context.componentMap.get(targetId);
     var node = component.api.getSelfData();
     var oldValue = _defineProperty({}, field, get(node.props, field));
     var newValue = _defineProperty({}, field, value);
     if (before) {
       before(handleChange);
     }
-    task(activeNode.node.id, newValue).then(function (a, b) {
+    task(targetId, newValue).then(function () {
       context.$publisher(context.topics.COMPONENT_MODIFY, {
-        id: activeNode.node.id,
+        id: targetId,
         oldValue: oldValue,
         newValue: newValue
       });
       if (repositioning) context.$publisher(context.topics.COMPONENT_REPOSITIONING, {
-        id: activeNode.node.id
+        id: targetId
       });
     });
   });
   useEffect(function () {
-    var _id = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
+    var tid = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
       setActiveTabKey('attrs');
-      if (!payload.id) {
+      if (!payload.target) {
         setActiveNode(null);
         return;
       }
-      var component = context.componentMap.get(payload.id);
-      var node = component.api.getSelfData();
-      var levelNodes = takeRight(component.api.getLevelNodes(), 4);
-      setActiveNode({
-        node: node.props,
-        level: levelNodes
-      });
+      if (isString(payload.target)) {
+        var component = context.componentMap.get(payload.target);
+        var node = component.api.getSelfData();
+        var levelNodes = takeRight(component.api.getLevelNodes(), 4);
+        setActiveNode({
+          node: node.props,
+          level: levelNodes
+        });
+      } else {
+        var _component = payload.target.element.getAttribute('data-__component');
+        var ancestor = context.componentMap.get(payload.target.ancestorId);
+        var _levelNodes = takeRight(ancestor.api.getLevelNodes(), 3);
+        setActiveNode({
+          node: {
+            id: payload.target.id,
+            component: _component
+          },
+          level: [].concat(_toConsumableArray(_levelNodes), [{
+            id: payload.target.id,
+            name: payload.target.label
+          }]),
+          $target: payload.target
+        });
+      }
     }).watch();
     return function () {
-      return context.$unsubscriber(context.topics.COMPONENT_ACTIVE, _id);
+      return context.$unsubscriber(context.topics.COMPONENT_ACTIVE, tid);
     };
   }, []);
   useLayoutEffect(function () {
@@ -134,7 +170,7 @@ var Panel = function Panel() {
       onMouseEnter: function onMouseEnter() {
         if (id === activeNode.node.id) return;
         context.$publisher(context.topics.COMPONENT_HOVER, {
-          id: id
+          target: id
         });
       },
       onMouseLeave: function onMouseLeave() {
@@ -144,7 +180,7 @@ var Panel = function Panel() {
       onClick: function onClick() {
         if (id === activeNode.node.id) return;
         context.$publisher(context.topics.COMPONENT_ACTIVE, {
-          id: id
+          target: id
         });
       }
     }, name);
@@ -176,6 +212,7 @@ var Panel = function Panel() {
   })), activeTabKey === _TAB_LIST_[0].key && /*#__PURE__*/React.createElement(AttrsPanel, {
     key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
     nodeId: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
+    ancestorId: activeNode === null || activeNode === void 0 || (_activeNode$$target = activeNode.$target) === null || _activeNode$$target === void 0 ? void 0 : _activeNode$$target.ancestorId,
     meta: meta,
     onChange: function onChange(field, value, params) {
       return handleChange(field, value, params);
@@ -189,9 +226,10 @@ var Panel = function Panel() {
   }), activeTabKey === _TAB_LIST_[2].key && /*#__PURE__*/React.createElement(AdvancePanel, {
     key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
     nodeId: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
+    target: activeNode === null || activeNode === void 0 ? void 0 : activeNode.$target,
     meta: meta,
     onChange: function onChange(val) {
-      return handleChange('advance', val);
+      return handleChange(isNil(activeNode.$target) ? 'advance' : "".concat(activeNode.$target.keyPath, ".advance"), val);
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: classNames(styles['lc-painter-panel-empty'], _defineProperty({}, styles.hidden, !!activeNode))

package/es/lowcode/painter/components/ActionBindModal.js

@@ -33,7 +33,8 @@ var _ACTION_CATEGORY_ = [{
 var _DEFAULT_JSON_CODE_ = '{"params":{},"data":{}}';
 var _DEFAULT_JS_CODE_ = 'function todo() {\n\n}';
 var ActionBindModal = function ActionBindModal(_ref) {
-  var event = _ref.event,
+  var nodeId = _ref.nodeId,
+    event = _ref.event,
     _ref$defaultCode = _ref.defaultCode,
     defaultCode = _ref$defaultCode === void 0 ? _DEFAULT_JS_CODE_ : _ref$defaultCode,
     onComfirm = _ref.onComfirm,
@@ -97,10 +98,11 @@ var ActionBindModal = function ActionBindModal(_ref) {
   }, [category]);
   useUpdateEffect(function () {
     if (activeKey) {
+      var _editorRef$current;
       var action = get(activeKey);
-      (action === null || action === void 0 ? void 0 : action.code) && editorRef.current.editor.setValue(action.code);
+      (_editorRef$current = editorRef.current) === null || _editorRef$current === void 0 || _editorRef$current.editor.setValue(action === null || action === void 0 ? void 0 : action.code);
     }
-  }, [activeKey]);
+  }, [category, activeKey]);
   useUpdateEffect(function () {
     setAll(event === null || event === void 0 ? void 0 : event.actionPool);
   }, [event]);
@@ -163,7 +165,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
       marginTop: 0,
       padding: '4px 24px'
     },
-    title: event === null || event === void 0 ? void 0 : event.name,
+    title: "".concat(event === null || event === void 0 ? void 0 : event.name, "(").concat(nodeId, ")"),
     visible: !!event,
     width: "70vw",
     closable: false,
@@ -194,14 +196,17 @@ var ActionBindModal = function ActionBindModal(_ref) {
       onClick: function onClick() {
         setCategory(key);
         if ('custom' === key) {
-          setActiveKey('coding');
-          if (!actionPool.has(key)) {
-            set('coding', {
+          var _activeKey = 'coding';
+          setActiveKey(_activeKey);
+          if (!actionPool.has(_activeKey)) {
+            set(_activeKey, {
               category: key,
-              key: 'coding',
+              key: _activeKey,
               code: event.func || defaultCode
             });
           }
+        } else {
+          setActiveKey(void 0);
         }
       }
     }, label, key === category && /*#__PURE__*/React.createElement(Icon, {

package/es/lowcode/painter/components/AdvancePanel.js

@@ -8,7 +8,7 @@ import React, { useState } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import { Menu, Dropdown, Button, Tooltip, Icon } from 'luck-design/antd';
 import styled from 'styled-components';
-import { keyBy, keys, omit } from 'lodash';
+import { isNil, keyBy, keys, omit, reduce } from 'lodash';
 import { useGet } from "../../engine/provider/ContextProvider";
 import { formatMessage } from '@luck-design-biz/base/utils';
 import Collapse from "./Collapse";
@@ -21,10 +21,14 @@ var EventItem = styled.div.withConfig({
 var AdvancePanel = function AdvancePanel(_ref) {
   var meta = _ref.meta,
     nodeId = _ref.nodeId,
+    target = _ref.target,
     onChange = _ref.onChange;
-  var value = useGet({
+  var value = useGet(isNil(target) ? {
     id: nodeId,
     path: 'props.advance'
+  } : {
+    id: target.ancestorId,
+    path: "props.".concat(target.keyPath, ".advance")
   });
   var _useState = useState((value === null || value === void 0 ? void 0 : value.events) || {}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -71,24 +75,28 @@ var AdvancePanel = function AdvancePanel(_ref) {
       style: {
         fontSize: 12
       }
-    }, (_meta$advance2 = meta.advance) === null || _meta$advance2 === void 0 || (_meta$advance2 = _meta$advance2.events) === null || _meta$advance2 === void 0 ? void 0 : _meta$advance2.map(function (event) {
-      return /*#__PURE__*/React.createElement(Menu.Item, {
-        key: event.key,
-        payload: event
-      }, /*#__PURE__*/React.createElement(Tooltip, {
-        title: event.desc || event.name,
-        placement: "left",
-        getPopupContainer: function getPopupContainer() {
-          return document.getElementById('lc-design-workspace');
-        }
-      }, /*#__PURE__*/React.createElement("div", {
-        style: {
-          width: '100%',
-          fontSize: 12
-        }
-      }, event.name)));
-    }));
-  }, []);
+    }, reduce((_meta$advance2 = meta.advance) === null || _meta$advance2 === void 0 ? void 0 : _meta$advance2.events, function (ret, event) {
+      var _value$events;
+      if (!(value !== null && value !== void 0 && (_value$events = value.events) !== null && _value$events !== void 0 && _value$events[event.key])) {
+        ret.push( /*#__PURE__*/React.createElement(Menu.Item, {
+          key: event.key,
+          payload: event
+        }, /*#__PURE__*/React.createElement(Tooltip, {
+          title: event.desc || event.name,
+          placement: "left",
+          getPopupContainer: function getPopupContainer() {
+            return document.getElementById('lc-design-workspace');
+          }
+        }, /*#__PURE__*/React.createElement("div", {
+          style: {
+            width: '100%',
+            fontSize: 12
+          }
+        }, event.name))));
+      }
+      return ret;
+    }, []));
+  }, [value]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Collapse, {
     field: "events",
     label: formatMessage({
@@ -99,7 +107,9 @@ var AdvancePanel = function AdvancePanel(_ref) {
       padding: '12px 16px'
     }
   }, keys(events).map(function (ek) {
-    return /*#__PURE__*/React.createElement(EventItem, null, /*#__PURE__*/React.createElement("span", null, metaMap[ek].name), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Tooltip, {
+    return /*#__PURE__*/React.createElement(EventItem, {
+      key: ek
+    }, /*#__PURE__*/React.createElement("span", null, metaMap[ek].name), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Tooltip, {
       title: formatMessage({
         id: 'luckda.lowcode.painter.edit',
         label: '编辑'
@@ -135,6 +145,7 @@ var AdvancePanel = function AdvancePanel(_ref) {
     id: "".concat(_I18N_PREFIX_, ".addEventAction"),
     label: '添加事件动作'
   })))), /*#__PURE__*/React.createElement(ActionBindModal, {
+    nodeId: nodeId,
     event: event,
     onComfirm: handleComfirm,
     onClose: function onClose() {

package/es/lowcode/painter/components/AttrsPanel.js

@@ -17,6 +17,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
   var _nextRef$current2, _nextRef$current3;
   var meta = _ref.meta,
     nodeId = _ref.nodeId,
+    ancestorId = _ref.ancestorId,
     onChange = _ref.onChange;
   var nextRef = useRef(null);
   var factory = useRef(new PanelItemFactory());
@@ -27,7 +28,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
   var node = useGet({
-    id: nodeId,
+    id: isNil(ancestorId) ? nodeId : ancestorId,
     path: 'props'
   });
   var handleChange = useMemoizedFn(function (field, val, _ref2) {
@@ -66,6 +67,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
         repositioning = _ref3.repositioning,
         rest = _objectWithoutProperties(_ref3, _excluded);
       var Comp = factory.current.getPanelItemFor(startsWith(type, '_') ? 'dynamic' : type, type);
+      var _valueKey = (dynamicProps === null || dynamicProps === void 0 ? void 0 : dynamicProps.valueKey) || valueKey;
       if (type === 'group') {
         return /*#__PURE__*/React.createElement(Comp, {
           nodeId: nodeId,
@@ -79,7 +81,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
           desc: desc
         }, renderPanelItems(props || [], dynamicProps));
       }
-      var _originalVal = get(node, valueKey || key);
+      var _originalVal = get(node, _valueKey || key);
       var comp = Comp && /*#__PURE__*/React.createElement(Comp, _extends({
         nodeId: nodeId,
         key: key,
@@ -88,7 +90,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
           return goNext(next, _dp);
         } : null,
         onChange: function onChange(val, before) {
-          return handleChange(valueKey || key, val, {
+          return handleChange(_valueKey || key, val, {
             repositioning: repositioning,
             before: before
           });

package/es/lowcode/painter/components/FieldSelector.js

@@ -3,33 +3,46 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dsid", "defaultValue", "onChange"];
 import React, { useState } from 'react';
+import { useRequest } from 'ahooks';
 import { Select } from 'luck-design/antd';
 import { formatMessage } from '@luck-design-biz/base/utils';
+import { fetchFieldsByDataset } from "../../constants/api-url";
+import { getLDMetaAttr } from "../../engine/tools/helper";
 var FieldSelector = function FieldSelector(_ref) {
   var dsid = _ref.dsid,
     defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
     props = _objectWithoutProperties(_ref, _excluded);
-  var _useState = useState([{
-      value: 'state',
-      label: '状态'
-    }, {
-      value: 'type',
-      label: '类型'
-    }, {
-      value: 'year',
-      label: '年份'
-    }, {
-      value: 'count',
-      label: '次数'
-    }]),
+  var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     options = _useState2[0],
     setOptions = _useState2[1];
+  var _useRequest = useRequest(fetchFieldsByDataset, {
+      defaultParams: [{
+        datasetUid: dsid,
+        moduleUid: getLDMetaAttr('moduleId')
+      }],
+      ready: !!dsid,
+      onSuccess: function onSuccess(_ref2) {
+        var code = _ref2.code,
+          list = _ref2.list,
+          detail = _ref2.detail;
+        if (code === 1) {
+          setOptions(list.map(function (_id) {
+            return {
+              value: detail[_id].field,
+              label: detail[_id].fieldAliasName
+            };
+          }));
+        }
+      }
+    }),
+    loading = _useRequest.loading;
   return /*#__PURE__*/React.createElement(Select, _extends({
     defaultValue: defaultValue,
     onChange: onChange,
     size: "small",
+    loading: loading,
     placeholder: formatMessage({
       id: "luckda.lowcode.painter.panel-section.field-selector.placeholder",
       label: '请选择字段'

package/es/lowcode/painter/components/code-editor/JSEditor.js

@@ -1,14 +1,13 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["children"];
 import React, { useEffect, forwardRef } from 'react';
-import BaseEditor from "./BaseEditor";
 import * as monaco from 'monaco-editor';
 import { isNil } from 'lodash';
+import BaseEditor from "./BaseEditor";
 function capitalizeFirstLetter(string) {
   if (isNil(string)) return null;
   if (string.length === 0) {
@@ -27,7 +26,6 @@ var _provideCompletionItems = function provideCompletionItems(monaco, model, pos
   // 正则表达式匹配以 triggerWord 开头的任何单词
   var pattern = new RegExp('\\b' + module.triggerWord + '[\\w.]*', 'i');
   var match = textUntilPosition.match(pattern);
-  // console.log('match',match)
   if (match) {
     var word = model.getWordUntilPosition(position);
     var range = {
@@ -55,10 +53,7 @@ var setupAutocomplete = /*#__PURE__*/function () {
           return import("../../../engine/meta/js-editor/auto-complete.json");
         case 2:
           autoCompleteModules = _context.sent;
-          // console.log('autoCompleteModules', autoCompleteModules);
-
-          monaco.languages.registerCompletionItemProvider('javascript', _defineProperty({
-            triggerCharacters: ['.'],
+          monaco.languages.registerCompletionItemProvider('javascript', {
             provideCompletionItems: function provideCompletionItems(model, position) {
               var allCompletionItems = [];
 
@@ -70,8 +65,9 @@ var setupAutocomplete = /*#__PURE__*/function () {
               return {
                 suggestions: allCompletionItems
               };
-            }
-          }, "triggerCharacters", ['.']));
+            },
+            triggerCharacters: ['.'] // 当用户输入点号时触发补全
+          });
         case 4:
         case "end":
           return _context.stop();

package/es/lowcode/painter/panel-section/BlocksEditor/index.js

@@ -156,9 +156,7 @@ var BlockEditor = function BlockEditor(_ref) {
   }, renderPanelItems(commonProps.map(function (p) {
     var cloneP = cloneDeep(p);
     if (cloneP.key === 'dataset') {
-      var _valueKey = 'blocks[0].fields';
-      cloneP.next.props[0].valueKey = _valueKey;
-      cloneP.beforeChangeKey = _valueKey;
+      cloneP.fieldsKey = 'blocks[0].fields';
     }
     return _objectSpread(_objectSpread({}, cloneP), {}, {
       disabled: includes(['mode', 'serialEffect'], cloneP.key) || cloneP.disabled,
@@ -203,10 +201,9 @@ var BlockEditor = function BlockEditor(_ref) {
       cloneP.valueKey = "blocks[".concat(i + 1, "].").concat(p.key);
       if (p.key === 'dataset') {
         if (includes(['auto', 'grid', 'writer'], blockItem.type)) {
-          if (blockItem.type !== 'auto') cloneP.next.props[0].component = 'tableForm';
-          var _valueKey = "blocks[".concat(i + 1, "].fields");
-          cloneP.next.props[0].valueKey = _valueKey;
-          cloneP.beforeChangeKey = _valueKey;
+          if (blockItem.type !== 'auto') cloneP.component = 'tableForm';
+          cloneP.fieldsKey = "blocks[".concat(i + 1, "].fields");
+          ;
           result.push(cloneP);
         }
       } else result.push(cloneP);