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

package/es/utils/form.js

@@ -12,17 +12,17 @@ var _excluded = ["comName", "property"],
   _excluded9 = ["type", "name"];
 import React from 'react';
 import moment from 'moment';
-import { capitalize, merge, transform, isArray, omit, isNil, clone } from 'lodash';
+import { capitalize, merge, transform, isArray, omit, isNil, clone, cloneDeep } from 'lodash';
 import api from "@/services/ApiConfig";
 import { defaultComName, translator, splitStrToObj, formatCustomProps } from "../helper/form";
 import { getColumnRender } from "./grid";
 import * as formItemUtils from "../helper/FromItems";
 
-/**
- * 根据动态表单配置项生成formItem
- * @param {动态表单配置项} props
- * @param {自定义动态表单配置项} customProps
- * @returns <BasicForm name='' ... />
+/**
+ * 根据动态表单配置项生成formItem
+ * @param {动态表单配置项} props
+ * @param {自定义动态表单配置项} customProps
+ * @returns <BasicForm name='' ... />
  */
 export function getFormItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -31,7 +31,7 @@ export function getFormItem() {
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
-  if (property === 'sint' || property === 'number') props.opt_decimal = 0;
+  if (property === 'sint' || property === 'number' || property === 'long') props.opt_decimal = 0;
   var comType = comName || defaultComName[property];
   var _translator = translator(props),
     name = _translator.name,
@@ -56,16 +56,16 @@ export function getFormItem() {
   }));
 }
 
-/**
- * 根据后端返回数据组装表单数据
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---后端返回的未处理数据} values
- * @returns
+/**
+ * 根据后端返回数据组装表单数据
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---后端返回的未处理数据} values
+ * @returns
  */
 export var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var omitValues = {};
+  var omitValues = cloneDeep(values);
   var data = transform(propsList, function (result, n) {
     var _ref2 = n || {},
       comName = _ref2.comName,
@@ -125,16 +125,16 @@ export var formItemDataFormat = function formItemDataFormat() {
       default:
         if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }
-    omitValues = omit(values, [name, "".concat(name, "_virtual")]);
+    omitValues = omit(omitValues, [name, "".concat(name, "_virtual")]);
   }, {});
   return _objectSpread(_objectSpread({}, omitValues), data);
 };
 
-/**
- * 数据格式化
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---表单获取到的未处理数据} values
- * @returns
+/**
+ * 数据格式化
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---表单获取到的未处理数据} values
+ * @returns
  */
 export var dataFormat = function dataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -199,12 +199,12 @@ export var dataFormat = function dataFormat() {
   return _objectSpread(_objectSpread({}, values), data);
 };
 
-/**
- *
- * @param formType
- * @param props
- * @param customProps
- * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
+/**
+ *
+ * @param formType
+ * @param props
+ * @param customProps
+ * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
 export var getFormColumn = function getFormColumn() {
   var _props$config;

package/es/utils/grid.js

@@ -6,7 +6,7 @@ var _excluded = ["comName", "property"],
   _excluded3 = ["filter", "filterParams"];
 import React from 'react';
 import { getDvaApp } from 'umi';
-import { merge, isNil, isArray, includes, capitalize, isString } from 'lodash';
+import { merge, isNil, isArray, includes, capitalize, isString, isObject } from 'lodash';
 import { Switch, Tag } from 'luck-design/antd';
 import moment from 'moment';
 import UploadGridCell from "../upload/GridCell";
@@ -38,19 +38,20 @@ export function getColumnRender(name, type) {
       break;
     case 'year':
       render = function render(text) {
-        return text;
+        return moment.isMoment(text) ? text.format('YYYY') : text;
       };
       break;
     case 'user':
     case 'select':
     case 'group':
     case 'complex':
+    case 'dict':
       render = function render(text, record) {
-        if (record["".concat(name, "_virtual")]) return record["".concat(name, "_virtual")];
         if (isArray(text)) return text.map(function (i) {
           return i.label;
         }).join(',');
-        if (!isNil(text)) return text.label;
+        if (isObject(text)) return text.label;
+        if (record["".concat(name, "_virtual")]) return record["".concat(name, "_virtual")];
       };
       break;
     case 'switch':

package/lib/components/Builder/index.js

@@ -13,10 +13,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _luckDesign = require("luck-design");
+var _utils = require("@luck-design-biz/base/utils");
+var _constants = require("../../lowcode/constants");
+var _helper = require("../../lowcode/engine/tools/helper");
 var _LdPop = _interopRequireDefault(require("../LdPop"));
 var _services = require("../../services");
 var _action2 = require("../../helper/action");
-var _utils = require("@luck-design-biz/base/utils");
 var LuckDaContext = exports.LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
 var useLDCtx = exports.useLDCtx = function useLDCtx() {
   return (0, _react.useContext)(LuckDaContext);
@@ -36,6 +38,16 @@ var builder = function builder(WrappedComponent, moduleCode) {
       pops = _useSetState2[0],
       setPops = _useSetState2[1];
     var fieldProps = (0, _react.useRef)({});
+    (0, _react.useEffect)(function () {
+      (0, _helper.setMetaAttrs)(_constants.LC_RUNTIME_KEY, 'live');
+      (0, _services.noAuthTransformCode)({
+        code: moduleCode
+      }).then(function (res) {
+        var code = res.code,
+          data = res.data;
+        if (code === 1) (0, _helper.setMetaAttrs)(_constants.META_TAG_NAME, data);
+      });
+    }, []);
     var _useRequest = (0, _ahooks.useRequest)(_services.readModlue, {
         defaultParams: [{
           moduleCode: moduleCode

package/lib/components/ComplexItem/index.js

@@ -7,24 +7,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _umi = require("umi");
+var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _lodash = require("lodash");
 var _base = require("@luck-design-biz/base");
 var _utils = require("@luck-design-biz/base/utils");
-var _luckDesign = require("luck-design");
-var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _service = require("./service");
-var _excluded = ["wrapperRef", "config", "renderInfoMode", "complexConfig"];
+var _excluded = ["showPop"],
+  _excluded2 = ["wrapperRef", "config", "renderInfoMode", "complexConfig"];
 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 = (0, _objectWithoutProperties2.default)(_ref$config2, _excluded),
     renderInfoMode = _ref.renderInfoMode,
     _ref$complexConfig = _ref.complexConfig,
     _ref$complexConfig$is = _ref$complexConfig.isTree,
@@ -34,49 +35,58 @@ var Index = function Index(_ref) {
     dataSetCode = _ref$complexConfig.dataSetCode,
     keyField = _ref$complexConfig.keyField,
     valueField = _ref$complexConfig.valueField,
-    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useState = (0, _react.useState)([]),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    dataSource = _useState2[0],
-    setDataSource = _useState2[1];
-  var handleFocus = function handleFocus() {
-    if (!dataSource || dataSource.length === 0) {
-      (0, _service.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 (0, _objectSpread3.default)((0, _objectSpread3.default)({}, 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((0, _utils.dataToTree)(formatData, null, 'uid', 'parent_uid'));
-          } else setDataSource(formatData);
-        }
-      });
-    }
-  };
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
+  var Selector = (0, _ahooks.useCreation)(function () {
+    return isTree ? _base.TreeSelector : _base.GridSelector;
+  }, [isTree]);
   return renderInfoMode ? renderInfoMode(function (value) {
     return (config.multiple || config.mode === 'multiple') && (0, _lodash.isArray)(value) ? value.map(function (item) {
       return /*#__PURE__*/_react.default.createElement(_antd.Tag, {
         key: item.key
       }, item.label || item.value || item.key);
     }) : /*#__PURE__*/_react.default.createElement("span", null, value.label || value.value || value.key);
-  }) : /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
-    type: isTree ? 'treeSelect' : 'select',
+  }) : /*#__PURE__*/_react.default.createElement(Selector, (0, _extends2.default)({}, props, {
+    keyName: keyField,
+    titleKey: "title",
+    api: ( /*#__PURE__*/function () {
+      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(get) {
+        var res, formatData, detail;
+        return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return (0, _service.fetchContent)(dataModel, (0, _objectSpread2.default)({
+                datasetCode: dataSetCode,
+                moduleCode: moduleCode
+              }, get));
+            case 2:
+              res = _context.sent;
+              formatData = (res === null || res === void 0 ? void 0 : res.data.map(function (i) {
+                return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, i), {}, {
+                  title: valueField.length > 0 ? valueField.split(',').map(function (val) {
+                    return i[val];
+                  }).join('-') : ''
+                });
+              })) || [];
+              detail = (0, _lodash.keyBy)(formatData, window.appConfig.constraintKeys.PRIMARY);
+              return _context.abrupt("return", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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,
-    config: (0, _objectSpread3.default)((0, _objectSpread3.default)({
+    max: config.multiple || config.mode === 'multiple' ? 0 : 1,
+    noAddon: !(showPop !== null && showPop !== void 0 && showPop.show),
+    config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
       required: false,
       placeholder: (0, _utils.formatMessage)({
         id: 'app.base.tip.select'
@@ -84,11 +94,16 @@ var Index = function Index(_ref) {
       message: (0, _utils.formatMessage)({
         id: 'app.base.tip.select'
       })
-    }, config), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({
-      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 (0, _lodash.includes)(valueField.split(','), i.field);
+      })
+    }
   }));
 };
 var RefCom = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {

package/lib/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/lib/components/LdAutoForm/index.js

@@ -62,7 +62,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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
@@ -79,9 +80,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.default.createElement(_luckDesign.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 && ((0, _lodash.isNil)(setting) || setting !== null && setting !== void 0 && setting.isShow)) {
         var customFiled = filedsRewrite.find(function (_field) {
           return _field.name === col.aliaName;
         }) || {};

package/lib/components/LdFormList/index.js

@@ -30,8 +30,8 @@ var _Builder = require("../Builder");
 var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
-var _useTodo3 = _interopRequireDefault(require("../../lowcode/engine/tools/useTodo"));
-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 _utils2 = require("../../lowcode/engine/provider/ContextProvider/utils");
+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"];
@@ -66,6 +66,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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var currentValueRef = (0, _react.useRef)(null);
@@ -81,10 +84,6 @@ var LdFormList = function LdFormList(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     bizData = _useState6[0],
     setBizData = _useState6[1];
-  var _useTodo = (0, _useTodo3.default)(),
-    _useTodo2 = (0, _slicedToArray2.default)(_useTodo, 2),
-    _ = _useTodo2[0],
-    callBehavior = _useTodo2[1];
   var luckTheme = (0, _ahooks.useCreation)(function () {
     return document.body.getAttribute('luck-theme');
   }, []);
@@ -131,7 +130,8 @@ var LdFormList = function LdFormList(_ref) {
   var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig, type) {
     return /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, (0, _extends2.default)({
       type: type,
-      formId: formId
+      formId: formId,
+      showConfigBtn: showConfigBtn
     }, extraConfig));
   });
 
@@ -158,7 +158,7 @@ var LdFormList = function LdFormList(_ref) {
             mainDataSetKey: mainDataSetKey
           }; // 请求是否有工作流服务
           _context.next = 4;
-          return callBehavior({
+          return (0, _utils2.callBehavior)({
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
@@ -170,7 +170,7 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return callBehavior({
+          return (0, _utils2.callBehavior)({
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
             behaviorKey: 'readBpm'
@@ -225,9 +225,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, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
+          (_formListRef$current2 = formListRef.current) === null || _formListRef$current2 === void 0 || _formListRef$current2.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
             formListRef.current.setFormMode('info');
           });
         }
@@ -283,6 +283,7 @@ var LdFormList = function LdFormList(_ref) {
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout,
+    zIndex: affixBarZIndex,
     getContainer: getContainer
   }), (0, _lodash.sortBy)([].concat((0, _toConsumableArray2.default)(formList), (0, _toConsumableArray2.default)(formExtra)), function (o) {
     var _o$props;

package/lib/components/LdGrid/index.js

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

package/lib/components/LdGridForm/index.js

@@ -78,32 +78,49 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
     var _nodes = (0, _lodash.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 = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
-          editable: false,
-          mode: 'grid'
-        });
-        _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        var newCol = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
-          setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
-        });
-        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
-        result.push((0, _utils.getFormColumn)(type, newCol, (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _lodash.pick)(setting, defaultSet)), customColumn), {}, {
-          formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
-            moduleCode: moduleCode,
-            formRef: formRef,
-            formMode: formMode,
-            setting: (0, _lodash.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 = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
+        editable: false,
+        formItemProps: function formItemProps() {
+          return {
+            readOnly: true
+          };
+        }
+      });
+      _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
+      var newCol = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, 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((0, _utils.getFormColumn)(type, newCol, (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _lodash.pick)(setting, defaultSet)), customColumn), {}, {
+        formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_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: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
+        })
+      })));
       return result;
     }, []);
     defaultValues.current = _defaultValues;

package/lib/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;
+    }
+  }
+}