@luck-design-biz/luckda 0.0.2 → 0.0.3

package/es/helper/action.js

@@ -1,11 +1,11 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 // 通用方法
+import React from 'react';
 import { Modal } from 'antd';
 import { showPop, formatMessage } from '@luck-design-biz/base/utils';
 import { transform, isArray } from 'lodash';
-import { dataFormat } from '../utils';
+import { dataFormat, behaviorCall } from '../utils';
 import { defaultComName } from './form';
-import { readBehaviorCall } from '../services';
 
 /**
  * 提交行为
@@ -42,10 +42,9 @@ export var doAction = function doAction(action) {
       });
     };
     var handleAction = function handleAction() {
-      readBehaviorCall({
+      behaviorCall({
         behaviorKey: action,
-        moduleCode: moduleCode,
-        datasetCode: Object.keys(data).join(',')
+        moduleCode: moduleCode
       }, data).then(function (_ref3) {
         var code = _ref3.code,
           data = _ref3.data;

package/es/utils/action.js

@@ -0,0 +1,33 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+// 行为请求同一接口
+import { readBehaviorCall } from '../services';
+export function behaviorCall() {
+  return _behaviorCall.apply(this, arguments);
+}
+function _behaviorCall() {
+  _behaviorCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var get,
+      post,
+      datasetCode,
+      _args = arguments;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            get = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            post = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+            datasetCode = get.datasetCode;
+            return _context.abrupt("return", readBehaviorCall(_objectSpread(_objectSpread({}, get), {}, {
+              datasetCode: datasetCode || Object.keys(post).join(',')
+            }), post));
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _behaviorCall.apply(this, arguments);
+}

package/es/utils/index.js

@@ -1,2 +1,3 @@
 export * from './grid';
-export * from './form';
+export * from './form';
+export * from './action';

package/lib/components/LdAutoForm/index.js

@@ -9,7 +9,6 @@ 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 _ahooks = require("ahooks");
@@ -18,8 +17,8 @@ var _FormList = require("@luck-design-biz/base/FormList");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _Builder = require("../Builder");
-var _services = require("../../services");
 var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData"];
+var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -54,10 +53,6 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
   var defaultValues = (0, _react.useRef)();
-  var _useState = (0, _react.useState)(null),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    selfResources = _useState2[0],
-    setSelfResources = _useState2[1];
   var isMain = ldId === mainFormLdId;
   var basicItems = (0, _ahooks.useCreation)(function () {
     var _defaultValues = {};
@@ -95,7 +90,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 (0, _services.readBehaviorCall)(get, post, formData);
+        return (0, _utils.behaviorCall)(get, post, formData);
       },
       get: function get() {
         return {
@@ -119,7 +114,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   });
   return /*#__PURE__*/_react.default.createElement(_FormList.AutoForm, (0, _extends2.default)({}, props, {
     onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
-      api: _services.readBehaviorCall,
+      api: _utils.behaviorCall,
       get: function get(formData) {
         var _formData$mainFormLdI2, _params2;
         var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readForm'), _params2);
@@ -128,9 +123,6 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data) {
-        if (data['__infuse_serial__']) {
-          setSelfResources(data['__infuse_serial__']);
-        }
         var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, data));
         if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
         return formItemData;
@@ -138,7 +130,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     }),
     onAdd: onOperate(onAdd, 'add'),
     onUpdate: onOperate(onUpdate, 'update'),
-    operates: selfResources || resources
+    operates: defaultOpe
   }, formConfig), basicItems);
 };
 var _default = (0, _ldBuilder.default)(buildLdAutoForm);

package/lib/components/LdCard/index.js

@@ -22,8 +22,8 @@ var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _List = require("@luck-design-biz/base/List");
 var _utils = require("@luck-design-biz/base/utils");
 var _Component = require("@luck-design-biz/base/Component");
-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"];
 var LdCard = function LdCard(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -39,7 +39,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,
@@ -48,6 +47,7 @@ var LdCard = function LdCard(_ref) {
     onOperationsClick = _ref.onOperationsClick,
     readOnly = _ref.readOnly,
     batchOperations = _ref.batchOperations,
+    readFilter = _ref.readFilter,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var cardRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
@@ -134,9 +134,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 = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   if ((0, _lodash.includes)(props.isTree, props.dataSetKey)) return (0, _utils.formatMessage)({
     id: 'luckda.ldCard.notTres',
@@ -147,14 +146,13 @@ var LdIndex = function LdIndex(_ref2) {
     (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.unmodel(namespace);
     if (!((_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 ? void 0 : _getDvaApp2._store.getState()[namespace])) {
       var _getDvaApp3;
-      (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.model((0, _model.default)(namespace, {
-        isFlow: !!props.isFlow,
+      (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        isFlow: !!props.isFlow
+      }, overModel), {}, {
         dataSetKey: props.dataSetKey,
         moduleCode: moduleCode,
-        unclosableSet: unclosableSet,
-        pageSize: pageSize,
-        service: service
-      }));
+        afterQuery: afterQuery
+      })));
     }
     return (0, _Component.build)(ForwardLdCard, namespace, {
       suppressInit: suppressInit,
@@ -197,7 +195,8 @@ Index.defaultProps = {
       return _detail[indocno];
     });
   },
-  cardActions: []
+  cardActions: [],
+  overModel: {}
 };
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({

package/lib/components/LdCard/model.js

@@ -6,36 +6,34 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _modelHelper = require("@luck-design-biz/base/utils/modelHelper");
-var _services = require("../../services");
+var _utils = require("../../utils");
+var _excluded = ["readAll", "moduleCode", "dataSetKey", "afterQuery"];
 function _default(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 (0, _modelHelper.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 = (0, _objectWithoutProperties2.default)(modelProps, _excluded);
+  return (0, _modelHelper.createListModel)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _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 || _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, get), {}, {
-        moduleCode: moduleCode,
-        datasetCode: dataSetKey,
-        behaviorKey: 'readGrid'
-      }), {
-        _AutoFilter: post
+      return new Promise(function (resolve) {
+        (_readAll || _utils.behaviorCall)((0, _objectSpread2.default)({
+          moduleCode: moduleCode,
+          datasetCode: dataSetKey,
+          behaviorKey: 'readGrid'
+        }, get), {
+          _AutoFilter: post
+        }).then(function (res) {
+          afterQuery && afterQuery(res);
+          resolve(res);
+        });
       });
-    },
-    state: {},
-    effects: {},
-    reducers: {}
-  });
+    }
+  }));
 }

package/lib/components/LdFormList/index.js

@@ -27,7 +27,7 @@ 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"],
   _excluded2 = ["id", "header", "title", "readOnly", "extraConfig"],
-  _excluded3 = ["ldId", "initData"];
+  _excluded3 = ["ldId", "initData", "overModel"];
 // 组件
 var LdFormList = function LdFormList(_ref) {
   var _formList$find;
@@ -242,13 +242,14 @@ var builder = function builder(WrappedComponent, namespace, initData) {
 var Index = function Index(_ref8) {
   var namespace = _ref8.ldId,
     initData = _ref8.initData,
+    overModel = _ref8.overModel,
     props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4;
     (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.unmodel(namespace);
     if (!((_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 ? void 0 : _getDvaApp4._store.getState()[namespace])) {
       var _getDvaApp5;
-      (_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0 ? void 0 : _getDvaApp5.model((0, _model.default)(namespace));
+      (_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0 ? void 0 : _getDvaApp5.model((0, _model.default)(namespace, overModel));
     }
     return builder(LdFormList, namespace, initData);
   }, [namespace]);
@@ -291,7 +292,8 @@ Index.defaultProps = {
     return new Promise(function (resolve) {
       return resolve(values);
     });
-  }
+  },
+  overModel: {}
 };
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({

package/lib/components/LdFormList/model.js

@@ -1,18 +1,20 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _modelHelper = require("@luck-design-biz/base/utils/modelHelper");
 function _default(namespace) {
-  return (0, _modelHelper.createFormModel)({
+  var modelProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return (0, _modelHelper.createFormModel)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, modelProps), {}, {
     namespace: namespace,
-    state: {
+    state: (0, _objectSpread2.default)({
       ticketData: null
-    },
-    effects: {},
-    reducers: {
+    }, (modelProps === null || modelProps === void 0 ? void 0 : modelProps.state) || {}),
+    reducers: (0, _objectSpread2.default)({
       setFormInit: function setFormInit(state, _ref) {
         var payload = _ref.payload;
         var formMode = payload.formMode,
@@ -25,6 +27,6 @@ function _default(namespace) {
         var ticketData = payload.ticketData;
         state.ticketData = ticketData;
       }
-    }
-  });
+    }, (modelProps === null || modelProps === void 0 ? void 0 : modelProps.reducers) || {})
+  }));
 }

package/lib/components/LdGrid/index.js

@@ -20,8 +20,8 @@ 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", "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"];
 var LdGrid = function LdGrid(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -42,6 +42,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,
@@ -73,8 +74,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
         });
       }
     });
@@ -86,16 +86,29 @@ var LdGrid = function LdGrid(_ref) {
       });
     });
   }, [batchOperations]);
+
+  /**
+   * 优先级
+   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
+   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
+   */
   var _columns = (0, _ahooks.useCreation)(function () {
-    return (0, _lodash.transform)(columns, function (result, col) {
-      if (col.isShowInGrid) {
-        var customColumn = columnsRewrite.find(function (column) {
-          return column.field === col.field;
-        }) || {};
-        result.push((0, _utils.getGridColumn)(col, customColumn));
-      }
+    if (columnsReset) return columnsReset;
+    var defaultColumns = (0, _lodash.keyBy)(columns, 'field');
+    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) {
+      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((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}));
     }, []);
-  }, [columns, columnsRewrite]);
+  }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = (0, _ahooks.useCreation)(function () {
     return actionsColumn ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, actionsColumn), {}, {
       getActions: function getActions(data, index, params) {
@@ -130,11 +143,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((0, _toConsumableArray2.default)(resources), ['virtual']),
     ref: gridRef
   }));
@@ -148,9 +161,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 = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   var isTreeGrid = (0, _lodash.includes)(props.isTree, props.dataSetKey);
   var Component = (0, _ahooks.useCreation)(function () {
@@ -158,15 +170,14 @@ var LdIndex = function LdIndex(_ref2) {
     (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.unmodel(namespace);
     if (!((_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 ? void 0 : _getDvaApp2._store.getState()[namespace])) {
       var _getDvaApp3;
-      (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.model((0, _model.default)(namespace, {
-        isFlow: isTreeGrid || !!props.isFlow,
+      (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        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 (0, _Component.build)(ForwardLdGrid, namespace, {
       suppressInit: suppressInit,
@@ -205,6 +216,7 @@ Index.propTypes = {
 
 Index.defaultProps = {
   columnsRewrite: [],
+  columnsReset: null,
   batchOperations: [],
   formatDataSource: function formatDataSource(_list, _detail) {
     return _list.map(function (indocno) {
@@ -213,7 +225,8 @@ Index.defaultProps = {
   },
   resultSet: {},
   suppressInit: false,
-  isFlow: false
+  isFlow: false,
+  overModel: {}
 };
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({

package/lib/components/LdGrid/model.js

@@ -6,38 +6,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _modelHelper = require("@luck-design-biz/base/utils/modelHelper");
-var _services = require("../../services");
+var _utils = require("../../utils");
+var _excluded = ["readAll", "moduleCode", "dataSetKey", "behaviorKey", "afterQuery"];
 function _default(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 (0, _modelHelper.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 = (0, _objectWithoutProperties2.default)(modelProps, _excluded);
+  return (0, _modelHelper.createMainModel)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _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 || _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, get), {}, {
-        moduleCode: moduleCode,
-        datasetCode: dataSetKey,
-        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
-      }), {
-        _AutoFilter: post
+      return new Promise(function (resolve) {
+        (_readAll || _utils.behaviorCall)((0, _objectSpread2.default)({
+          moduleCode: moduleCode,
+          datasetCode: dataSetKey,
+          behaviorKey: behaviorKey
+        }, get), {
+          _AutoFilter: post
+        }).then(function (res) {
+          afterQuery && afterQuery(res);
+          resolve(res);
+        });
       });
-    },
-    state: {},
-    effects: {},
-    reducers: {}
-  });
+    }
+  }));
 }

package/lib/components/LdGridForm/index.js

@@ -19,9 +19,9 @@ var _FormList = require("@luck-design-biz/base/FormList");
 var _utils = require("../../utils");
 var _form = require("../../helper/form");
 var _Builder = require("../Builder");
-var _services = require("../../services");
 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"];
+var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -111,7 +111,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     return (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: function api(get, post, formData) {
         var _formData$mainFormLdI;
-        return (0, _services.readBehaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
+        return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, 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 {
@@ -132,13 +132,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
   });
   return /*#__PURE__*/_react.default.createElement(_FormList.GridForm, (0, _extends2.default)({
     noAddon: true,
-    operates: resources,
+    operates: defaultOpe,
     orderByAdd: "asc",
     rowSelection: true,
     type: type
   }, props, {
     onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
-      api: _services.readBehaviorCall,
+      api: _utils.behaviorCall,
       get: function get(formData) {
         var _formData$mainFormLdI2, _params2;
         var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readGrid'), _params2);

package/lib/components/LdInfoPanel/index.js

@@ -14,10 +14,10 @@ var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
 var _luckDesign = require("luck-design");
-var _services = require("../../services");
+var _utils = require("../../utils");
 var _lodash = require("lodash");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
-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"];
 var formatInfoPanelData = function formatInfoPanelData(columns, data) {
   return (0, _lodash.transform)(columns, function (result, col) {
     result[col.dataIndex] = col.render && col.render(data[col.dataIndex], data) || data["".concat(col.dataIndex, "_virtual")] || data[col.dataIndex];
@@ -36,6 +36,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
     afterInit = _ref.afterInit,
     customColumns = _ref.customColumns,
     service = _ref.service,
+    afterQuery = _ref.afterQuery,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var infoPanelRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)({}),
@@ -65,25 +66,26 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
       return (0, _objectSpread2.default)({
         title: xCol.fieldName
       }, col);
-    }) : customColumns.map(function (item) {
+    }) : columns.map(function (item) {
       return {
         title: item.fieldName,
         dataIndex: item.field
       };
     });
   }, [columns]);
-  var _useRequest = (0, _ahooks.useRequest)(service || _services.readBehaviorCall, {
-      // 获取树数据源
+  var _useRequest = (0, _ahooks.useRequest)(service || _utils.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);
         }
       }
     }),