@luck-design-biz/luckda 0.0.2 → 0.0.4

package/es/components/LdAutoForm/index.js

@@ -1,17 +1,16 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData"];
 import React, { useContext, useRef, useState } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
-import { keys, transform } from "lodash";
+import { transform } from 'lodash';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from '../../helper/ldBuilder';
-import { getFormItem, formItemDataFormat, dataFormat } from '../../utils';
+import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from '../../utils';
 import { LuckDaContext } from '../Builder';
-import { readBehaviorCall } from '../../services';
+var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -46,10 +45,6 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
   var defaultValues = useRef();
-  var _useState = useState(null),
-    _useState2 = _slicedToArray(_useState, 2),
-    selfResources = _useState2[0],
-    setSelfResources = _useState2[1];
   var isMain = ldId === mainFormLdId;
   var basicItems = useCreation(function () {
     var _defaultValues = {};
@@ -87,7 +82,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       api: function api(get, post, formData) {
         var _formData$mainFormLdI;
         post[dataSetKey][isMain ? 'indocno' : 'relationId'] = ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno;
-        return readBehaviorCall(get, post, formData);
+        return behaviorCall(get, post, formData);
       },
       get: function get() {
         return {
@@ -111,7 +106,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   });
   return /*#__PURE__*/React.createElement(AutoForm, _extends({}, props, {
     onQuery: _objectSpread(_objectSpread({
-      api: readBehaviorCall,
+      api: behaviorCall,
       get: function get(formData) {
         var _formData$mainFormLdI2, _params2;
         var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readForm'), _params2);
@@ -120,9 +115,6 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data) {
-        if (data['__infuse_serial__']) {
-          setSelfResources(data['__infuse_serial__']);
-        }
         var formItemData = _objectSpread({}, formItemDataFormat(columns, data));
         if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
         return formItemData;
@@ -130,7 +122,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     }),
     onAdd: onOperate(onAdd, 'add'),
     onUpdate: onOperate(onUpdate, 'update'),
-    operates: selfResources || resources
+    operates: defaultOpe
   }, formConfig), basicItems);
 };
 export default ldBuilder(buildLdAutoForm);

package/es/components/LdCard/index.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "loading", "wrapperRef", "hasMore", "list", "detail", "params", "doQuery", "onQuery", "readFilter", "unclosableSet", "formatDataSource", "resultSet", "cardConfig", "cardActions", "onOperationsClick", "readOnly", "batchOperations"],
-  _excluded2 = ["ldId", "moduleCode", "suppressInit", "unclosableSet", "pageSize", "service"];
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "loading", "wrapperRef", "hasMore", "list", "detail", "params", "doQuery", "onQuery", "unclosableSet", "formatDataSource", "resultSet", "cardConfig", "cardActions", "onOperationsClick", "readOnly", "batchOperations", "readFilter"],
+  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
 import PropTypes from 'prop-types';
@@ -31,7 +31,6 @@ var LdCard = function LdCard(_ref) {
     params = _ref.params,
     doQuery = _ref.doQuery,
     onQuery = _ref.onQuery,
-    readFilter = _ref.readFilter,
     unclosableSet = _ref.unclosableSet,
     formatDataSource = _ref.formatDataSource,
     resultSet = _ref.resultSet,
@@ -40,6 +39,7 @@ var LdCard = function LdCard(_ref) {
     onOperationsClick = _ref.onOperationsClick,
     readOnly = _ref.readOnly,
     batchOperations = _ref.batchOperations,
+    readFilter = _ref.readFilter,
     props = _objectWithoutProperties(_ref, _excluded);
   var cardRef = useRef(null);
   useEffect(function () {
@@ -126,9 +126,8 @@ var LdIndex = function LdIndex(_ref2) {
   var namespace = _ref2.ldId,
     moduleCode = _ref2.moduleCode,
     suppressInit = _ref2.suppressInit,
-    unclosableSet = _ref2.unclosableSet,
-    pageSize = _ref2.pageSize,
-    service = _ref2.service,
+    overModel = _ref2.overModel,
+    afterQuery = _ref2.afterQuery,
     props = _objectWithoutProperties(_ref2, _excluded2);
   if (includes(props.isTree, props.dataSetKey)) return formatMessage({
     id: 'luckda.ldCard.notTres',
@@ -139,14 +138,13 @@ var LdIndex = function LdIndex(_ref2) {
     (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.unmodel(namespace);
     if (!((_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 ? void 0 : _getDvaApp2._store.getState()[namespace])) {
       var _getDvaApp3;
-      (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.model(createModel(namespace, {
-        isFlow: !!props.isFlow,
+      (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.model(createModel(namespace, _objectSpread(_objectSpread({
+        isFlow: !!props.isFlow
+      }, overModel), {}, {
         dataSetKey: props.dataSetKey,
         moduleCode: moduleCode,
-        unclosableSet: unclosableSet,
-        pageSize: pageSize,
-        service: service
-      }));
+        afterQuery: afterQuery
+      })));
     }
     return build(ForwardLdCard, namespace, {
       suppressInit: suppressInit,
@@ -189,7 +187,8 @@ Index.defaultProps = {
       return _detail[indocno];
     });
   },
-  cardActions: []
+  cardActions: [],
+  overModel: {}
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/components/LdCard/model.js

@@ -1,34 +1,32 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["readAll", "moduleCode", "dataSetKey", "afterQuery"];
 import { createListModel } from '@luck-design-biz/base/utils/modelHelper';
-import { readBehaviorCall } from '../../services';
+import { behaviorCall } from '../../utils';
 export default function (namespace) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-    _ref$isFlow = _ref.isFlow,
-    isFlow = _ref$isFlow === void 0 ? false : _ref$isFlow,
-    dataSetKey = _ref.dataSetKey,
-    moduleCode = _ref.moduleCode,
-    _ref$unclosableSet = _ref.unclosableSet,
-    unclosableSet = _ref$unclosableSet === void 0 ? [] : _ref$unclosableSet,
-    pageSize = _ref.pageSize,
-    service = _ref.service;
-  return createListModel({
+  var modelProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _readAll = modelProps.readAll,
+    moduleCode = modelProps.moduleCode,
+    dataSetKey = modelProps.dataSetKey,
+    afterQuery = modelProps.afterQuery,
+    _modelProps = _objectWithoutProperties(modelProps, _excluded);
+  return createListModel(_objectSpread(_objectSpread({}, _modelProps), {}, {
     namespace: namespace,
-    isFlow: isFlow,
-    unclosableSet: unclosableSet,
-    pageSize: pageSize,
     readAll: function readAll() {
       var get = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var post = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      return (service || readBehaviorCall)(_objectSpread(_objectSpread({}, get), {}, {
-        moduleCode: moduleCode,
-        datasetCode: dataSetKey,
-        behaviorKey: 'readGrid'
-      }), {
-        _AutoFilter: post
+      return new Promise(function (resolve) {
+        (_readAll || behaviorCall)(_objectSpread({
+          moduleCode: moduleCode,
+          datasetCode: dataSetKey,
+          behaviorKey: 'readGrid'
+        }, get), {
+          _AutoFilter: post
+        }).then(function (res) {
+          afterQuery && afterQuery(res);
+          resolve(res);
+        });
       });
-    },
-    state: {},
-    effects: {},
-    reducers: {}
-  });
+    }
+  }));
 }

package/es/components/LdFormList/index.js

@@ -5,7 +5,7 @@ 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"],
   _excluded2 = ["id", "header", "title", "readOnly", "extraConfig"],
-  _excluded3 = ["ldId", "initData"];
+  _excluded3 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
 import { connect, getDvaApp } from 'umi';
 import PropTypes from 'prop-types';
@@ -96,7 +96,9 @@ var LdFormList = function LdFormList(_ref) {
       formId: formId
     }, extraConfig)));
   });
-  var handleBatchSubmit = function handleBatchSubmit(values, action) {
+  var handleBatchSubmit = function handleBatchSubmit(values, action, _ref6) {
+    var formCode = _ref6.formCode,
+      formKey = _ref6.formKey;
     setSubmitLoading(true);
     onBatchSubmitAction({
       values: values,
@@ -105,7 +107,9 @@ var LdFormList = function LdFormList(_ref) {
       beforeSubmit: beforeSubmit,
       doAction: doAction,
       action: action,
-      formData: props.formData
+      formData: props.formData,
+      form_id: formKey,
+      effcode: formCode
     }, function (success, indocno) {
       setSubmitLoading(false);
       if (success) {
@@ -146,11 +150,11 @@ var LdFormList = function LdFormList(_ref) {
   }, props, {
     modelName: namespace,
     ref: formListRef,
-    onAdd: function onAdd(values) {
-      return handleBatchSubmit(values, 'add');
+    onAdd: function onAdd(values, other) {
+      return handleBatchSubmit(values, 'add', other);
     },
-    onBatchUpdate: function onBatchUpdate(values) {
-      return handleBatchSubmit(values, 'update');
+    onBatchUpdate: function onBatchUpdate(values, other) {
+      return handleBatchSubmit(values, 'update', other);
     }
   }), /*#__PURE__*/React.createElement(FormListAffix, {
     showSaveBtn: !readOnly && showSaveBtn,
@@ -159,15 +163,15 @@ var LdFormList = function LdFormList(_ref) {
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
-    var _ref6 = formProps || {},
-      ldId = _ref6.id,
-      _ref6$header = _ref6.header,
-      header = _ref6$header === void 0 ? 'collapse' : _ref6$header,
-      title = _ref6.title,
-      _readOnly = _ref6.readOnly,
-      _ref6$extraConfig = _ref6.extraConfig,
-      extraConfig = _ref6$extraConfig === void 0 ? {} : _ref6$extraConfig,
-      _props = _objectWithoutProperties(_ref6, _excluded2);
+    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,
+      _props = _objectWithoutProperties(_ref7, _excluded2);
     var _props$type = _props.type,
       type = _props$type === void 0 ? 'auto' : _props$type;
     var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -219,9 +223,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return connect(function (_ref7) {
-    var modelName = _ref7[namespace],
-      loading = _ref7.loading;
+  return connect(function (_ref8) {
+    var modelName = _ref8[namespace],
+      loading = _ref8.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -232,16 +236,17 @@ var builder = function builder(WrappedComponent, namespace, initData) {
     };
   })(WrappedComponent);
 };
-var Index = function Index(_ref8) {
-  var namespace = _ref8.ldId,
-    initData = _ref8.initData,
-    props = _objectWithoutProperties(_ref8, _excluded3);
+var Index = function Index(_ref9) {
+  var namespace = _ref9.ldId,
+    initData = _ref9.initData,
+    overModel = _ref9.overModel,
+    props = _objectWithoutProperties(_ref9, _excluded3);
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4;
     (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.unmodel(namespace);
     if (!((_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 ? void 0 : _getDvaApp4._store.getState()[namespace])) {
       var _getDvaApp5;
-      (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0 ? void 0 : _getDvaApp5.model(createModel(namespace));
+      (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0 ? void 0 : _getDvaApp5.model(createModel(namespace, overModel));
     }
     return builder(LdFormList, namespace, initData);
   }, [namespace]);
@@ -284,7 +289,8 @@ Index.defaultProps = {
     return new Promise(function (resolve) {
       return resolve(values);
     });
-  }
+  },
+  overModel: {}
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/components/LdFormList/model.js

@@ -1,12 +1,13 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { createFormModel } from '@luck-design-biz/base/utils/modelHelper';
 export default function (namespace) {
-  return createFormModel({
+  var modelProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return createFormModel(_objectSpread(_objectSpread({}, modelProps), {}, {
     namespace: namespace,
-    state: {
+    state: _objectSpread({
       ticketData: null
-    },
-    effects: {},
-    reducers: {
+    }, (modelProps === null || modelProps === void 0 ? void 0 : modelProps.state) || {}),
+    reducers: _objectSpread({
       setFormInit: function setFormInit(state, _ref) {
         var payload = _ref.payload;
         var formMode = payload.formMode,
@@ -19,6 +20,6 @@ export default function (namespace) {
         var ticketData = payload.ticketData;
         state.ticketData = ticketData;
       }
-    }
-  });
+    }, (modelProps === null || modelProps === void 0 ? void 0 : modelProps.reducers) || {})
+  }));
 }

package/es/components/LdGrid/index.js

@@ -2,11 +2,11 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
-  _excluded2 = ["ldId", "moduleCode", "suppressInit", "unclosableSet", "pageSize", "service"];
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
+  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
-import { transform, includes } from 'lodash';
+import { transform, includes, keyBy, union, keys } from 'lodash';
 import { useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import { build } from '@luck-design-biz/base/Component';
@@ -34,6 +34,7 @@ var LdGrid = function LdGrid(_ref) {
     pageSize = _ref.pagesize,
     total = _ref.totalCount,
     columnsRewrite = _ref.columnsRewrite,
+    columnsReset = _ref.columnsReset,
     batchOperations = _ref.batchOperations,
     formatDataSource = _ref.formatDataSource,
     resultSet = _ref.resultSet,
@@ -65,8 +66,7 @@ var LdGrid = function LdGrid(_ref) {
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
-          params: _params,
-          callback: afterInit
+          params: _params
         });
       }
     });
@@ -78,16 +78,29 @@ var LdGrid = function LdGrid(_ref) {
       });
     });
   }, [batchOperations]);
+
+  /**
+   * 优先级
+   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
+   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
+   */
   var _columns = useCreation(function () {
-    return transform(columns, function (result, col) {
-      if (col.isShowInGrid) {
-        var customColumn = columnsRewrite.find(function (column) {
-          return column.field === col.field;
-        }) || {};
-        result.push(getGridColumn(col, customColumn));
-      }
+    if (columnsReset) return columnsReset;
+    var defaultColumns = keyBy(columns, 'field');
+    var customColumns = keyBy(columnsRewrite, 'field');
+    var mergeFields = union(keys(defaultColumns), keys(customColumns));
+    return transform(mergeFields, function (result, field) {
+      var _customColumns$field;
+      if ((_customColumns$field = customColumns[field]) === null || _customColumns$field === void 0 ? void 0 : _customColumns$field.hide) {
+        // 任何情况都不显示
+      } else if (!defaultColumns[field]) {
+        // 数据集中不存在的字段以自定义的形式展示
+        result.push(customColumns[field]);
+      } else if (defaultColumns[field].isShowInGrid)
+        // 数据集中存在的字段和自定义结合展示
+        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}));
     }, []);
-  }, [columns, columnsRewrite]);
+  }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = useCreation(function () {
     return actionsColumn ? _objectSpread(_objectSpread({}, actionsColumn), {}, {
       getActions: function getActions(data, index, params) {
@@ -122,11 +135,11 @@ var LdGrid = function LdGrid(_ref) {
       total: total,
       current: current,
       pageSize: pageSize
-    }
+    },
+    dataSource: formatDataSource(list, detail),
+    resultSet: _resultSet
   }, treeConfig, props, {
     modelName: namespace,
-    dataSource: formatDataSource(list, detail),
-    resultSet: _resultSet,
     operates: [].concat(_toConsumableArray(resources), ['virtual']),
     ref: gridRef
   }));
@@ -140,9 +153,8 @@ var LdIndex = function LdIndex(_ref2) {
   var namespace = _ref2.ldId,
     moduleCode = _ref2.moduleCode,
     suppressInit = _ref2.suppressInit,
-    unclosableSet = _ref2.unclosableSet,
-    pageSize = _ref2.pageSize,
-    service = _ref2.service,
+    overModel = _ref2.overModel,
+    afterQuery = _ref2.afterQuery,
     props = _objectWithoutProperties(_ref2, _excluded2);
   var isTreeGrid = includes(props.isTree, props.dataSetKey);
   var Component = useCreation(function () {
@@ -150,15 +162,14 @@ var LdIndex = function LdIndex(_ref2) {
     (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.unmodel(namespace);
     if (!((_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 ? void 0 : _getDvaApp2._store.getState()[namespace])) {
       var _getDvaApp3;
-      (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.model(createModel(namespace, {
-        isFlow: isTreeGrid || !!props.isFlow,
+      (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.model(createModel(namespace, _objectSpread(_objectSpread({
+        isFlow: isTreeGrid || !!props.isFlow
+      }, overModel), {}, {
         dataSetKey: props.dataSetKey,
         moduleCode: moduleCode,
-        unclosableSet: unclosableSet,
-        pageSize: pageSize,
-        isTreeGrid: isTreeGrid,
-        service: service
-      }));
+        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid',
+        afterQuery: afterQuery
+      })));
     }
     return build(ForwardLdGrid, namespace, {
       suppressInit: suppressInit,
@@ -197,6 +208,7 @@ Index.propTypes = {
 
 Index.defaultProps = {
   columnsRewrite: [],
+  columnsReset: null,
   batchOperations: [],
   formatDataSource: function formatDataSource(_list, _detail) {
     return _list.map(function (indocno) {
@@ -205,7 +217,8 @@ Index.defaultProps = {
   },
   resultSet: {},
   suppressInit: false,
-  isFlow: false
+  isFlow: false,
+  overModel: {}
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/components/LdGrid/model.js

@@ -1,36 +1,33 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["readAll", "moduleCode", "dataSetKey", "behaviorKey", "afterQuery"];
 import { createMainModel } from '@luck-design-biz/base/utils/modelHelper';
-import { readBehaviorCall } from '../../services';
+import { behaviorCall } from '../../utils';
 export default function (namespace) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-    _ref$isFlow = _ref.isFlow,
-    isFlow = _ref$isFlow === void 0 ? false : _ref$isFlow,
-    dataSetKey = _ref.dataSetKey,
-    moduleCode = _ref.moduleCode,
-    _ref$unclosableSet = _ref.unclosableSet,
-    unclosableSet = _ref$unclosableSet === void 0 ? [] : _ref$unclosableSet,
-    pageSize = _ref.pageSize,
-    _ref$isTreeGrid = _ref.isTreeGrid,
-    isTreeGrid = _ref$isTreeGrid === void 0 ? false : _ref$isTreeGrid,
-    service = _ref.service;
-  return createMainModel({
+  var modelProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _readAll = modelProps.readAll,
+    moduleCode = modelProps.moduleCode,
+    dataSetKey = modelProps.dataSetKey,
+    behaviorKey = modelProps.behaviorKey,
+    afterQuery = modelProps.afterQuery,
+    _modelProps = _objectWithoutProperties(modelProps, _excluded);
+  return createMainModel(_objectSpread(_objectSpread({}, _modelProps), {}, {
     namespace: namespace,
-    isFlow: isFlow,
-    unclosableSet: unclosableSet,
-    pageSize: pageSize,
     readAll: function readAll() {
       var get = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var post = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      return (service || readBehaviorCall)(_objectSpread(_objectSpread({}, get), {}, {
-        moduleCode: moduleCode,
-        datasetCode: dataSetKey,
-        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
-      }), {
-        _AutoFilter: post
+      return new Promise(function (resolve) {
+        (_readAll || behaviorCall)(_objectSpread({
+          moduleCode: moduleCode,
+          datasetCode: dataSetKey,
+          behaviorKey: behaviorKey
+        }, get), {
+          _AutoFilter: post
+        }).then(function (res) {
+          afterQuery && afterQuery(res);
+          resolve(res);
+        });
       });
-    },
-    state: {},
-    effects: {},
-    reducers: {}
-  });
+    }
+  }));
 }

package/es/components/LdGridForm/index.js

@@ -9,11 +9,11 @@ import { transform } from 'lodash';
 import classNames from 'classnames';
 import ldBuilder from '../../helper/ldBuilder';
 import { GridForm } from '@luck-design-biz/base/FormList';
-import { getFormColumn, formItemDataFormat, dataFormat } from '../../utils';
+import { getFormColumn, formItemDataFormat, dataFormat, behaviorCall } from '../../utils';
 import { defaultComName } from '../../helper/form';
 import { LuckDaContext } from '../Builder';
-import { readBehaviorCall } from '../../services';
 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,
@@ -103,7 +103,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     return _objectSpread(_objectSpread({
       api: function api(get, post, formData) {
         var _formData$mainFormLdI;
-        return readBehaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
+        return behaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
       },
       get: function get() {
         return {
@@ -124,13 +124,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
   });
   return /*#__PURE__*/React.createElement(GridForm, _extends({
     noAddon: true,
-    operates: resources,
+    operates: defaultOpe,
     orderByAdd: "asc",
     rowSelection: true,
     type: type
   }, props, {
     onQuery: _objectSpread(_objectSpread({
-      api: readBehaviorCall,
+      api: behaviorCall,
       get: function get(formData) {
         var _formData$mainFormLdI2, _params2;
         var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readGrid'), _params2);

package/es/components/LdInfoPanel/index.js

@@ -2,12 +2,12 @@ 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 = ["columns", "resources", "actions", "doAction", "wrapperRef", "moduleCode", "dataSetKey", "defaultParmas", "suppressInit", "afterInit", "customColumns", "service"];
+var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "moduleCode", "dataSetKey", "defaultParmas", "suppressInit", "afterInit", "customColumns", "service", "afterQuery"];
 import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useCreation, useRequest } from 'ahooks';
 import { InfoPanel } from 'luck-design';
-import { readBehaviorCall } from '../../services';
+import { behaviorCall } from '../../utils';
 import { transform } from 'lodash';
 import ldBuilder from '../../helper/ldBuilder';
 var formatInfoPanelData = function formatInfoPanelData(columns, data) {
@@ -28,6 +28,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
     afterInit = _ref.afterInit,
     customColumns = _ref.customColumns,
     service = _ref.service,
+    afterQuery = _ref.afterQuery,
     props = _objectWithoutProperties(_ref, _excluded);
   var infoPanelRef = useRef(null);
   var _useState = useState({}),
@@ -57,25 +58,26 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
       return _objectSpread({
         title: xCol.fieldName
       }, col);
-    }) : customColumns.map(function (item) {
+    }) : columns.map(function (item) {
       return {
         title: item.fieldName,
         dataIndex: item.field
       };
     });
   }, [columns]);
-  var _useRequest = useRequest(service || readBehaviorCall, {
-      // 获取树数据源
+  var _useRequest = useRequest(service || behaviorCall, {
+      // 获取数据源
       defaultParams: defaultParams,
       manual: suppressInit,
-      onSuccess: function onSuccess(data) {
-        var code = data.code,
-          list = data.list,
-          detail = data.detail;
+      onSuccess: function onSuccess(response) {
+        afterQuery && afterQuery(response);
+        var code = response.code,
+          list = response.list,
+          detail = response.detail;
         if (code === 1 && list[0]) {
-          var _data = detail[list[0]];
-          setDataSource(_data);
-          afterInit && afterInit(_data);
+          var data = detail[list[0]];
+          setDataSource(data);
+          afterInit && afterInit(data);
         }
       }
     }),