@luck-design-biz/luckda 0.0.13-2 → 0.0.14-1

package/es/components/LdAutoForm/index.js

@@ -9,7 +9,6 @@ import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from '../../helper/ldBuilder';
 import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from '../../utils';
 import { LuckDaContext } from '../Builder';
-var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -53,15 +52,15 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       if (col.isShowInForm) {
         var _objectSpread2;
         var customFiled = filedsRewrite.find(function (field) {
-          return field.name === col.field;
+          return field.name === col.aliaName;
         }) || {};
-        _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.field, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
+        _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.aliaName, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
         result.push(getFormItem(col, _objectSpread(_objectSpread({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
-            return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.field, value)));
+            return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliaName, value)));
           }
         })));
       }
@@ -133,8 +132,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     })
     // onAdd={onOperate(onAdd, 'add')}
     ,
-    onUpdate: onOperate(onUpdate, 'update'),
-    operates: defaultOpe
+    onUpdate: onOperate(onUpdate, 'update')
   }, formConfig), basicItems);
 };
 export default ldBuilder(buildLdAutoForm);

package/es/components/LdFormList/index.js

@@ -3,7 +3,7 @@ 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", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
   _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded3 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
@@ -20,6 +20,7 @@ import { LuckDaContext } from '../Builder';
 import { LuckDaPopContext } from '../LdPop';
 import createModel from './model';
 import { onBatchSubmitAction } from '../../helper/action';
+import { isArray, sortBy, mapValues } from 'lodash';
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -27,6 +28,7 @@ var LdFormList = function LdFormList(_ref) {
   var namespace = _ref.namespace,
     formState = _ref.formState,
     formMode = _ref.formMode,
+    formOperates = _ref.formOperates,
     loading = _ref.loading,
     wrapperRef = _ref.wrapperRef,
     readOnly = _ref.readOnly,
@@ -54,7 +56,8 @@ var LdFormList = function LdFormList(_ref) {
     defaultLayout = _ref2.affixLayout;
   var _ref3 = useContext(LuckDaContext) || {},
     dataSets = _ref3.dataSets,
-    doAction = _ref3.doAction;
+    doAction = _ref3.doAction,
+    resources = _ref3.resources;
   var formListRef = useRef(null);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, formListRef.current), {}, {
@@ -150,7 +153,15 @@ var LdFormList = function LdFormList(_ref) {
     formRef: formListRef,
     renderExtra: renderExtra
   });
-  var formList = renderFormList(formConfig);
+  var formList = useCreation(function () {
+    var _list = renderFormList(formConfig);
+    var extraList = renderFormExtra && isArray(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
+    var list = _list.concat(extraList);
+    return sortBy(list, function (o) {
+      var _o$props;
+      return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
+    });
+  }, [formConfig]);
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
@@ -158,7 +169,10 @@ var LdFormList = function LdFormList(_ref) {
     editFlow: true,
     formState: formState,
     formMode: formMode,
-    loading: loading || submitLoading
+    loading: loading || submitLoading,
+    formOperates: mapValues(formOperates, function () {
+      return resources;
+    })
   }, props, {
     modelName: namespace,
     ref: formListRef,
@@ -175,64 +189,67 @@ var LdFormList = function LdFormList(_ref) {
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
-    var _ref7 = formProps || {},
-      ldId = _ref7.id,
-      _ref7$header = _ref7.header,
-      header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
-      title = _ref7.title,
-      _readOnly = _ref7.readOnly,
-      _ref7$extraConfig = _ref7.extraConfig,
-      extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
-      _ref7$renderTopLeft = _ref7.renderTopLeft,
-      _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
-        return /*#__PURE__*/React.createElement(React.Fragment, null);
-      } : _ref7$renderTopLeft,
-      _props = _objectWithoutProperties(_ref7, _excluded2);
-    var _props$type = _props.type,
-      type = _props$type === void 0 ? 'auto' : _props$type;
-    var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
-    if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
-      title: title || ldId,
-      extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
-      id: ldId,
-      key: ldId,
-      mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-    }, renderForm(_objectSpread(_objectSpread({}, _props), {}, {
-      ldId: ldId,
-      mainFormLdId: mainFormLdId,
-      mainDataSetKey: mainDataSetKey,
-      readOnly: readOnly || _readOnly,
-      onValueChange: handleValueChange,
-      ticketData: props.ticketData,
-      renderTopLeft: function renderTopLeft() {
-        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
-      }
-    })));
-    return /*#__PURE__*/React.createElement(Fragment, {
-      key: ldId
-    }, header === 'divider' && /*#__PURE__*/React.createElement(BasicDivider, {
-      title: title || ldId,
-      id: ldId
-    }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
-      style: {
-        textAlign: 'right'
-      }
-    }, renderExtra(ldId, extraConfig, 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
-      ldId: ldId,
-      mainFormLdId: mainFormLdId,
-      mainDataSetKey: mainDataSetKey,
-      readOnly: readOnly || _readOnly,
-      onValueChange: handleValueChange,
-      ticketData: props.ticketData,
-      renderTopLeft: function renderTopLeft() {
-        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
-      }
-    })));
-  }), ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
-    var _child$type;
-    return /*#__PURE__*/React.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? {
-      mode: child.props.mode || 'tab'
-    } : {});
+    if (formProps.dataSetKey) {
+      var _ref7 = formProps || {},
+        ldId = _ref7.id,
+        _ref7$header = _ref7.header,
+        header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
+        title = _ref7.title,
+        _readOnly = _ref7.readOnly,
+        _ref7$extraConfig = _ref7.extraConfig,
+        extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
+        _ref7$renderTopLeft = _ref7.renderTopLeft,
+        _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
+          return /*#__PURE__*/React.createElement(React.Fragment, null);
+        } : _ref7$renderTopLeft,
+        _props = _objectWithoutProperties(_ref7, _excluded2);
+      var _props$type = _props.type,
+        type = _props$type === void 0 ? 'auto' : _props$type;
+      var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
+      if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
+        title: title || ldId,
+        extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
+        id: ldId,
+        key: ldId,
+        mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
+      }, renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+        ldId: ldId,
+        mainFormLdId: mainFormLdId,
+        mainDataSetKey: mainDataSetKey,
+        readOnly: readOnly || _readOnly,
+        onValueChange: handleValueChange,
+        ticketData: props.ticketData,
+        renderTopLeft: function renderTopLeft() {
+          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
+        }
+      })));
+      return /*#__PURE__*/React.createElement(Fragment, {
+        key: ldId
+      }, header === 'divider' && /*#__PURE__*/React.createElement(BasicDivider, {
+        title: title || ldId,
+        id: ldId
+      }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
+        style: {
+          textAlign: 'right'
+        }
+      }, renderExtra(ldId, extraConfig, 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+        ldId: ldId,
+        mainFormLdId: mainFormLdId,
+        mainDataSetKey: mainDataSetKey,
+        readOnly: readOnly || _readOnly,
+        onValueChange: handleValueChange,
+        ticketData: props.ticketData,
+        renderTopLeft: function renderTopLeft() {
+          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
+        }
+      })));
+    }
+    return ChildrenUtil.deepMap(formProps, function (child) {
+      var _child$type;
+      return /*#__PURE__*/React.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? _objectSpread(_objectSpread({}, child.props), {}, {
+        mode: child.props.mode || 'tab'
+      }) : child.props);
+    })[0];
   }));
 };
 

package/es/components/LdGrid/index.js

@@ -87,7 +87,7 @@ var LdGrid = function LdGrid(_ref) {
    */
   var _columns = useCreation(function () {
     if (columnsReset) return columnsReset;
-    var defaultColumns = keyBy(columns, 'field');
+    var defaultColumns = keyBy(columns, 'aliaName');
     var customColumns = keyBy(columnsRewrite, 'field');
     var mergeFields = union(keys(defaultColumns), keys(customColumns));
     return transform(mergeFields, function (result, field) {

package/es/components/LdGridForm/index.js

@@ -12,7 +12,6 @@ import { getFormColumn, formItemDataFormat, dataFormat, behaviorCall } from '../
 import { defaultComName } from '../../helper/form';
 import { LuckDaContext } from '../Builder';
 import styles from './index.less';
-var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -68,13 +67,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
       if (col.isShowInForm) {
         var _objectSpread2, _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
-          return column.field === col.field;
+          return column.field === col.aliaName;
         }) || {};
         if (col.isReadOnly) customColumn = _objectSpread(_objectSpread({}, customColumn), {}, {
           editable: false,
           mode: 'grid'
         });
-        _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.field, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
+        _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.aliaName, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
         result.push(getFormColumn(type, col, _objectSpread(_objectSpread({}, customColumn), {}, {
           formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
@@ -133,7 +132,6 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
   };
   return /*#__PURE__*/React.createElement(GridForm, _extends({
     noAddon: true,
-    operates: defaultOpe,
     orderByAdd: "asc",
     rowSelection: true,
     type: type,

package/es/components/LdInfoPanel/index.js

@@ -53,7 +53,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
   var _columns = useCreation(function () {
     return customColumns ? customColumns.map(function (col) {
       var xCol = columns.find(function (column) {
-        return column.field === col.dataIndex;
+        return column.aliaName === col.dataIndex;
       }) || {};
       return _objectSpread({
         title: xCol.fieldName
@@ -62,7 +62,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
       if (item.isShowInForm) {
         result.push({
           title: item.fieldName,
-          dataIndex: item.field
+          dataIndex: item.aliaName
         });
       }
     }, []);

package/es/helper/form.js

@@ -58,7 +58,7 @@ export function translator() {
     props = _objectWithoutProperties(_ref, _excluded);
   var allConfig = _objectSpread(_objectSpread({}, props), JSON.parse(extra || '{}'));
   var _props = {
-    name: allConfig.field,
+    name: allConfig.aliaName,
     label: allConfig.fieldName,
     config: {
       required: !!allConfig.isNotNull,

package/es/utils/grid.js

@@ -33,7 +33,7 @@ export function getColumnRender(name, type) {
       break;
     case 'year':
       render = function render(text, record) {
-        return record["".concat(name, "_virtual")] || (text ? moment(value).format('YYYY-MM-DD') : undefined);
+        return record["".concat(name, "_virtual")] || (text ? moment(text).format('YYYY-MM-DD') : undefined);
       };
       break;
     case 'user':
@@ -80,7 +80,6 @@ export function getColumnRender(name, type) {
   return render;
 }
 export var getGridColumn = function getGridColumn() {
-  var _props$config2;
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
     property = _ref.property,
@@ -108,6 +107,12 @@ export var getGridColumn = function getGridColumn() {
     data.filter = filter;
     data.filterParams = filterParams;
   } else if (!isTreeGrid && !isVirtual) {
+    var _props$config2;
+    if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
+      data.field = "".concat(name, "_virtual");
+      data.filter = 'text';
+      return data;
+    }
     switch (comName || defaultComName[property]) {
       case 'switch':
         data.filter = 'select';
@@ -149,7 +154,6 @@ export var getGridColumn = function getGridColumn() {
             });
           },
           key: name,
-          mode: _props.mode && ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode),
           filterOption: false
         };
         break;
@@ -157,7 +161,6 @@ export var getGridColumn = function getGridColumn() {
       case 'radio':
         data.filter = 'select';
         if (_props.alias) {
-          var _props$config3;
           data.filterParams = {
             options: function options() {
               var _getDvaApp3, _getDvaApp3$_store;
@@ -168,8 +171,7 @@ export var getGridColumn = function getGridColumn() {
                 }
               });
             },
-            key: name,
-            mode: _props.mode && ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)
+            key: name
           };
         }
         break;
@@ -195,8 +197,7 @@ export var getGridColumn = function getGridColumn() {
               }
             });
           },
-          key: name,
-          mode: 'multiple'
+          key: name
         };
         break;
       default:

package/lib/components/LdAutoForm/index.js

@@ -17,7 +17,6 @@ var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _Builder = require("../Builder");
 var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
-var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -61,15 +60,15 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       if (col.isShowInForm) {
         var _objectSpread2;
         var customFiled = filedsRewrite.find(function (field) {
-          return field.name === col.field;
+          return field.name === col.aliaName;
         }) || {};
-        _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.field, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
+        _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.aliaName, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
         result.push((0, _utils.getFormItem)(col, (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.field, value)));
+            return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
           }
         })));
       }
@@ -141,8 +140,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     })
     // onAdd={onOperate(onAdd, 'add')}
     ,
-    onUpdate: onOperate(onUpdate, 'update'),
-    operates: defaultOpe
+    onUpdate: onOperate(onUpdate, 'update')
   }, formConfig), basicItems);
 };
 var _default = (0, _ldBuilder.default)(buildLdAutoForm);

package/lib/components/LdFormList/index.js

@@ -25,7 +25,8 @@ var _Builder = require("../Builder");
 var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
-var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+var _lodash = require("lodash");
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
   _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded3 = ["ldId", "initData", "overModel"];
 // 组件
@@ -34,6 +35,7 @@ var LdFormList = function LdFormList(_ref) {
   var namespace = _ref.namespace,
     formState = _ref.formState,
     formMode = _ref.formMode,
+    formOperates = _ref.formOperates,
     loading = _ref.loading,
     wrapperRef = _ref.wrapperRef,
     readOnly = _ref.readOnly,
@@ -61,7 +63,8 @@ var LdFormList = function LdFormList(_ref) {
     defaultLayout = _ref2.affixLayout;
   var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     dataSets = _ref3.dataSets,
-    doAction = _ref3.doAction;
+    doAction = _ref3.doAction,
+    resources = _ref3.resources;
   var formListRef = (0, _react.useRef)(null);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
@@ -157,7 +160,15 @@ var LdFormList = function LdFormList(_ref) {
     formRef: formListRef,
     renderExtra: renderExtra
   });
-  var formList = renderFormList(formConfig);
+  var formList = (0, _ahooks.useCreation)(function () {
+    var _list = renderFormList(formConfig);
+    var extraList = renderFormExtra && (0, _lodash.isArray)(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
+    var list = _list.concat(extraList);
+    return (0, _lodash.sortBy)(list, function (o) {
+      var _o$props;
+      return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
+    });
+  }, [formConfig]);
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
@@ -165,7 +176,10 @@ var LdFormList = function LdFormList(_ref) {
     editFlow: true,
     formState: formState,
     formMode: formMode,
-    loading: loading || submitLoading
+    loading: loading || submitLoading,
+    formOperates: (0, _lodash.mapValues)(formOperates, function () {
+      return resources;
+    })
   }, props, {
     modelName: namespace,
     ref: formListRef,
@@ -182,64 +196,67 @@ var LdFormList = function LdFormList(_ref) {
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
-    var _ref7 = formProps || {},
-      ldId = _ref7.id,
-      _ref7$header = _ref7.header,
-      header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
-      title = _ref7.title,
-      _readOnly = _ref7.readOnly,
-      _ref7$extraConfig = _ref7.extraConfig,
-      extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
-      _ref7$renderTopLeft = _ref7.renderTopLeft,
-      _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
-        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
-      } : _ref7$renderTopLeft,
-      _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded2);
-    var _props$type = _props.type,
-      type = _props$type === void 0 ? 'auto' : _props$type;
-    var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
-    if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
-      title: title || ldId,
-      extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
-      id: ldId,
-      key: ldId,
-      mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-    }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
-      ldId: ldId,
-      mainFormLdId: mainFormLdId,
-      mainDataSetKey: mainDataSetKey,
-      readOnly: readOnly || _readOnly,
-      onValueChange: handleValueChange,
-      ticketData: props.ticketData,
-      renderTopLeft: function renderTopLeft() {
-        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
-      }
-    })));
-    return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
-      key: ldId
-    }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
-      title: title || ldId,
-      id: ldId
-    }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
-      style: {
-        textAlign: 'right'
-      }
-    }, renderExtra(ldId, extraConfig, 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
-      ldId: ldId,
-      mainFormLdId: mainFormLdId,
-      mainDataSetKey: mainDataSetKey,
-      readOnly: readOnly || _readOnly,
-      onValueChange: handleValueChange,
-      ticketData: props.ticketData,
-      renderTopLeft: function renderTopLeft() {
-        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
-      }
-    })));
-  }), _utils.ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
-    var _child$type;
-    return /*#__PURE__*/_react.default.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? {
-      mode: child.props.mode || 'tab'
-    } : {});
+    if (formProps.dataSetKey) {
+      var _ref7 = formProps || {},
+        ldId = _ref7.id,
+        _ref7$header = _ref7.header,
+        header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
+        title = _ref7.title,
+        _readOnly = _ref7.readOnly,
+        _ref7$extraConfig = _ref7.extraConfig,
+        extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
+        _ref7$renderTopLeft = _ref7.renderTopLeft,
+        _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
+          return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+        } : _ref7$renderTopLeft,
+        _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded2);
+      var _props$type = _props.type,
+        type = _props$type === void 0 ? 'auto' : _props$type;
+      var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
+      if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
+        title: title || ldId,
+        extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
+        id: ldId,
+        key: ldId,
+        mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
+      }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+        ldId: ldId,
+        mainFormLdId: mainFormLdId,
+        mainDataSetKey: mainDataSetKey,
+        readOnly: readOnly || _readOnly,
+        onValueChange: handleValueChange,
+        ticketData: props.ticketData,
+        renderTopLeft: function renderTopLeft() {
+          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
+        }
+      })));
+      return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
+        key: ldId
+      }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
+        title: title || ldId,
+        id: ldId
+      }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          textAlign: 'right'
+        }
+      }, renderExtra(ldId, extraConfig, 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+        ldId: ldId,
+        mainFormLdId: mainFormLdId,
+        mainDataSetKey: mainDataSetKey,
+        readOnly: readOnly || _readOnly,
+        onValueChange: handleValueChange,
+        ticketData: props.ticketData,
+        renderTopLeft: function renderTopLeft() {
+          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
+        }
+      })));
+    }
+    return _utils.ChildrenUtil.deepMap(formProps, function (child) {
+      var _child$type;
+      return /*#__PURE__*/_react.default.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child.props), {}, {
+        mode: child.props.mode || 'tab'
+      }) : child.props);
+    })[0];
   }));
 };
 

package/lib/components/LdGrid/index.js

@@ -95,7 +95,7 @@ var LdGrid = function LdGrid(_ref) {
    */
   var _columns = (0, _ahooks.useCreation)(function () {
     if (columnsReset) return columnsReset;
-    var defaultColumns = (0, _lodash.keyBy)(columns, 'field');
+    var defaultColumns = (0, _lodash.keyBy)(columns, 'aliaName');
     var customColumns = (0, _lodash.keyBy)(columnsRewrite, 'field');
     var mergeFields = (0, _lodash.union)((0, _lodash.keys)(defaultColumns), (0, _lodash.keys)(customColumns));
     return (0, _lodash.transform)(mergeFields, function (result, field) {

package/lib/components/LdGridForm/index.js

@@ -20,7 +20,6 @@ var _form = require("../../helper/form");
 var _Builder = require("../Builder");
 var _index = _interopRequireDefault(require("./index.less"));
 var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
-var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -76,13 +75,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
       if (col.isShowInForm) {
         var _objectSpread2, _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
-          return column.field === col.field;
+          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), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.field, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
+        _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.aliaName, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
         result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
           formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
@@ -141,7 +140,6 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
   };
   return /*#__PURE__*/_react.default.createElement(_FormList.GridForm, (0, _extends2.default)({
     noAddon: true,
-    operates: defaultOpe,
     orderByAdd: "asc",
     rowSelection: true,
     type: type,

package/lib/components/LdInfoPanel/index.js

@@ -61,7 +61,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
   var _columns = (0, _ahooks.useCreation)(function () {
     return customColumns ? customColumns.map(function (col) {
       var xCol = columns.find(function (column) {
-        return column.field === col.dataIndex;
+        return column.aliaName === col.dataIndex;
       }) || {};
       return (0, _objectSpread2.default)({
         title: xCol.fieldName
@@ -70,7 +70,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
       if (item.isShowInForm) {
         result.push({
           title: item.fieldName,
-          dataIndex: item.field
+          dataIndex: item.aliaName
         });
       }
     }, []);

package/lib/helper/form.js

@@ -69,7 +69,7 @@ function translator() {
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var allConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), JSON.parse(extra || '{}'));
   var _props = {
-    name: allConfig.field,
+    name: allConfig.aliaName,
     label: allConfig.fieldName,
     config: {
       required: !!allConfig.isNotNull,

package/lib/utils/grid.js

@@ -40,7 +40,7 @@ function getColumnRender(name, type) {
       break;
     case 'year':
       render = function render(text, record) {
-        return record["".concat(name, "_virtual")] || (text ? (0, _moment.default)(value).format('YYYY-MM-DD') : undefined);
+        return record["".concat(name, "_virtual")] || (text ? (0, _moment.default)(text).format('YYYY-MM-DD') : undefined);
       };
       break;
     case 'user':
@@ -87,7 +87,6 @@ function getColumnRender(name, type) {
   return render;
 }
 var getGridColumn = function getGridColumn() {
-  var _props$config2;
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
     property = _ref.property,
@@ -115,6 +114,12 @@ var getGridColumn = function getGridColumn() {
     data.filter = filter;
     data.filterParams = filterParams;
   } else if (!isTreeGrid && !isVirtual) {
+    var _props$config2;
+    if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
+      data.field = "".concat(name, "_virtual");
+      data.filter = 'text';
+      return data;
+    }
     switch (comName || _form.defaultComName[property]) {
       case 'switch':
         data.filter = 'select';
@@ -156,7 +161,6 @@ var getGridColumn = function getGridColumn() {
             });
           },
           key: name,
-          mode: _props.mode && ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode),
           filterOption: false
         };
         break;
@@ -164,7 +168,6 @@ var getGridColumn = function getGridColumn() {
       case 'radio':
         data.filter = 'select';
         if (_props.alias) {
-          var _props$config3;
           data.filterParams = {
             options: function options() {
               var _getDvaApp3, _getDvaApp3$_store;
@@ -175,8 +178,7 @@ var getGridColumn = function getGridColumn() {
                 }
               });
             },
-            key: name,
-            mode: _props.mode && ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)
+            key: name
           };
         }
         break;
@@ -202,8 +204,7 @@ var getGridColumn = function getGridColumn() {
               }
             });
           },
-          key: name,
-          mode: 'multiple'
+          key: name
         };
         break;
       default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.13-2",
+  "version": "0.0.14-1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",