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

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

@@ -29,10 +29,14 @@ var EventItem = _styledComponents.default.div.withConfig({
 var AdvancePanel = function AdvancePanel(_ref) {
   var meta = _ref.meta,
     nodeId = _ref.nodeId,
+    target = _ref.target,
     onChange = _ref.onChange;
-  var value = (0, _ContextProvider.useGet)({
+  var value = (0, _ContextProvider.useGet)((0, _lodash.isNil)(target) ? {
     id: nodeId,
     path: 'props.advance'
+  } : {
+    id: target.ancestorId,
+    path: "props.".concat(target.keyPath, ".advance")
   });
   var _useState = (0, _react.useState)((value === null || value === void 0 ? void 0 : value.events) || {}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -79,24 +83,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.default.createElement(_antd.Menu.Item, {
-        key: event.key,
-        payload: event
-      }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
-        title: event.desc || event.name,
-        placement: "left",
-        getPopupContainer: function getPopupContainer() {
-          return document.getElementById('lc-design-workspace');
-        }
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        style: {
-          width: '100%',
-          fontSize: 12
-        }
-      }, event.name)));
-    }));
-  }, []);
+    }, (0, _lodash.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.default.createElement(_antd.Menu.Item, {
+          key: event.key,
+          payload: event
+        }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+          title: event.desc || event.name,
+          placement: "left",
+          getPopupContainer: function getPopupContainer() {
+            return document.getElementById('lc-design-workspace');
+          }
+        }, /*#__PURE__*/_react.default.createElement("div", {
+          style: {
+            width: '100%',
+            fontSize: 12
+          }
+        }, event.name))));
+      }
+      return ret;
+    }, []));
+  }, [value]);
   return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     field: "events",
     label: (0, _utils.formatMessage)({
@@ -107,7 +115,9 @@ var AdvancePanel = function AdvancePanel(_ref) {
       padding: '12px 16px'
     }
   }, (0, _lodash.keys)(events).map(function (ek) {
-    return /*#__PURE__*/_react.default.createElement(EventItem, null, /*#__PURE__*/_react.default.createElement("span", null, metaMap[ek].name), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+    return /*#__PURE__*/_react.default.createElement(EventItem, {
+      key: ek
+    }, /*#__PURE__*/_react.default.createElement("span", null, metaMap[ek].name), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
       title: (0, _utils.formatMessage)({
         id: 'luckda.lowcode.painter.edit',
         label: '编辑'
@@ -143,6 +153,7 @@ var AdvancePanel = function AdvancePanel(_ref) {
     id: "".concat(_I18N_PREFIX_, ".addEventAction"),
     label: '添加事件动作'
   })))), /*#__PURE__*/_react.default.createElement(_ActionBindModal.default, {
+    nodeId: nodeId,
     event: event,
     onComfirm: handleComfirm,
     onClose: function onClose() {

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

@@ -25,6 +25,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 = (0, _react.useRef)(null);
   var factory = (0, _react.useRef)(new _panelItemFactory.default());
@@ -35,7 +36,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
   var node = (0, _ContextProvider.useGet)({
-    id: nodeId,
+    id: (0, _lodash.isNil)(ancestorId) ? nodeId : ancestorId,
     path: 'props'
   });
   var handleChange = (0, _ahooks.useMemoizedFn)(function (field, val, _ref2) {
@@ -74,6 +75,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
         repositioning = _ref3.repositioning,
         rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
       var Comp = factory.current.getPanelItemFor((0, _lodash.startsWith)(type, '_') ? 'dynamic' : type, type);
+      var _valueKey = (dynamicProps === null || dynamicProps === void 0 ? void 0 : dynamicProps.valueKey) || valueKey;
       if (type === 'group') {
         return /*#__PURE__*/_react.default.createElement(Comp, {
           nodeId: nodeId,
@@ -87,7 +89,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
           desc: desc
         }, renderPanelItems(props || [], dynamicProps));
       }
-      var _originalVal = (0, _lodash.get)(node, valueKey || key);
+      var _originalVal = (0, _lodash.get)(node, _valueKey || key);
       var comp = Comp && /*#__PURE__*/_react.default.createElement(Comp, (0, _extends2.default)({
         nodeId: nodeId,
         key: key,
@@ -96,7 +98,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/lib/lowcode/painter/components/FieldSelector.js

@@ -10,34 +10,47 @@ 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 _utils = require("@luck-design-biz/base/utils");
+var _apiUrl = require("../../constants/api-url");
+var _helper = require("../../engine/tools/helper");
 var _excluded = ["dsid", "defaultValue", "onChange"];
 var FieldSelector = function FieldSelector(_ref) {
   var dsid = _ref.dsid,
     defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useState = (0, _react.useState)([{
-      value: 'state',
-      label: '状态'
-    }, {
-      value: 'type',
-      label: '类型'
-    }, {
-      value: 'year',
-      label: '年份'
-    }, {
-      value: 'count',
-      label: '次数'
-    }]),
+  var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     options = _useState2[0],
     setOptions = _useState2[1];
+  var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchFieldsByDataset, {
+      defaultParams: [{
+        datasetUid: dsid,
+        moduleUid: (0, _helper.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.default.createElement(_antd.Select, (0, _extends2.default)({
     defaultValue: defaultValue,
     onChange: onChange,
     size: "small",
+    loading: loading,
     placeholder: (0, _utils.formatMessage)({
       id: "luckda.lowcode.painter.panel-section.field-selector.placeholder",
       label: '请选择字段'

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

@@ -9,14 +9,13 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _interopRequireWildcard2 = _interopRequireDefault(require("@babel/runtime/helpers/interopRequireWildcard"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = _interopRequireWildcard3(require("react"));
-var _BaseEditor = _interopRequireDefault(require("./BaseEditor"));
 var monaco = _interopRequireWildcard3(require("monaco-editor"));
 var _lodash = require("lodash");
+var _BaseEditor = _interopRequireDefault(require("./BaseEditor"));
 var _excluded = ["children"];
 function capitalizeFirstLetter(string) {
   if ((0, _lodash.isNil)(string)) return null;
@@ -36,7 +35,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 = {
@@ -66,10 +64,7 @@ var setupAutocomplete = /*#__PURE__*/function () {
           });
         case 2:
           autoCompleteModules = _context.sent;
-          // console.log('autoCompleteModules', autoCompleteModules);
-
-          monaco.languages.registerCompletionItemProvider('javascript', (0, _defineProperty2.default)({
-            triggerCharacters: ['.'],
+          monaco.languages.registerCompletionItemProvider('javascript', {
             provideCompletionItems: function provideCompletionItems(model, position) {
               var allCompletionItems = [];
 
@@ -81,8 +76,9 @@ var setupAutocomplete = /*#__PURE__*/function () {
               return {
                 suggestions: allCompletionItems
               };
-            }
-          }, "triggerCharacters", ['.']));
+            },
+            triggerCharacters: ['.'] // 当用户输入点号时触发补全
+          });
         case 4:
         case "end":
           return _context.stop();

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

@@ -163,9 +163,7 @@ var BlockEditor = function BlockEditor(_ref) {
   }, renderPanelItems(commonProps.map(function (p) {
     var cloneP = (0, _lodash.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 (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cloneP), {}, {
       disabled: (0, _lodash.includes)(['mode', 'serialEffect'], cloneP.key) || cloneP.disabled,
@@ -210,10 +208,9 @@ var BlockEditor = function BlockEditor(_ref) {
       cloneP.valueKey = "blocks[".concat(i + 1, "].").concat(p.key);
       if (p.key === 'dataset') {
         if ((0, _lodash.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);

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

@@ -15,6 +15,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _antd = require("luck-design/antd");
 var _ContextProvider = require("../../engine/provider/ContextProvider");
 var _apiUrl = require("../../constants/api-url");
+var _helper = require("../../engine/tools/helper");
 var Div = _styledComponents.default.div.withConfig({
   displayName: "Div",
   componentId: "luckda-6530__sc-onj9tc-0"
@@ -22,7 +23,9 @@ var Div = _styledComponents.default.div.withConfig({
 var DataSetSelector = function DataSetSelector(_ref) {
   var defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
-    beforeChangeKey = _ref.beforeChangeKey,
+    _ref$fieldsKey = _ref.fieldsKey,
+    fieldsKey = _ref$fieldsKey === void 0 ? 'fields' : _ref$fieldsKey,
+    component = _ref.component,
     size = _ref.size,
     isTree = _ref.isTree,
     next = _ref.next;
@@ -38,8 +41,7 @@ var DataSetSelector = function DataSetSelector(_ref) {
     dataset = _useRemoteSource.dataset,
     fetchAllDatasetLoading = _useRemoteSource.fetchAllDatasetLoading,
     refreshModlueData = _useRemoteSource.refreshModlueData,
-    refreshDataset = _useRemoteSource.refreshDataset,
-    pageinfo = _useRemoteSource.pageinfo;
+    refreshDataset = _useRemoteSource.refreshDataset;
   var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchAddDataset, {
       manual: true
     }),
@@ -53,12 +55,12 @@ var DataSetSelector = function DataSetSelector(_ref) {
   }, [dataset, isTree]);
   var handleChange = (0, _ahooks.useMemoizedFn)( /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value, _ref3) {
-      var key, _pageinfo$relationshi, moduleId, dataModelKey, _yield$runAsync, code, res, _ds;
+      var key, _getLDMetaAttr, _getLDMetaAttr2, moduleId, dataModelKey, _yield$runAsync, code, res, _ds;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             key = _ref3.key;
-            _pageinfo$relationshi = pageinfo.relationship, moduleId = _pageinfo$relationshi.moduleId, dataModelKey = _pageinfo$relationshi.dataModelKey;
+            _getLDMetaAttr = (0, _helper.getLDMetaAttr)(['moduleId', 'dataModelKey']), _getLDMetaAttr2 = (0, _slicedToArray2.default)(_getLDMetaAttr, 2), moduleId = _getLDMetaAttr2[0], dataModelKey = _getLDMetaAttr2[1];
             _context.next = 4;
             return runAsync({
               uid: moduleId,
@@ -84,8 +86,25 @@ var DataSetSelector = function DataSetSelector(_ref) {
                 code: value,
                 uid: key
               };
-              onChange(_ds, function (_beforeChange) {
-                return _beforeChange(beforeChangeKey, []);
+              onChange(_ds, function (exe) {
+                var dsFields = res.data.dataSets[value];
+                exe(fieldsKey, dsFields.map(function (f) {
+                  var _extra = JSON.parse(f.extra || '{}');
+                  var restProps = {};
+                  if (['table', 'tableForm'].includes(component)) {
+                    var alignMapping = {
+                      0: 'left',
+                      1: 'center',
+                      2: 'right'
+                    };
+                    restProps.align = alignMapping[_extra.scell_alignment];
+                    restProps.headerAlign = alignMapping[_extra.sheading_alignment];
+                  }
+                  return {
+                    uid: f.uid,
+                    field: f.field
+                  };
+                }));
               });
               setCurrentDataset(_ds);
             }
@@ -126,9 +145,10 @@ var DataSetSelector = function DataSetSelector(_ref) {
     disabled: !currentDataset,
     onClick: function onClick() {
       return next({
-        pageinfo: pageinfo,
         datasetUid: currentDataset.uid,
-        datasetCode: currentDataset.code
+        datasetCode: currentDataset.code,
+        valueKey: fieldsKey,
+        component: component
       });
     }
   }), /*#__PURE__*/_react.default.createElement(_antd.Button, {

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

@@ -37,7 +37,6 @@ var FieldKey = (0, _styledComponents.default)(_luckDesign.Ellipsis).withConfig({
 })(["width:80px;margin-left:4px;"]);
 var FieldsSetting = function FieldsSetting(_ref) {
   var component = _ref.component,
-    pageinfo = _ref.pageinfo,
     datasetUid = _ref.datasetUid,
     nodeId = _ref.nodeId,
     defaultValue = _ref.defaultValue,
@@ -84,7 +83,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
   var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchFieldsByDataset, {
       defaultParams: [{
         datasetUid: datasetUid,
-        moduleUid: pageinfo.relationship.moduleId
+        moduleUid: (0, _helper.getLDMetaAttr)('moduleId')
       }],
       onSuccess: function onSuccess(_ref3) {
         var code = _ref3.code,
@@ -98,18 +97,21 @@ var FieldsSetting = function FieldsSetting(_ref) {
             return ret;
           }, []), list.map(function (id) {
             var _fieldData = detail[id];
-            var extraAttr = JSON.parse(_fieldData.extraAttr || '{}');
-            var alignMapping = {
-              0: 'left',
-              1: 'center',
-              2: 'right'
-            };
-            return {
+            var extra = JSON.parse(_fieldData.extra || '{}');
+            var restProps = {};
+            if (['table', 'tableForm'].includes(component)) {
+              var alignMapping = {
+                0: 'left',
+                1: 'center',
+                2: 'right'
+              };
+              restProps.align = alignMapping[extra.scell_alignment];
+              restProps.headerAlign = alignMapping[extra.sheading_alignment];
+            }
+            return (0, _objectSpread2.default)({
               uid: id,
-              field: detail[id].field,
-              align: alignMapping[extraAttr.scell_alignment],
-              headerAlign: alignMapping[extraAttr.sheading_alignment]
-            };
+              field: detail[id].field
+            }, restProps);
           }), 'uid');
           if (!(0, _lodash.isEqual)(_fields, defaultValue)) {
             onChange(_fields);
@@ -134,9 +136,10 @@ var FieldsSetting = function FieldsSetting(_ref) {
     }),
     runUpdateFieldAttrs = _useRequest2.runAsync;
   var _useDebounceFn = (0, _ahooks.useDebounceFn)(function (field, value) {
-      var _pageinfo$relationshi = pageinfo.relationship,
-        moduleId = _pageinfo$relationshi.moduleId,
-        dataModelKey = _pageinfo$relationshi.dataModelKey;
+      var _getLDMetaAttr = (0, _helper.getLDMetaAttr)(['moduleId', 'dataModelKey']),
+        _getLDMetaAttr2 = (0, _slicedToArray2.default)(_getLDMetaAttr, 2),
+        moduleId = _getLDMetaAttr2[0],
+        dataModelKey = _getLDMetaAttr2[1];
       runUpdateFieldAttrs({
         dataModelKey: dataModelKey,
         datasetBusinessUids: [field.uid],
@@ -362,8 +365,8 @@ var FieldsSetting = function FieldsSetting(_ref) {
     dispatch: dispatch,
     nodeId: nodeId,
     fieldData: fieldData,
-    dataModelKey: pageinfo.relationship.dataModelKey,
-    moduleId: pageinfo.relationship.moduleId,
+    dataModelKey: (0, _helper.getLDMetaAttr)('dataModelKey'),
+    moduleId: (0, _helper.getLDMetaAttr)('moduleId'),
     datasetId: datasetUid,
     component: component,
     onAliasChange: handleAliasChange,
@@ -372,8 +375,8 @@ var FieldsSetting = function FieldsSetting(_ref) {
     dispatch: dispatch,
     nodeId: nodeId,
     fieldsData: checkedFields,
-    dataModelKey: pageinfo.relationship.dataModelKey,
-    moduleId: pageinfo.relationship.moduleId,
+    dataModelKey: (0, _helper.getLDMetaAttr)('dataModelKey'),
+    moduleId: (0, _helper.getLDMetaAttr)('moduleId'),
     datasetId: datasetUid,
     component: component,
     onChange: handleChange

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

@@ -1,12 +1,13 @@
 "use strict";
 
+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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _utils = require("@luck-design-biz/base/utils");
@@ -25,6 +26,10 @@ var ImpExp = function ImpExp(_ref) {
     module = _useRemoteSource.module,
     impTypeList = _useRemoteSource.impTypeList,
     expTypeList = _useRemoteSource.expTypeList;
+  var _useState = (0, _react.useState)(true),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    exportDisabled = _useState2[0],
+    setExportDisabled = _useState2[1];
   (0, _ahooks.useUpdateEffect)(function () {
     onChange(state);
   }, [state]);
@@ -78,7 +83,7 @@ var ImpExp = function ImpExp(_ref) {
     var key = _ref3.key;
     var _value = value;
     setState({
-      export: _value
+      import: _value
     });
   });
   return /*#__PURE__*/_react.default.createElement(_antd.Row, {
@@ -101,10 +106,7 @@ var ImpExp = function ImpExp(_ref) {
     onChange: function onChange(e) {
       return handleInputChange('import', e);
     },
-    placeholder: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".impUrl.placeholder"),
-      label: '请输入自定义接口'
-    })
+    placeholder: "\u8BF7\u8F93\u5165\u6A21\u7248ID"
   }) : /*#__PURE__*/_react.default.createElement(_antd.Select, {
     size: "small",
     style: {
@@ -131,7 +133,9 @@ var ImpExp = function ImpExp(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_antd.Switch, {
     size: "small",
     defaultChecked: !!state.importType,
-    onChange: handleSwitchChangeImport
+    onChange: handleSwitchChangeImport,
+    checkedChildren: "\u884C\u4E3A",
+    unCheckedChildren: "\u6A21\u7248"
   })), /*#__PURE__*/_react.default.createElement(_antd.Col, {
     span: 6
   }, /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
@@ -143,17 +147,7 @@ var ImpExp = function ImpExp(_ref) {
     label: '导出'
   }))), /*#__PURE__*/_react.default.createElement(_antd.Col, {
     span: 14
-  }, !state.exportType ? /*#__PURE__*/_react.default.createElement(_antd.Input, {
-    size: "small",
-    value: (0, _lodash.isString)(state.export) ? state.export : '',
-    onChange: function onChange(e) {
-      return handleInputChange('export', e);
-    },
-    placeholder: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".expUrl.placeholder"),
-      label: '请输入自定义接口'
-    })
-  }) : /*#__PURE__*/_react.default.createElement(_antd.Select, {
+  }, /*#__PURE__*/_react.default.createElement(_antd.Select, {
     size: "small",
     style: {
       width: '100%'
@@ -163,7 +157,8 @@ var ImpExp = function ImpExp(_ref) {
     placeholder: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".expType.placeholder"),
       label: '请选择自定义行为'
-    })
+    }),
+    disabled: !!exportDisabled
   }, expTypeList === null || expTypeList === void 0 ? void 0 : expTypeList.map(function (opt) {
     return /*#__PURE__*/_react.default.createElement(_antd.Select.Option, {
       key: opt.key,
@@ -178,8 +173,12 @@ var ImpExp = function ImpExp(_ref) {
     }
   }, /*#__PURE__*/_react.default.createElement(_antd.Switch, {
     size: "small",
-    defaultChecked: !!state.exportType,
-    onChange: handleSwitchChangeExport
+    defaultChecked: false,
+    onChange: function onChange(val) {
+      setExportDisabled(!val);
+    },
+    checkedChildren: "\u884C\u4E3A",
+    unCheckedChildren: "\u9ED8\u8BA4"
   })));
 };
 var _default = exports.default = ImpExp;

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

@@ -73,16 +73,13 @@ var ImpExp = function ImpExp(_ref) {
     suppressPadding: true
   }, /*#__PURE__*/_react.default.createElement(_antd.Col, {
     span: 14
-  }, !state.customType ? /*#__PURE__*/_react.default.createElement(_antd.Input, {
+  }, !state.customType && state.type === 'import' ? /*#__PURE__*/_react.default.createElement(_antd.Input, {
     size: "small",
     value: (0, _lodash.isString)(state.customParam) ? state.customParam : '',
     onChange: function onChange(e) {
       return handleInputChange(state.type, e);
     },
-    placeholder: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".expUrl.placeholder"),
-      label: '请输入自定义接口'
-    })
+    placeholder: "\u8BF7\u8F93\u5165\u6A21\u7248ID"
   }) : /*#__PURE__*/_react.default.createElement(_antd.Select, {
     size: "small",
     style: {
@@ -101,7 +98,7 @@ var ImpExp = function ImpExp(_ref) {
     }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
       title: opt.label
     }, opt.label));
-  }))), /*#__PURE__*/_react.default.createElement(_antd.Col, {
+  }))), state.type === 'import' && /*#__PURE__*/_react.default.createElement(_antd.Col, {
     span: 4,
     style: {
       textAlign: 'center'
@@ -109,7 +106,9 @@ var ImpExp = function ImpExp(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_antd.Switch, {
     size: "small",
     defaultChecked: !!state.customType,
-    onChange: handleSwitchChange
+    onChange: handleSwitchChange,
+    checkedChildren: "\u884C\u4E3A",
+    unCheckedChildren: "\u6A21\u7248"
   }))));
 };
 var _default = exports.default = ImpExp;

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

@@ -13,6 +13,7 @@ var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _lodash = require("lodash");
 var _utils = require("@luck-design-biz/base/utils");
+var _ContextProvider = require("../../engine/provider/ContextProvider");
 var _SortBox = require("../components/SortBox");
 var _ListEditor = require("../components/ListEditor");
 var _PopConfirm = _interopRequireDefault(require("../components/PopConfirm"));
@@ -27,7 +28,9 @@ var _RADIO_STYLE_ = {
 };
 var TableTopFilter = function TableTopFilter(_ref) {
   var defaultValue = _ref.defaultValue,
-    _onChange = _ref.onChange;
+    _onChange = _ref.onChange,
+    nodeId = _ref.nodeId;
+  var ctx = (0, _ContextProvider.useContext)();
   var _useState = (0, _react.useState)(function () {
       if ((0, _lodash.isNil)(defaultValue)) return 'nil';
       if ((0, _lodash.isString)(defaultValue)) return 'customApi';
@@ -49,6 +52,17 @@ var TableTopFilter = function TableTopFilter(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     apiUrl = _useState4[0],
     setApiUrl = _useState4[1];
+  var _useDebounceFn = (0, _ahooks.useDebounceFn)(function (val) {
+      setDict({
+        key: val
+      });
+      if (dict !== null && dict !== void 0 && dict.field) _onChange((0, _objectSpread2.default)((0, _objectSpread2.default)({}, dict), {}, {
+        key: val
+      }));
+    }, {
+      wait: 400
+    }),
+    handleDictChange = _useDebounceFn.run;
   var handleAdd = (0, _ahooks.useMemoizedFn)(function () {
     var id = (0, _utils.suid)();
     dispatch({
@@ -56,7 +70,7 @@ var TableTopFilter = function TableTopFilter(_ref) {
       payload: {
         id: id,
         value: id,
-        field: id,
+        field: void 0,
         label: "\u8FC7\u6EE4\u9879".concat(options.length + 1)
       },
       callback: function callback(newOptions) {
@@ -145,9 +159,10 @@ var TableTopFilter = function TableTopFilter(_ref) {
         id: "".concat(_I18N_PREFIX_, ".field"),
         label: '字段'
       })), /*#__PURE__*/_react.default.createElement(_PopForm.PopFormItemRight, null, /*#__PURE__*/_react.default.createElement(_FieldSelector.default, {
+        dsid: ctx.componentMap.get(nodeId).api.getSelfData().props.dataset.uid,
         defaultValue: opt.field,
         style: {
-          width: '50%'
+          width: '100%'
         },
         placeholder: (0, _utils.formatMessage)({
           id: "".concat(_I18N_PREFIX_, ".field.placeholder"),
@@ -211,7 +226,7 @@ var TableTopFilter = function TableTopFilter(_ref) {
     }
   }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
     size: "small",
-    value: dict === null || dict === void 0 ? void 0 : dict.key,
+    defaultValue: dict === null || dict === void 0 ? void 0 : dict.key,
     style: {
       width: '50%'
     },
@@ -220,15 +235,10 @@ var TableTopFilter = function TableTopFilter(_ref) {
       label: '请输入字典key'
     }),
     onChange: function onChange(e) {
-      var key = e.target.value;
-      setDict({
-        key: key
-      });
-      if (dict !== null && dict !== void 0 && dict.field) _onChange((0, _objectSpread2.default)((0, _objectSpread2.default)({}, dict), {}, {
-        key: key
-      }));
+      return handleDictChange(e.target.value);
     }
   }), /*#__PURE__*/_react.default.createElement(_FieldSelector.default, {
+    dsid: ctx.componentMap.get(nodeId).api.getSelfData().props.dataset.uid,
     style: {
       width: '50%'
     },
@@ -286,7 +296,7 @@ var TableTopFilter = function TableTopFilter(_ref) {
     size: "small",
     value: apiUrl,
     placeholder: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".dict.placeholder"),
+      id: "".concat(_I18N_PREFIX_, ".customApi.placeholder"),
       label: '请输入接口地址'
     }),
     style: {