@luck-design-biz/luckda 1.0.0-alpha → 1.0.1-10

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 UmiJS
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020 UmiJS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,40 +1,40 @@
-# 微服务 3.0 纯净版
-
-luck-react-pure 是一个基于 qiankun 框架搭建的极简微服务框架，作为微服务业务子系统的开发基座。旨在为业务子系统提供简单、轻量的解决方案。该框架去除了冗余的功能，专注于提供基本的功能支持，使开发者能够更快速地搭建和开发业务子系统。
-
-## 启动
-
-安装 `node_modules`:
-
-```bash
-pnpm install
-```
-
-## 开始项目
-
-```bash
-pnpm start
-```
-
-## 代码校验
-
-本框架提供了代码校验方案，校验不通过禁止提交代码，当提交代码时将会校验以下内容：
-
-### 代码规范
-
-根据 eslint 校验规范。
-
-### commit message 校验
-
-commit message 格式：
-
-```bash
-💥 feat(模块): 添加了个很棒的功能
-🐛 fix(模块): 修复了一些 bug
-📝 docs(模块): 更新了一下文档
-💄 UI(模块): 修改了一下样式
-🎨 chore(模块): 对脚手架做了些更改
-🚨 refactor(模块): 重构（即不是新增功能，也不是修改bug的代码变动）
-🐞 test(模块): 增加、修改测试用例
-🌟 release(3.0.1):url
-```
+# 微服务 3.0 纯净版
+
+luck-react-pure 是一个基于 qiankun 框架搭建的极简微服务框架，作为微服务业务子系统的开发基座。旨在为业务子系统提供简单、轻量的解决方案。该框架去除了冗余的功能，专注于提供基本的功能支持，使开发者能够更快速地搭建和开发业务子系统。
+
+## 启动
+
+安装 `node_modules`:
+
+```bash
+pnpm install
+```
+
+## 开始项目
+
+```bash
+pnpm start
+```
+
+## 代码校验
+
+本框架提供了代码校验方案，校验不通过禁止提交代码，当提交代码时将会校验以下内容：
+
+### 代码规范
+
+根据 eslint 校验规范。
+
+### commit message 校验
+
+commit message 格式：
+
+```bash
+💥 feat(模块): 添加了个很棒的功能
+🐛 fix(模块): 修复了一些 bug
+📝 docs(模块): 更新了一下文档
+💄 UI(模块): 修改了一下样式
+🎨 chore(模块): 对脚手架做了些更改
+🚨 refactor(模块): 重构（即不是新增功能，也不是修改bug的代码变动）
+🐞 test(模块): 增加、修改测试用例
+🌟 release(3.0.1):url
+```

package/es/components/Builder/index.js

@@ -2,13 +2,15 @@ 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 _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { forwardRef, createContext, useState, useRef, useContext } from 'react';
+import React, { forwardRef, createContext, useState, useRef, useContext, useEffect } from 'react';
 import { useRequest, useSetState, useMemoizedFn } from 'ahooks';
 import { BasicForm, BasicFormItem } from 'luck-design';
+import { formatMessage } from '@luck-design-biz/base/utils';
+import { META_TAG_NAME, LC_RUNTIME_KEY } from "../../lowcode/constants";
+import { setMetaAttrs } from "../../lowcode/engine/tools/helper";
 import LdPop from "../LdPop";
-import { readModlue } from "../../services";
+import { readModlue, noAuthTransformCode } from "../../services";
 import { doAction as doActionUtils } from "../../helper/action";
-import { formatMessage } from '@luck-design-biz/base/utils';
 export var LuckDaContext = /*#__PURE__*/createContext();
 export var useLDCtx = function useLDCtx() {
   return useContext(LuckDaContext);
@@ -28,6 +30,16 @@ var builder = function builder(WrappedComponent, moduleCode) {
       pops = _useSetState2[0],
       setPops = _useSetState2[1];
     var fieldProps = useRef({});
+    useEffect(function () {
+      setMetaAttrs(LC_RUNTIME_KEY, 'live');
+      noAuthTransformCode({
+        code: moduleCode
+      }).then(function (res) {
+        var code = res.code,
+          data = res.data;
+        if (code === 1) setMetaAttrs(META_TAG_NAME, data);
+      });
+    }, []);
     var _useRequest = useRequest(readModlue, {
         defaultParams: [{
           moduleCode: moduleCode

package/es/components/ComplexItem/index.js

@@ -1,22 +1,24 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["wrapperRef", "config", "renderInfoMode", "complexConfig"];
-import React, { useState, forwardRef } from 'react';
-import { getDvaApp } from 'umi';
+var _excluded = ["showPop"],
+  _excluded2 = ["wrapperRef", "config", "renderInfoMode", "complexConfig"];
+import React, { forwardRef } from 'react';
+import { useCreation } from 'ahooks';
 import { Tag } from 'luck-design/antd';
-import { isArray } from 'lodash';
-import { TreeSelector } from '@luck-design-biz/base';
-import { formatMessage, dataToTree } from '@luck-design-biz/base/utils';
-import { BasicFormItem } from 'luck-design';
-import api from "@/services/ApiConfig";
+import { isArray, keyBy } from 'lodash';
+import { TreeSelector, GridSelector } from '@luck-design-biz/base';
+import { formatMessage } from '@luck-design-biz/base/utils';
 import { fetchContent } from "./service";
+import { includes } from 'lodash';
 var Index = function Index(_ref) {
   var wrapperRef = _ref.wrapperRef,
     _ref$config = _ref.config,
-    config = _ref$config === void 0 ? {} : _ref$config,
+    _ref$config2 = _ref$config === void 0 ? {} : _ref$config,
+    showPop = _ref$config2.showPop,
+    config = _objectWithoutProperties(_ref$config2, _excluded),
     renderInfoMode = _ref.renderInfoMode,
     _ref$complexConfig = _ref.complexConfig,
     _ref$complexConfig$is = _ref$complexConfig.isTree,
@@ -26,48 +28,57 @@ var Index = function Index(_ref) {
     dataSetCode = _ref$complexConfig.dataSetCode,
     keyField = _ref$complexConfig.keyField,
     valueField = _ref$complexConfig.valueField,
-    props = _objectWithoutProperties(_ref, _excluded);
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    dataSource = _useState2[0],
-    setDataSource = _useState2[1];
-  var handleFocus = function handleFocus() {
-    if (!dataSource || dataSource.length === 0) {
-      fetchContent(dataModel, {
-        datasetCode: dataSetCode,
-        moduleCode: moduleCode
-      }).then(function (res) {
-        var code = res.code,
-          data = res.data;
-        if (code === 1) {
-          var formatData = data.map(function (i) {
-            return _objectSpread(_objectSpread({}, i), {}, {
-              key: i[keyField],
-              value: i[keyField],
-              label: valueField.length > 0 ? valueField.split(',').map(function (val) {
-                return i[val];
-              }).join('-') : '',
-              title: valueField.length > 0 ? valueField.split(',').map(function (val) {
-                return i[val];
-              }).join('-') : ''
-            });
-          });
-          if (isTree) {
-            setDataSource(dataToTree(formatData, null, 'uid', 'parent_uid'));
-          } else setDataSource(formatData);
-        }
-      });
-    }
-  };
+    props = _objectWithoutProperties(_ref, _excluded2);
+  var Selector = useCreation(function () {
+    return isTree ? TreeSelector : GridSelector;
+  }, [isTree]);
   return renderInfoMode ? renderInfoMode(function (value) {
     return (config.multiple || config.mode === 'multiple') && isArray(value) ? value.map(function (item) {
       return /*#__PURE__*/React.createElement(Tag, {
         key: item.key
       }, item.label || item.value || item.key);
     }) : /*#__PURE__*/React.createElement("span", null, value.label || value.value || value.key);
-  }) : /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
-    type: isTree ? 'treeSelect' : 'select',
+  }) : /*#__PURE__*/React.createElement(Selector, _extends({}, props, {
+    keyName: keyField,
+    titleKey: "title",
+    api: ( /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(get) {
+        var res, formatData, detail;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return fetchContent(dataModel, _objectSpread({
+                datasetCode: dataSetCode,
+                moduleCode: moduleCode
+              }, get));
+            case 2:
+              res = _context.sent;
+              formatData = (res === null || res === void 0 ? void 0 : res.data.map(function (i) {
+                return _objectSpread(_objectSpread({}, i), {}, {
+                  title: valueField.length > 0 ? valueField.split(',').map(function (val) {
+                    return i[val];
+                  }).join('-') : ''
+                });
+              })) || [];
+              detail = keyBy(formatData, window.appConfig.constraintKeys.PRIMARY);
+              return _context.abrupt("return", _objectSpread(_objectSpread({}, res), {}, {
+                list: Object.keys(detail),
+                detail: detail
+              }));
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }()),
     ref: wrapperRef,
+    max: config.multiple || config.mode === 'multiple' ? 0 : 1,
+    noAddon: !(showPop !== null && showPop !== void 0 && showPop.show),
     config: _objectSpread(_objectSpread({
       required: false,
       placeholder: formatMessage({
@@ -76,11 +87,16 @@ var Index = function Index(_ref) {
       message: formatMessage({
         id: 'app.base.tip.select'
       })
-    }, config), {}, _defineProperty(_defineProperty({
-      showSearch: true,
+    }, config), {}, {
       optionFilterProp: 'title',
       treeNodeFilterProp: 'label'
-    }, isTree ? 'treeData' : 'dataSource', dataSource), "onFocus", handleFocus))
+    }),
+    selectorProps: {
+      columns: (showPop === null || showPop === void 0 ? void 0 : showPop.fields) || [],
+      resultColumns: ((showPop === null || showPop === void 0 ? void 0 : showPop.fields) || []).filter(function (i) {
+        return includes(valueField.split(','), i.field);
+      })
+    }
   }));
 };
 var RefCom = /*#__PURE__*/forwardRef(function (props, ref) {

package/es/components/LDActions/index.less

@@ -1,68 +1,68 @@
-@spanDefault: #262626;
-@spanPrimary: var(--ant-primary-color);
-@spanDanger: #ff4d4f;
-@spanDestroy: #820014;
-
-.ldActions {
-
-  button:not(:last-child) {
-    margin-right: 4px;
-  }
-  button:not(:first-child) {
-    margin-left: 4px;
-  }
-  span {
-    cursor: pointer;
-  }
-
-  button.default {
-    background-color: white;
-  }
-  span.default {
-    color: @spanDefault;
-  }
-
-  button.primary {
-    background-color: var(--ant-primary-color);
-    border-color: var(--ant-primary-color);
-    color: white;
-  }
-  span.primary {
-    color: @spanPrimary;
-  }
-
-  button.danger {
-    background-color: #ff4d4f;
-    border-color: #ff4d4f;
-    color: white;
-  }
-  span.danger {
-    color: @spanDanger;
-  }
-
-  button.destroy {
-    background-color: #820014;
-    border-color: #820014;
-    color: white;
-  }
-  span.destroy {
-    color: @spanDestroy;
-  }
-
-  span.disabled {
-    color: #bfbfbf;
-    cursor: not-allowed;
-  }
-}
-span.default.menuItem {
-  color: @spanDefault;
-}
-span.primary.menuItem {
-  color: @spanPrimary;
-}
-span.danger.menuItem {
-  color: @spanDanger;
-}
-span.destroy.menuItem {
-  color: @spanDestroy;
-}
+@spanDefault: #262626;
+@spanPrimary: var(--ant-primary-color);
+@spanDanger: #ff4d4f;
+@spanDestroy: #820014;
+
+.ldActions {
+
+  button:not(:last-child) {
+    margin-right: 4px;
+  }
+  button:not(:first-child) {
+    margin-left: 4px;
+  }
+  span {
+    cursor: pointer;
+  }
+
+  button.default {
+    background-color: white;
+  }
+  span.default {
+    color: @spanDefault;
+  }
+
+  button.primary {
+    background-color: var(--ant-primary-color);
+    border-color: var(--ant-primary-color);
+    color: white;
+  }
+  span.primary {
+    color: @spanPrimary;
+  }
+
+  button.danger {
+    background-color: #ff4d4f;
+    border-color: #ff4d4f;
+    color: white;
+  }
+  span.danger {
+    color: @spanDanger;
+  }
+
+  button.destroy {
+    background-color: #820014;
+    border-color: #820014;
+    color: white;
+  }
+  span.destroy {
+    color: @spanDestroy;
+  }
+
+  span.disabled {
+    color: #bfbfbf;
+    cursor: not-allowed;
+  }
+}
+span.default.menuItem {
+  color: @spanDefault;
+}
+span.primary.menuItem {
+  color: @spanPrimary;
+}
+span.danger.menuItem {
+  color: @spanDanger;
+}
+span.destroy.menuItem {
+  color: @spanDestroy;
+}

package/es/components/LdAutoForm/index.js

@@ -4,7 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
 import React, { createRef, useContext } from 'react';
-import { reduce, keyBy, isEmpty, pick, union, omit, forEach, debounce } from 'lodash';
+import { reduce, keyBy, isEmpty, pick, union, omit, forEach, debounce, isNil } from 'lodash';
 import { BasicDivider } from 'luck-design';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from "../../helper/ldBuilder";
@@ -54,7 +54,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
     _ref$relationKey = _ref.relationKey,
     relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
-    fields = _ref.fields,
+    _ref$fields = _ref.fields,
+    fields = _ref$fields === void 0 ? [] : _ref$fields,
     setVerifyRules = _ref.setVerifyRules,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
@@ -71,9 +72,10 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       var col = columnsObj[key];
       if ((setting === null || setting === void 0 ? void 0 : setting._type) === 'divider') {
         result.push( /*#__PURE__*/React.createElement(BasicDivider, {
-          title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
+          title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName,
+          key: key
         }));
-      } else if (col !== null && col !== void 0 && col.isShowInForm && setting !== null && setting !== void 0 && setting.isShow) {
+      } else if (col !== null && col !== void 0 && col.isShowInForm && (isNil(setting) || setting !== null && setting !== void 0 && setting.isShow)) {
         var customFiled = filedsRewrite.find(function (_field) {
           return _field.name === col.aliaName;
         }) || {};

package/es/components/LdFormList/index.js

@@ -6,11 +6,11 @@ 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", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading", "showConfigBtn", "affixBarZIndex"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
-import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState, useEffect } from 'react';
+import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
 import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
 import { isArray, sortBy, mapValues, reduce, includes } from 'lodash';
@@ -26,7 +26,7 @@ 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 { callBehavior } from "../../lowcode/engine/provider/ContextProvider/utils";
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -59,6 +59,9 @@ var LdFormList = function LdFormList(_ref) {
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     setVerifyRules = _ref.setVerifyRules,
     afterSubmitLoading = _ref.afterSubmitLoading,
+    _ref$showConfigBtn = _ref.showConfigBtn,
+    showConfigBtn = _ref$showConfigBtn === void 0 ? true : _ref$showConfigBtn,
+    affixBarZIndex = _ref.affixBarZIndex,
     props = _objectWithoutProperties(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var currentValueRef = useRef(null);
@@ -74,10 +77,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');
   }, []);
@@ -124,7 +123,8 @@ var LdFormList = function LdFormList(_ref) {
   var renderExtra = useMemoizedFn(function (formId, extraConfig, type) {
     return /*#__PURE__*/React.createElement(FormBtn, _extends({
       type: type,
-      formId: formId
+      formId: formId,
+      showConfigBtn: showConfigBtn
     }, extraConfig));
   });
 
@@ -218,9 +218,9 @@ var LdFormList = function LdFormList(_ref) {
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
         } else {
-          var _formListRef$current;
+          var _formListRef$current, _formListRef$current2;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, mainFormData), function () {
+          (_formListRef$current2 = formListRef.current) === null || _formListRef$current2 === void 0 || _formListRef$current2.onQuery(null, _defineProperty({}, mainFormLdId, mainFormData), function () {
             formListRef.current.setFormMode('info');
           });
         }
@@ -276,6 +276,7 @@ var LdFormList = function LdFormList(_ref) {
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout,
+    zIndex: affixBarZIndex,
     getContainer: getContainer
   }), sortBy([].concat(_toConsumableArray(formList), _toConsumableArray(formExtra)), function (o) {
     var _o$props;

package/es/components/LdGrid/index.js

@@ -93,10 +93,10 @@ var LdGrid = function LdGrid(_ref) {
     });
   }, [batchOperations]);
 
-  /**
-   * 优先级
-   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
-   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
+  /**
+   * 优先级
+   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
+   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = useCreation(function () {
     if (columnsReset) {

package/es/components/LdGridForm/index.js

@@ -70,32 +70,49 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     var keys = isEmpty(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
     var _nodes = reduce(keys, function (result, key) {
+      var _customColumn;
       var setting = fieldsObj[key];
       var col = columnsObj[key];
-      if (col !== null && col !== void 0 && col.isShowInForm) {
-        var _customColumn;
-        var customColumn = columnsRewrite.find(function (column) {
-          return column.field === col.aliaName;
-        }) || {};
-        if (col.isReadOnly) customColumn = _objectSpread(_objectSpread({}, customColumn), {}, {
-          editable: false,
-          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.fieldAliasName) || col.fieldName
-        });
-        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
-        result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), 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']))
-          })
-        })));
+      if (!(col !== null && col !== void 0 && col.isShowInForm) && !(col !== null && col !== void 0 && col.isShowInGrid)) {
+        return result;
+      }
+      var customColumn = columnsRewrite.find(function (column) {
+        return column.field === col.aliaName;
+      }) || {};
+      if (col !== null && col !== void 0 && col.isShowInForm && !(col !== null && col !== void 0 && col.isShowInGrid)) {
+        customColumn.mode = 'form';
+      } else if (!(col !== null && col !== void 0 && col.isShowInForm) && col !== null && col !== void 0 && col.isShowInGrid) {
+        customColumn.mode = 'grid';
+        customColumn.editable = false;
+        customColumn.formItemProps = function () {
+          return {
+            readOnly: true
+          };
+        };
       }
+      if (col.isReadOnly) customColumn = _objectSpread(_objectSpread({}, customColumn), {}, {
+        editable: false,
+        formItemProps: function formItemProps() {
+          return {
+            readOnly: true
+          };
+        }
+      });
+      _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.fieldAliasName) || col.fieldName
+      });
+      var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip', 'formMode'];
+      result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
+        formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
+          moduleCode: moduleCode,
+          formRef: formRef,
+          formMode: formMode,
+          render: setting === null || setting === void 0 ? void 0 : setting.render,
+          setting: omit(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
+        })
+      })));
       return result;
     }, []);
     defaultValues.current = _defaultValues;

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;
+    }
+  }
+}