@luck-design-biz/luckda 0.0.25-9 → 0.0.25-af-1

package/es/components/LdFormList/index.js

@@ -6,15 +6,13 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded4 = ["ldId", "initData", "overModel"];
-import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState, useEffect } from 'react';
-import { connect, getDvaApp, useRouteMatch } from 'umi';
+import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
+import { connect, getDvaApp, useRouteMatch, useModel } from 'umi';
 import PropTypes from 'prop-types';
-import { isArray, sortBy, mapValues, reduce, includes } from 'lodash';
-import { BpmButton } from '@luck-design-biz/bpm';
 import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
 import { BasicDivider } from 'luck-design';
 import { ChildrenUtil } from '@luck-design-biz/base/utils';
@@ -26,7 +24,10 @@ import { LuckDaContext } from "../Builder";
 import { LuckDaPopContext } from "../LdPop";
 import createModel from "./model";
 import { onBatchSubmitAction } from "../../helper/action";
-import useTodo from "../../lowcode/engine/tools/useTodo";
+import { isArray, sortBy, mapValues } from 'lodash';
+import { BpmButton } from '@luck-design-biz/bpm';
+import { readBehaviorCall } from "../../services";
+import { parse, stringify } from 'querystring';
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -55,10 +56,8 @@ var LdFormList = function LdFormList(_ref) {
     } : _ref$renderFormExtra,
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
-    setVerifyRules = _ref.setVerifyRules,
     props = _objectWithoutProperties(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
-  var currentValueRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     submitLoading = _useState2[0],
@@ -71,10 +70,6 @@ var LdFormList = function LdFormList(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     bizData = _useState6[0],
     setBizData = _useState6[1];
-  var _useTodo = useTodo(),
-    _useTodo2 = _slicedToArray(_useTodo, 2),
-    _ = _useTodo2[0],
-    callBehavior = _useTodo2[1];
   var luckTheme = useCreation(function () {
     return document.body.getAttribute('luck-theme');
   }, []);
@@ -88,9 +83,6 @@ var LdFormList = function LdFormList(_ref) {
   var formListRef = useRef(null);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, formListRef.current), {}, {
-      getCValue: function getCValue() {
-        return currentValueRef.current || props.formData;
-      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         if (props.formMode !== 'add') {
@@ -103,8 +95,7 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      },
-      ticketData: props.ticketData
+      }
     });
   });
   var handleValueChange = useMemoizedFn(function (change) {
@@ -115,7 +106,6 @@ var LdFormList = function LdFormList(_ref) {
       var getValue = ((_formRefs$key = formRefs[key]) !== null && _formRefs$key !== void 0 && (_formRefs$key = _formRefs$key.formRef) !== null && _formRefs$key !== void 0 && _formRefs$key.current ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
       return _defineProperty({}, key, getValue && getValue());
     });
-    currentValueRef.current = data;
     onValueChange(change, data);
   });
   var renderExtra = useMemoizedFn(function (formId, extraConfig, type) {
@@ -135,7 +125,7 @@ var LdFormList = function LdFormList(_ref) {
     }, bpmButtonProps)));
   };
   useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _props$formData$mainF, _params, response, _yield$callBehavior, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -145,14 +135,13 @@ var LdFormList = function LdFormList(_ref) {
           }
           _params = {
             indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
-            mainDataSetKey: mainDataSetKey
-          }; // 请求是否有工作流服务
-          _context.next = 4;
-          return callBehavior({
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
+            mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
-          }, _params);
+          }; // 请求是否有工作流服务
+          _context.next = 4;
+          return readBehaviorCall(_params);
         case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
@@ -160,15 +149,13 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return callBehavior({
-            moduleCode: rest.moduleCode,
-            datasetCode: mainDataSetKey,
+          return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
             behaviorKey: 'readBpm'
-          }, _params);
+          }));
         case 8:
-          _yield$callBehavior = _context.sent;
-          code = _yield$callBehavior.code;
-          data = _yield$callBehavior.data;
+          _yield$readBehaviorCa = _context.sent;
+          code = _yield$readBehaviorCa.code;
+          data = _yield$readBehaviorCa.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
             tempObj = _objectSpread(_objectSpread({}, props.formData[mainFormLdId]), {}, {
@@ -236,11 +223,7 @@ var LdFormList = function LdFormList(_ref) {
     renderExtra: renderExtra
   });
   var formList = useCreation(function () {
-    var _list = renderFormList(formConfig);
-    return reduce(_list, function (result, item) {
-      if (!item.serial || item.serialEffect === 'disable' || includes(resources, item.serial)) result.push(item);
-      return result;
-    }, []);
+    return renderFormList(formConfig);
   }, [formConfig]);
   var formExtra = useCreation(function () {
     return renderFormExtra && isArray(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
@@ -248,7 +231,7 @@ var LdFormList = function LdFormList(_ref) {
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
-  return formList.length > 0 ? /*#__PURE__*/React.createElement(FormList, _extends({
+  return /*#__PURE__*/React.createElement(FormList, _extends({
     editFlow: true,
     formState: formState,
     formMode: formMode,
@@ -275,32 +258,30 @@ var LdFormList = function LdFormList(_ref) {
     var _o$props;
     return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
   }).map(function (formProps) {
-    var _formProps$type = formProps.type,
-      type = _formProps$type === void 0 ? 'auto' : _formProps$type;
-    if (includes(['auto', 'writer', 'grid'], type)) {
+    if (formProps.dataSetKey) {
       var _ref8 = formProps || {},
         ldId = _ref8.id,
         _ref8$header = _ref8.header,
         header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
         title = _ref8.title,
-        selfReadOnly = _ref8.readOnly,
+        _readOnly = _ref8.readOnly,
         _ref8$extraConfig = _ref8.extraConfig,
         extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
         _ref8$renderTopLeft = _ref8.renderTopLeft,
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/React.createElement(React.Fragment, null);
         } : _ref8$renderTopLeft,
-        serial = _ref8.serial,
         _props = _objectWithoutProperties(_ref8, _excluded3);
+      var _props$type = _props.type,
+        type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
-      var _readOnly = selfReadOnly || serial && !includes(resources, serial);
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
         title: title || ldId,
-        extra: type === 'auto' && formProps.dataSetKey && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
+        extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-      }, formProps.dataSetKey && renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+      }, renderForm(_objectSpread(_objectSpread({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -309,19 +290,18 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
-        },
-        setVerifyRules: setVerifyRules
+        }
       })));
       return /*#__PURE__*/React.createElement(Fragment, {
         key: ldId
       }, header === 'divider' && /*#__PURE__*/React.createElement(BasicDivider, {
         title: title || ldId,
         id: ldId
-      }), type === 'auto' && formProps.dataSetKey && /*#__PURE__*/React.createElement("div", {
+      }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), formProps.dataSetKey && renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -330,8 +310,7 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'), _renderTopLeft()];
-        },
-        setVerifyRules: setVerifyRules
+        }
       })));
     }
     return ChildrenUtil.deepMap(formProps, function (child) {
@@ -340,7 +319,7 @@ var LdFormList = function LdFormList(_ref) {
         mode: child.props.mode || 'tab'
       }) : child.props);
     })[0];
-  })) : null;
+  }));
 };
 
 // 构建带有model的组件

package/es/components/LdGrid/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "_loading", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable", "autoRowClick"],
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
@@ -26,7 +26,6 @@ var LdGrid = function LdGrid(_ref) {
     detail = _ref.detail,
     params = _ref.params,
     filters = _ref.filters,
-    _loading = _ref._loading,
     loading = _ref.loading,
     unclosableSet = _ref.unclosableSet,
     onQuery = _ref.onQuery,
@@ -45,8 +44,6 @@ var LdGrid = function LdGrid(_ref) {
     isFlow = _ref.isFlow,
     isTreeGrid = _ref.isTreeGrid,
     writable = _ref.writable,
-    _ref$autoRowClick = _ref.autoRowClick,
-    autoRowClick = _ref$autoRowClick === void 0 ? false : _ref$autoRowClick,
     props = _objectWithoutProperties(_ref, _excluded);
   var gridRef = useRef(null);
   var treeConfig = useCreation(function () {
@@ -67,19 +64,8 @@ var LdGrid = function LdGrid(_ref) {
   useEffect(function () {
     readFilter && readFilter(params, filters);
   }, [params, filters]);
-  useEffect(function () {
-    if (autoRowClick) {
-      if (list[0]) props.onRowClick && props.onRowClick(detail[list[0]], 0);else props.onRowClick && props.onRowClick(null);
-    }
-  }, [list[0]]);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, gridRef.current), {}, {
-      getProps: function getProps() {
-        var _getDvaApp;
-        return {
-          apiUrl: (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || (_getDvaApp = _getDvaApp._store.getState()[namespace]) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.apiUrl
-        };
-      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
@@ -96,10 +82,10 @@ var LdGrid = function LdGrid(_ref) {
     });
   }, [batchOperations]);
 
-  /**
-   * 优先级
-   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
-   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
+  /**
+   * 优先级
+   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
+   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = useCreation(function () {
     if (columnsReset) {
@@ -111,7 +97,7 @@ var LdGrid = function LdGrid(_ref) {
     var _columnsRewrite = isFunction(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = keyBy(columns, 'aliaName');
     var customColumns = keyBy(_columnsRewrite, 'field');
-    var mergeFields = union(keys(customColumns), keys(defaultColumns));
+    var mergeFields = union(keys(defaultColumns), keys(customColumns));
     return transform(mergeFields, function (result, field) {
       var _customColumns$field;
       if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
@@ -156,7 +142,7 @@ var LdGrid = function LdGrid(_ref) {
     ,
     actionsColumn: _actionsColumn,
     batchOperations: _batchOperations,
-    loading: _loading || loading,
+    loading: loading,
     pagination: isFlow ? false : _objectSpread({
       total: total,
       current: current,
@@ -187,16 +173,16 @@ var LdIndex = function LdIndex(_ref2) {
     props = _objectWithoutProperties(_ref2, _excluded2);
   var isTreeGrid = isNil(_isTreeGrid) ? includes(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = useCreation(function () {
-    var _getDvaApp2, _getDvaApp3;
-    (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
-    if (!((_getDvaApp3 = getDvaApp()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
-      var _getDvaApp4;
-      (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model(createModel(namespace, _objectSpread(_objectSpread({
-        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
+    var _getDvaApp, _getDvaApp2;
+    (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
+    if (!((_getDvaApp2 = getDvaApp()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
+      var _getDvaApp3;
+      (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model(createModel(namespace, _objectSpread(_objectSpread({
+        isFlow: isTreeGrid || !!props.isFlow
       }, overModel), {}, {
-        isFlow: isTreeGrid || !!props.isFlow,
-        moduleCode: moduleCode,
         dataSetKey: props.dataSetKey,
+        moduleCode: moduleCode,
+        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid',
         afterQuery: afterQuery
       })));
     }
@@ -204,7 +190,7 @@ var LdIndex = function LdIndex(_ref2) {
       suppressInit: suppressInit,
       afterInit: props.afterInit
     });
-  }, [namespace, props.dataSetKey]);
+  }, [namespace]);
   return /*#__PURE__*/React.createElement(Component, _extends({
     isTreeGrid: isTreeGrid,
     namespace: namespace

package/es/components/LdGridForm/index.js

@@ -2,9 +2,9 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 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 = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
 import React, { createRef, useContext } from 'react';
-import { reduce, keyBy, isEmpty, pick, omit } from 'lodash';
+import { transform } from 'lodash';
 import classNames from 'classnames';
 import ldBuilder from "../../helper/ldBuilder";
 import { GridForm } from '@luck-design-biz/base/FormList';
@@ -25,7 +25,6 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     dataSetKey = _ref.dataSetKey,
     _ref$columnsRewrite = _ref.columnsRewrite,
     columnsRewrite = _ref$columnsRewrite === void 0 ? [] : _ref$columnsRewrite,
-    columnsReset = _ref.columnsReset,
     _ref$onQuery = _ref.onQuery,
     onQuery = _ref$onQuery === void 0 ? {} : _ref$onQuery,
     _ref$onAdd = _ref.onAdd,
@@ -51,12 +50,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     className = _ref.className,
     formRef = _ref.formRef,
     formMode = _ref.formMode,
-    fields = _ref.fields,
-    setVerifyRules = _ref.setVerifyRules,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/createRef({});
+  var defaultValues = /*#__PURE__*/createRef();
   var isMain = ldId === mainFormLdId;
   var gridColumns = columns.map(function (col) {
     if ((col.comName || defaultComName[col.property]) === 'radio') return _objectSpread(_objectSpread({}, col), {}, {
@@ -65,14 +62,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     return col;
   });
   var _columns = function () {
-    var fieldsObj = keyBy(fields, 'field');
-    var columnsObj = keyBy(gridColumns, 'field');
-    var keys = isEmpty(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
-    var _nodes = reduce(keys, function (result, key) {
-      var setting = fieldsObj[key];
-      var col = columnsObj[key];
-      if (col !== null && col !== void 0 && col.isShowInForm) {
+    var _nodes = transform(gridColumns, function (result, col) {
+      if (col.isShowInForm) {
         var _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.aliaName;
@@ -82,24 +74,17 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           mode: 'grid'
         });
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        var newCol = _objectSpread(_objectSpread({}, col), {}, {
-          setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
-        });
-        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
-        result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
+        result.push(getFormColumn(type, col, _objectSpread(_objectSpread({}, customColumn), {}, {
           formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
             formRef: formRef,
-            formMode: formMode,
-            setting: omit(setting, [].concat(defaultSet, ['uid', 'field']))
+            formMode: formMode
           })
         })));
       }
-      return result;
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps && setFieldProps(_defineProperty({}, ldId, _nodes.map(function (col) {
+    setFieldProps(_defineProperty({}, ldId, _nodes.map(function (col) {
       var node = col.renderBasicFormItem();
       var renderBasicFormItem = node === null || node === void 0 ? void 0 : node.props;
       return _objectSpread(_objectSpread({}, col), {}, {
@@ -108,11 +93,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         }, renderBasicFormItem)
       });
     })));
-    return columnsReset ? columnsReset(_nodes) : _nodes;
+    return _nodes;
   }();
-  var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
-    return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
-  }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
+  var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {
     formId: ldId,
     columns: _columns,
@@ -152,10 +135,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     orderByAdd: "asc",
     rowSelection: true,
     type: type,
-    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno',
-    wrapperProps: {
-      id: ldId
-    }
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
   }, props, {
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
@@ -172,9 +152,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, onQuery), {}, {
       format: function format(data) {
         var formItemData = data.map(function (item) {
-          return formItemDataFormat(gridColumns.map(function (c) {
-            return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
-          }), item);
+          return formItemDataFormat(gridColumns, item);
         });
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
         return formItemData;

package/es/components/LdGridForm/index.less

@@ -1,7 +1,7 @@
-.ldGridForm {
-  :global {
-    .ag-layout-auto-height {
-      height: 100% !important;
-    }
-  }
-}
+.ldGridForm {
+  :global {
+    .ag-layout-auto-height {
+      height: 100% !important;
+    }
+  }
+}

package/es/components/LdRuntimeCom/index.js

@@ -1,24 +1,16 @@
-import _construct from "@babel/runtime/helpers/esm/construct";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["children"];
 import React, { useEffect, useState } from 'react';
 import * as Babel from '@babel/standalone';
 import * as LuckAntd from 'luck-design/antd';
 import * as LuckDesign from 'luck-design';
-import * as Lodash from 'lodash';
-import * as ahooks from 'ahooks';
-import { keys } from 'lodash';
 
-/**
- * 实时代码渲染组件
- * todo：沙箱上下文的集成
- * todo：Loading效果的优化
+/**
+ * 实时代码渲染组件
+ * todo：沙箱上下文的集成
+ * todo：Loading效果的优化
  */
 var LdRuntimeCom = function LdRuntimeCom(_ref) {
-  var children = _ref.children,
-    rest = _objectWithoutProperties(_ref, _excluded);
+  var children = _ref.children;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     Component = _useState2[0],
@@ -31,25 +23,20 @@ var LdRuntimeCom = function LdRuntimeCom(_ref) {
         presets: ['react']
       }).code;
 
+      // 输出编译后的代码用于排错
+      console.log('transformedCode', transformedCode);
+
       // 自动
       var functionNameMatch = transformedCode.match(/function\s+([^\s(]+)/);
       if (functionNameMatch && functionNameMatch.length > 1) {
         var functionName = functionNameMatch[1];
-        var argsName = keys(rest);
-        var _args = argsName.map(function (n) {
-          return rest[n];
-        });
-        var execute = _construct(Function, ['React', 'LuckAntd', 'LuckDesign', 'libs'].concat(_toConsumableArray(argsName), ["".concat(transformedCode, "; return ").concat(functionName, ";")]));
+        var execute = new Function('React', 'LuckAntd', 'LuckDesign', "".concat(transformedCode, "; return ").concat(functionName, ";"));
         // 设置组件状态
-        var ReactComponent = execute.apply(void 0, [React, LuckAntd, LuckDesign, {
-          Lodash: Lodash,
-          ahooks: ahooks
-        }].concat(_toConsumableArray(_args)));
+        var ReactComponent = execute(React, LuckAntd, LuckDesign);
         setComponent( /*#__PURE__*/React.createElement(ReactComponent, null));
       }
     }
   }, [code]);
-  if (code === '') return null;
-  return Component ? Component : 'JSX Component';
+  return Component ? Component : /*#__PURE__*/React.createElement("div", null, "Loading...");
 };
 export default LdRuntimeCom;