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

package/es/upload/FilesWall/index.less

@@ -1,74 +1,74 @@
-.operates {
-  display: flex;
-  margin-bottom: 8px;
-}
-
-.filesWall {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  width: 100%;
-  box-sizing: border-box;
-
-  .fileContent {
-    position: relative;
-
-    .check {
-      position: absolute;
-      right: 8px;
-      top: -3px;
-    }
-
-    .img {
-      position: relative;
-      padding: 8px;
-      border: 1px solid #d9d9d9;
-      border-radius: 4px 0 4px 4px;
-      display: table;
-      float: left;
-      width: 104px;
-      height: 104px;
-      margin-right: 8px;
-      margin-bottom: 8px;
-      text-align: center;
-      vertical-align: top;
-      cursor: pointer;
-      -webkit-transition: border-color 0.3s ease;
-      transition: border-color 0.3s ease;
-    }
-  }
-
-  .actions {
-    width: 104px !important;
-    height: 104px !important;
-    position: absolute;
-    background-color: rgba(0, 0, 0, 0.4);
-    border-radius: 4px;
-    display: none !important;
-
-    .actionsChild {
-      margin-top: 35%;
-    }
-  }
-
-  .fileContent:hover + .actions,
-  .actions:hover {
-    display: block !important;
-  }
-
-  :global {
-    .ant-upload-select-picture-card i {
-      font-size: 32px;
-      color: #999;
-    }
-
-    .ant-upload-select-picture-card .ant-upload-text {
-      margin-top: 8px;
-      color: #666;
-    }
-
-    .ant-upload-picture-card-wrapper {
-      width: auto;
-    }
-  }
-}
+.operates {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.filesWall {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  width: 100%;
+  box-sizing: border-box;
+
+  .fileContent {
+    position: relative;
+
+    .check {
+      position: absolute;
+      right: 8px;
+      top: -3px;
+    }
+
+    .img {
+      position: relative;
+      padding: 8px;
+      border: 1px solid #d9d9d9;
+      border-radius: 4px 0 4px 4px;
+      display: table;
+      float: left;
+      width: 104px;
+      height: 104px;
+      margin-right: 8px;
+      margin-bottom: 8px;
+      text-align: center;
+      vertical-align: top;
+      cursor: pointer;
+      -webkit-transition: border-color 0.3s ease;
+      transition: border-color 0.3s ease;
+    }
+  }
+
+  .actions {
+    width: 104px !important;
+    height: 104px !important;
+    position: absolute;
+    background-color: rgba(0, 0, 0, 0.4);
+    border-radius: 4px;
+    display: none !important;
+
+    .actionsChild {
+      margin-top: 35%;
+    }
+  }
+
+  .fileContent:hover + .actions,
+  .actions:hover {
+    display: block !important;
+  }
+
+  :global {
+    .ant-upload-select-picture-card i {
+      font-size: 32px;
+      color: #999;
+    }
+
+    .ant-upload-select-picture-card .ant-upload-text {
+      margin-top: 8px;
+      color: #666;
+    }
+
+    .ant-upload-picture-card-wrapper {
+      width: auto;
+    }
+  }
+}

package/es/upload/Form/gridForm.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 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 = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
+var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "supportTypes", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
 import React, { useState, useRef, forwardRef } from 'react';
 import { getDvaApp } from 'umi';
 import { useMemoizedFn, useCreation } from 'ahooks';
@@ -55,6 +55,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     operates = _ref$operates === void 0 ? ['read', 'add', 'delete', 'download'] : _ref$operates,
     loading = _ref.loading,
     uploadUrl = _ref.uploadUrl,
+    supportTypes = _ref.supportTypes,
     _ref$forbiddenTypes = _ref.forbiddenTypes,
     forbiddenTypes = _ref$forbiddenTypes === void 0 ? [] : _ref$forbiddenTypes,
     _beforeUpload = _ref.beforeUpload,
@@ -79,7 +80,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     currentUser = _getDvaApp$_store$get.currentUser;
   var supportUploadTypes = useCreation(function () {
     return getSupportUploadTypes(forbiddenTypes);
-  }, [forbiddenTypes]);
+  }, [forbiddenTypes, supportTypes]);
 
   // 下载
   var downloadFile = function downloadFile(filenames, tag) {

package/es/upload/FormItem/index.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "forbiddenTypes", "children", "dataFormat", "listType"];
+var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "supportTypes", "forbiddenTypes", "children", "dataFormat", "listType"];
 import React from 'react';
 import { BasicFormItem } from 'luck-design';
 import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes } from '@luck-design-biz/base/utils';
@@ -35,6 +35,7 @@ function buildComponent(props) {
     note = _props$note === void 0 ? '' : _props$note,
     _props$config = props.config,
     config = _props$config === void 0 ? {} : _props$config,
+    supportTypes = props.supportTypes,
     forbiddenTypes = props.forbiddenTypes,
     children = props.children,
     dataFormat = props.dataFormat,
@@ -43,7 +44,7 @@ function buildComponent(props) {
   var getUrl = function getUrl(behaviorKey) {
     return "".concat(getBehaviorUrl(), "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
-  var supportUploadTypes = getSupportUploadTypes(forbiddenTypes);
+  var supportUploadTypes = getSupportUploadTypes(forbiddenTypes, supportTypes);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
     extra: "".concat(formatMessage({
       id: 'app.upload.supportUpload',

package/es/utils/form.js

@@ -32,12 +32,13 @@ export function getFormItem() {
   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;
+  var comType = comName || defaultComName[property];
   var _translator = translator(props),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(
     // 移除type，不能删除type,会导致查询renderInfo的时候报错
-    translateProps, formatCustomProps(customProps)),
+    translateProps, formatCustomProps(comType, customProps)),
     type = _merge.type,
     _props = _objectWithoutProperties(_merge, _excluded3);
   if (customProps.renderBasicFormItem) {
@@ -48,7 +49,7 @@ export function getFormItem() {
       key: name
     }), com.props.children);
   }
-  var getFormItemUtils = formItemUtils["get".concat(capitalize(comName || defaultComName[property]), "Item")];
+  var getFormItemUtils = formItemUtils["get".concat(capitalize(comType), "Item")];
   return getFormItemUtils(_objectSpread(_objectSpread({}, _props), {}, {
     name: name,
     key: name
@@ -77,9 +78,15 @@ export var formItemDataFormat = function formItemDataFormat() {
       case 'date':
         result[name] = values["".concat(name, "_virtual")] ? moment(values["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss') : undefined;
         break;
+      case 'dict':
+        if (props.display === 'radio') {
+          result[name] = values[name] || void 0;
+          break;
+        }
       case 'user':
       case 'select':
       case 'group':
+      case 'complex':
         if (translatorProps.multiple) {
           result[name] = splitStrToObj(values[name], values["".concat(name, "_virtual")]);
         } else {
@@ -147,9 +154,15 @@ export var dataFormat = function dataFormat() {
       case 'date':
         result[name] = values[name] ? moment(values[name]).valueOf() : null;
         break;
+      case 'dict':
+        if (props.display === 'radio') {
+          result[name] = values[name] || null;
+          break;
+        }
       case 'user':
       case 'select':
       case 'group':
+      case 'complex':
         if (isArray(values[name])) result[name] = values[name].map(function (v) {
           return v.value || v.key;
         }).join(',');else result[name] = !isNil((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.value) ? values[name].value : ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.key) || null;
@@ -210,7 +223,7 @@ export var getFormColumn = function getFormColumn() {
     translateProps = _objectWithoutProperties(_translator2, _excluded8);
   var _merge2 = merge(
     // mode=writer移除type，不能删除type,会导致查询renderInfo的时候报错
-    translateProps, formatCustomProps(formItemRewrite)),
+    translateProps, formatCustomProps(formItemType, formItemRewrite)),
     type = _merge2.type,
     _ = _merge2.name,
     _props = _objectWithoutProperties(_merge2, _excluded9);

package/es/utils/grid.js

@@ -44,6 +44,7 @@ export function getColumnRender(name, type) {
     case 'user':
     case 'select':
     case 'group':
+    case 'complex':
       render = function render(text, record) {
         if (record["".concat(name, "_virtual")]) return record["".concat(name, "_virtual")];
         if (isArray(text)) return text.map(function (i) {
@@ -115,6 +116,7 @@ export var getGridColumn = function getGridColumn() {
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
   var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var comType = comName || defaultComName[property];
   var _props$isVirtual = props.isVirtual,
     isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual,
     _props$extra = props.extra,
@@ -122,7 +124,7 @@ export var getGridColumn = function getGridColumn() {
   var _translator = translator(props),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
-  var _merge = merge(translateProps, formatCustomProps(customProps)),
+  var _merge = merge(translateProps, formatCustomProps(comType, customProps)),
     filter = _merge.filter,
     filterParams = _merge.filterParams,
     _props = _objectWithoutProperties(_merge, _excluded3);
@@ -132,9 +134,9 @@ export var getGridColumn = function getGridColumn() {
     title: _props.label,
     headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
     align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
-    render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
+    render: _props.render || getColumnRender(name, comType, _props)
   });
-  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || defaultComName[property])) data.sortable = false;
+  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file', 'complex'], comType)) data.sortable = false;
   // data.filter = false;
   if (!isNil(filter)) {
     // 因为后端升级问题，暂时关闭过滤功能
@@ -147,7 +149,7 @@ export var getGridColumn = function getGridColumn() {
       data.filter = 'text';
       return data;
     }
-    switch (comName || defaultComName[property]) {
+    switch (comType) {
       case 'switch':
         data.filter = 'select';
         data.filterParams = {
@@ -248,7 +250,7 @@ export var getGridColumn = function getGridColumn() {
       required: true
     } : true;
     if (_props.cellWriter) data.cellWriter = _props.cellWriter;else {
-      var formItemCom = capitalize(comName || defaultComName[property]) === 'Textarea' ? 'String' : capitalize(comName || defaultComName[property]);
+      var formItemCom = capitalize(comType) === 'Textarea' ? 'String' : capitalize(comType);
       var getFormItemUtils = formItemUtils["get".concat(formItemCom, "Item")];
       var formItemProps = {};
       switch (formItemCom) {
@@ -265,6 +267,7 @@ export var getGridColumn = function getGridColumn() {
         case 'user':
         case 'select':
         case 'group':
+        case 'complex':
           if (translateProps.multiple) {
             formItemProps = {
               dataFormat: function dataFormat(value) {

package/lib/components/ComplexItem/index.js

@@ -0,0 +1,100 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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 _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireWildcard(require("react"));
+var _umi = require("umi");
+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 Index = function Index(_ref) {
+  var wrapperRef = _ref.wrapperRef,
+    _ref$config = _ref.config,
+    config = _ref$config === void 0 ? {} : _ref$config,
+    renderInfoMode = _ref.renderInfoMode,
+    _ref$complexConfig = _ref.complexConfig,
+    _ref$complexConfig$is = _ref$complexConfig.isTree,
+    isTree = _ref$complexConfig$is === void 0 ? false : _ref$complexConfig$is,
+    moduleCode = _ref$complexConfig.moduleCode,
+    dataModel = _ref$complexConfig.dataModel,
+    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);
+        }
+      });
+    }
+  };
+  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',
+    ref: wrapperRef,
+    config: (0, _objectSpread3.default)((0, _objectSpread3.default)({
+      required: false,
+      placeholder: (0, _utils.formatMessage)({
+        id: 'app.base.tip.select'
+      }),
+      message: (0, _utils.formatMessage)({
+        id: 'app.base.tip.select'
+      })
+    }, config), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({
+      showSearch: true,
+      optionFilterProp: 'title',
+      treeNodeFilterProp: 'label'
+    }, isTree ? 'treeData' : 'dataSource', dataSource), "onFocus", handleFocus))
+  }));
+};
+var RefCom = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
+    wrapperRef: ref
+  }, props));
+});
+RefCom.displayName = 'BasicFormItem';
+var _default = exports.default = RefCom;

package/lib/components/ComplexItem/service.js

@@ -0,0 +1,28 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchContent = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _qs = require("qs");
+var _utils = require("@luck-design-biz/base/utils");
+var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
+var fetchContent = exports.fetchContent = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(dmCode, get) {
+    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat((0, _qs.stringify)(get))));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function fetchContent(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/lib/components/LdAutoForm/index.js

@@ -74,20 +74,21 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           return _field.name === col.aliaName;
         }) || {};
         _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
+        var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
         var newCol = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, col), {}, {
           setVerifyRules: setVerifyRules,
           fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
-        }, (0, _lodash.pick)(setting, ['col', 'row', 'note', 'tip', 'placeholder']));
+        }, (0, _lodash.pick)(setting, defaultSet));
         result.push((0, _utils.getFormItem)(newCol, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
-          }
+          },
+          setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field']))
         })));
       }
-      ;
       return result;
     }, []);
     defaultValues.current = _defaultValues;
@@ -101,7 +102,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
+    defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
+      return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
+    }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -145,7 +148,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data, res) {
-        var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, data));
+        var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
+          return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
+        }), data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }

package/lib/components/LdFormList/index.js

@@ -110,7 +110,8 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      }
+      },
+      ticketData: props.ticketData
     });
   });
   var handleValueChange = (0, _ahooks.useMemoizedFn)(function (change) {

package/lib/components/LdGrid/index.js

@@ -20,7 +20,7 @@ var _List = require("@luck-design-biz/base/List");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _model = _interopRequireDefault(require("./model"));
-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"],
+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"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 var LdGrid = function LdGrid(_ref) {
   var columns = _ref.columns,
@@ -53,6 +53,8 @@ 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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var gridRef = (0, _react.useRef)(null);
   var treeConfig = (0, _ahooks.useCreation)(function () {
@@ -73,6 +75,11 @@ var LdGrid = function LdGrid(_ref) {
   (0, _react.useEffect)(function () {
     readFilter && readFilter(params, filters);
   }, [params, filters]);
+  (0, _react.useEffect)(function () {
+    if (autoRowClick) {
+      if (list[0]) props.onRowClick && props.onRowClick(detail[list[0]], 0);else props.onRowClick && props.onRowClick(null);
+    }
+  }, [list[0]]);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, gridRef.current), {}, {
       getProps: function getProps() {

package/lib/components/LdGridForm/index.js

@@ -80,7 +80,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     var _nodes = (0, _lodash.reduce)(keys, function (result, key) {
       var setting = fieldsObj[key];
       var col = columnsObj[key];
-      if (col.isShowInForm) {
+      if (col !== null && col !== void 0 && col.isShowInForm) {
         var _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.aliaName;
@@ -94,11 +94,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           setVerifyRules: setVerifyRules,
           fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
         });
-        result.push((0, _utils.getFormColumn)(type, newCol, (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _lodash.pick)(setting, ['width', 'align', 'headerAlign', 'pinned', 'tip'])), customColumn), {}, {
+        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
+            formMode: formMode,
+            setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field']))
           })
         })));
       }
@@ -116,7 +118,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     })));
     return columnsReset ? columnsReset(_nodes) : _nodes;
   }();
-  var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
+  var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
+    return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
+  }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {
     formId: ldId,
     columns: _columns,
@@ -156,7 +160,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     orderByAdd: "asc",
     rowSelection: true,
     type: type,
-    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno',
+    wrapperProps: {
+      id: ldId
+    }
   }, props, {
     onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: _utils.behaviorCall,
@@ -173,7 +180,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, onQuery), {}, {
       format: function format(data) {
         var formItemData = data.map(function (item) {
-          return (0, _utils.formItemDataFormat)(gridColumns, item);
+          return (0, _utils.formItemDataFormat)(gridColumns.map(function (c) {
+            return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
+          }), item);
         });
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
         return formItemData;