@luck-design-biz/luckda 0.0.8 → 0.0.10

package/es/components/LdCard/index.js

@@ -9,7 +9,7 @@ import { getDvaApp } from 'umi';
 import PropTypes from 'prop-types';
 import { Icon, Tooltip } from 'antd';
 import { ResultSet, PermissionUtil } from 'luck-design';
-import { includes } from 'lodash';
+import { includes, difference } from 'lodash';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import createModel from './model';
 import ldBuilder from '../../helper/ldBuilder';
@@ -57,7 +57,7 @@ var LdCard = function LdCard(_ref) {
     });
   });
   var _batchOperations = useCreation(function () {
-    return batchOperations.map(function (i) {
+    return (batchOperations || []).map(function (i) {
       return _objectSpread(_objectSpread({}, i), {}, {
         wanted: i.wanted || 'virtual'
       });
@@ -99,7 +99,7 @@ var LdCard = function LdCard(_ref) {
       }), readOnly ? [] : [].concat(_toConsumableArray(item['__infuse_serial__'] || resources), ['virtual']))
     }));
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, Object.keys(params).length > 0 && /*#__PURE__*/React.createElement(ResultSet, _extends({
+  return /*#__PURE__*/React.createElement(React.Fragment, null, difference(Object.keys(params), resultSet.invisibleSet || []).length > 0 && /*#__PURE__*/React.createElement(ResultSet, _extends({
     set: params,
     onQuery: onQuery
   }, resultSet, {

package/es/components/LdFormList/index.js

@@ -83,7 +83,7 @@ var LdFormList = function LdFormList(_ref) {
     var data = formRefs && Object.keys(formRefs).map(function (key) {
       var _formRefs$key$current;
       var getValue = formRefs[key].getData || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
-      return _defineProperty({}, key, getValue());
+      return _defineProperty({}, key, getValue && getValue());
     });
     onValueChange(change, data);
   });
@@ -122,25 +122,30 @@ var LdFormList = function LdFormList(_ref) {
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
-            var _history$location = history.location,
-              pathname = _history$location.pathname,
-              query = _history$location.query;
-            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
-            window.openUrl("layer:".concat(_pathname).concat(stringify(_objectSpread(_objectSpread({}, query), {}, {
-              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
-            }))));
-          } else {
-            formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
-              indocno: indocno
-            }), function () {
-              return formListRef.current.setFormMode('edit');
-            });
-          }
+          // if (
+          //   !formWindow &&
+          //   formMode === 'add' &&
+          //   window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
+          // ) {
+          //   const { pathname, query } = history.location;
+          //   window.openUrl(
+          //     `layer:${pathname}?${stringify({
+          //       ...query,
+          //       title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
+          //     })}`,
+          //   );
+          // } else {
+          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
+            indocno: indocno
+          }), function () {
+            return formListRef.current.setFormMode('info');
+          });
+          // }
         }
       }
     });
   };
+
   var formConfig = _objectSpread(_objectSpread({
     formState: formState,
     formMode: formMode,

package/es/components/LdGrid/index.js

@@ -3,10 +3,10 @@ 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", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
-  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery"];
+  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
-import { transform, includes, keyBy, union, keys } from 'lodash';
+import { transform, includes, keyBy, union, keys, isNil } from 'lodash';
 import { useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import { build } from '@luck-design-biz/base/Component';
@@ -99,7 +99,7 @@ var LdGrid = function LdGrid(_ref) {
         result.push(customColumns[field]);
       } else if (defaultColumns[field].isShowInGrid)
         // 数据集中存在的字段和自定义结合展示
-        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}));
+        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid));
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = useCreation(function () {
@@ -138,7 +138,8 @@ var LdGrid = function LdGrid(_ref) {
       pageSize: pageSize
     },
     dataSource: formatDataSource(list, detail),
-    resultSet: _resultSet
+    resultSet: _resultSet,
+    gridId: namespace
   }, treeConfig, props, {
     modelName: namespace,
     operates: [].concat(_toConsumableArray(resources), ['virtual']),
@@ -156,8 +157,9 @@ var LdIndex = function LdIndex(_ref2) {
     suppressInit = _ref2.suppressInit,
     overModel = _ref2.overModel,
     afterQuery = _ref2.afterQuery,
+    _isTreeGrid = _ref2.isTreeGrid,
     props = _objectWithoutProperties(_ref2, _excluded2);
-  var isTreeGrid = includes(props.isTree, props.dataSetKey);
+  var isTreeGrid = isNil(_isTreeGrid) ? includes(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = useCreation(function () {
     var _getDvaApp, _getDvaApp2;
     (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.unmodel(namespace);

package/es/helper/FromItems.js

@@ -21,7 +21,9 @@ var _excluded = ["onBlur"],
   _excluded17 = ["onChange"],
   _excluded18 = ["handleValueChange", "config"],
   _excluded19 = ["handleValueChange"],
-  _excluded20 = ["handleValueChange", "config"];
+  _excluded20 = ["handleValueChange", "config"],
+  _excluded21 = ["onBlur"],
+  _excluded22 = ["handleValueChange", "config"];
 import React, { useState, useEffect } from 'react';
 import { getDvaApp } from 'umi';
 import { BasicFormItem } from 'luck-design';
@@ -264,4 +266,27 @@ export var getYearItem = function getYearItem() {
       }
     })
   }));
+};
+export var getEditorItem = function getEditorItem() {
+  var _ref13 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    handleValueChange = _ref13.handleValueChange,
+    _ref13$config = _ref13.config;
+  _ref13$config = _ref13$config === void 0 ? {} : _ref13$config;
+  var _onBlur4 = _ref13$config.onBlur,
+    _config = _objectWithoutProperties(_ref13$config, _excluded21),
+    props = _objectWithoutProperties(_ref13, _excluded22);
+  return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    type: "editor",
+    config: _objectSpread(_objectSpread({
+      language: 'zh-cn',
+      headers: {
+        Authorization: "Bearer "
+      }
+    }, _config), {}, {
+      onBlur: function onBlur(value) {
+        handleValueChange && handleValueChange(value);
+        _onBlur4 && _onBlur4(value);
+      }
+    })
+  }));
 };

package/es/helper/action.js

@@ -21,9 +21,7 @@ export var doAction = function doAction(action) {
     showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
     callback = _ref.callback,
     _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
-    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
-    form_id = _ref.form_id,
-    effcode = _ref.effcode;
+    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -45,16 +43,20 @@ export var doAction = function doAction(action) {
         onOk: onOk
       });
     };
+    var get = data.get,
+      post = data.post;
+    if (!get && !post) {
+      get = {};
+      post = data;
+    }
     var handleAction = function handleAction() {
-      behaviorCall({
+      behaviorCall(_objectSpread({
         behaviorKey: action,
-        moduleCode: moduleCode,
-        form_id: form_id,
-        effcode: effcode
-      }, data).then(function (res) {
+        moduleCode: moduleCode
+      }, get), post).then(function (res) {
         var code = res.code,
-          data = res.data;
-        callback && callback(code === 1, data, res);
+          _data = res.data;
+        callback && callback(code === 1, _data, res);
         if (code === 1 && showPopWhenSuccess) {
           showPop(formatMessage({
             id: 'app.base.tip.operate.success'
@@ -127,11 +129,15 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
   }, {});
   beforeSubmit(data, values).then(function (backData) {
     if (backData) {
-      doAction(action, backData, {
+      doAction(action, {
+        get: {
+          form_id: form_id,
+          effcode: effcode
+        },
+        post: backData
+      }, {
         showConfirm: false,
-        callback: callback,
-        form_id: form_id,
-        effcode: effcode
+        callback: callback
       });
     }
   });

package/es/helper/form.js

@@ -19,7 +19,8 @@ export var defaultComName = {
   code: 'string',
   color: 'color',
   zone: 'region',
-  year: 'year'
+  year: 'year',
+  rte: 'editor'
 };
 
 /**

package/es/utils/grid.js

@@ -1,11 +1,11 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["comName", "property"],
-  _excluded2 = ["name", "isVr"],
+  _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
 var _getDvaApp;
 import React from "react";
 import { getDvaApp } from 'umi';
-import { merge, isNil, isArray } from 'lodash';
+import { merge, isNil, isArray, includes } from 'lodash';
 import { Switch, Tag } from 'antd';
 import moment from 'moment';
 import { defaultComName, translator, formatCustomProps } from '../helper/form';
@@ -80,10 +80,11 @@ export var getGridColumn = function getGridColumn() {
     property = _ref.property,
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
+  var _props$isVirtual = props.isVirtual,
+    isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
   var _translator = translator(props),
     name = _translator.name,
-    _translator$isVr = _translator.isVr,
-    isVr = _translator$isVr === void 0 ? false : _translator$isVr,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(translateProps, formatCustomProps(customProps)),
     filter = _merge.filter,
@@ -94,13 +95,13 @@ export var getGridColumn = function getGridColumn() {
     title: _props.label,
     render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
   };
+  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region'], comName || defaultComName[property])) data.sortable = false;
   // data.filter = false;
   if (filter) {
     // 因为后端升级问题，暂时关闭过滤功能
     data.filter = filter;
     data.filterParams = filterParams;
-  }
-  if (!isVr && !filter) {
+  } else if (!isTreeGrid && !isVirtual) {
     switch (comName || defaultComName[property]) {
       case 'switch':
         data.filter = 'select';
@@ -188,7 +189,8 @@ export var getGridColumn = function getGridColumn() {
         };
         break;
       default:
+        data.filter = 'text';
     }
-  }
+  } else data.filter = false;
   return data;
 };

package/lib/components/LdCard/index.js

@@ -65,7 +65,7 @@ var LdCard = function LdCard(_ref) {
     });
   });
   var _batchOperations = (0, _ahooks.useCreation)(function () {
-    return batchOperations.map(function (i) {
+    return (batchOperations || []).map(function (i) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, i), {}, {
         wanted: i.wanted || 'virtual'
       });
@@ -107,7 +107,7 @@ var LdCard = function LdCard(_ref) {
       }), readOnly ? [] : [].concat((0, _toConsumableArray2.default)(item['__infuse_serial__'] || resources), ['virtual']))
     }));
   });
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Object.keys(params).length > 0 && /*#__PURE__*/_react.default.createElement(_luckDesign.ResultSet, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _lodash.difference)(Object.keys(params), resultSet.invisibleSet || []).length > 0 && /*#__PURE__*/_react.default.createElement(_luckDesign.ResultSet, (0, _extends2.default)({
     set: params,
     onQuery: onQuery
   }, resultSet, {

package/lib/components/LdFormList/index.js

@@ -90,7 +90,7 @@ var LdFormList = function LdFormList(_ref) {
     var data = formRefs && Object.keys(formRefs).map(function (key) {
       var _formRefs$key$current;
       var getValue = formRefs[key].getData || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
-      return (0, _defineProperty2.default)({}, key, getValue());
+      return (0, _defineProperty2.default)({}, key, getValue && getValue());
     });
     onValueChange(change, data);
   });
@@ -129,25 +129,30 @@ var LdFormList = function LdFormList(_ref) {
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
-            var _history$location = _umi.history.location,
-              pathname = _history$location.pathname,
-              query = _history$location.query;
-            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
-            window.openUrl("layer:".concat(_pathname).concat((0, _querystring.stringify)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, query), {}, {
-              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
-            }))));
-          } else {
-            formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
-              indocno: indocno
-            }), function () {
-              return formListRef.current.setFormMode('edit');
-            });
-          }
+          // if (
+          //   !formWindow &&
+          //   formMode === 'add' &&
+          //   window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
+          // ) {
+          //   const { pathname, query } = history.location;
+          //   window.openUrl(
+          //     `layer:${pathname}?${stringify({
+          //       ...query,
+          //       title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
+          //     })}`,
+          //   );
+          // } else {
+          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
+            indocno: indocno
+          }), function () {
+            return formListRef.current.setFormMode('info');
+          });
+          // }
         }
       }
     });
   };
+
   var formConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({
     formState: formState,
     formMode: formMode,

package/lib/components/LdGrid/index.js

@@ -21,7 +21,7 @@ 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", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
-  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery"];
+  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 var LdGrid = function LdGrid(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -107,7 +107,7 @@ var LdGrid = function LdGrid(_ref) {
         result.push(customColumns[field]);
       } else if (defaultColumns[field].isShowInGrid)
         // 数据集中存在的字段和自定义结合展示
-        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}));
+        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid));
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = (0, _ahooks.useCreation)(function () {
@@ -146,7 +146,8 @@ var LdGrid = function LdGrid(_ref) {
       pageSize: pageSize
     },
     dataSource: formatDataSource(list, detail),
-    resultSet: _resultSet
+    resultSet: _resultSet,
+    gridId: namespace
   }, treeConfig, props, {
     modelName: namespace,
     operates: [].concat((0, _toConsumableArray2.default)(resources), ['virtual']),
@@ -164,8 +165,9 @@ var LdIndex = function LdIndex(_ref2) {
     suppressInit = _ref2.suppressInit,
     overModel = _ref2.overModel,
     afterQuery = _ref2.afterQuery,
+    _isTreeGrid = _ref2.isTreeGrid,
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
-  var isTreeGrid = (0, _lodash.includes)(props.isTree, props.dataSetKey);
+  var isTreeGrid = (0, _lodash.isNil)(_isTreeGrid) ? (0, _lodash.includes)(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp, _getDvaApp2;
     (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.unmodel(namespace);

package/lib/helper/FromItems.js

@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getYearItem = exports.getUserItem = exports.getTextareaItem = exports.getSwitchItem = exports.getStringItem = exports.getSelectItem = exports.getRegionItem = exports.getRadioItem = exports.getNumberItem = exports.getGroupItem = exports.getDateItem = exports.getColorItem = void 0;
+exports.getYearItem = exports.getUserItem = exports.getTextareaItem = exports.getSwitchItem = exports.getStringItem = exports.getSelectItem = exports.getRegionItem = exports.getRadioItem = exports.getNumberItem = exports.getGroupItem = exports.getEditorItem = exports.getDateItem = exports.getColorItem = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -34,7 +34,9 @@ var _excluded = ["onBlur"],
   _excluded17 = ["onChange"],
   _excluded18 = ["handleValueChange", "config"],
   _excluded19 = ["handleValueChange"],
-  _excluded20 = ["handleValueChange", "config"];
+  _excluded20 = ["handleValueChange", "config"],
+  _excluded21 = ["onBlur"],
+  _excluded22 = ["handleValueChange", "config"];
 var getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref.handleValueChange,
@@ -284,4 +286,28 @@ var getYearItem = function getYearItem() {
     })
   }));
 };
-exports.getYearItem = getYearItem;
+exports.getYearItem = getYearItem;
+var getEditorItem = function getEditorItem() {
+  var _ref13 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    handleValueChange = _ref13.handleValueChange,
+    _ref13$config = _ref13.config;
+  _ref13$config = _ref13$config === void 0 ? {} : _ref13$config;
+  var _onBlur4 = _ref13$config.onBlur,
+    _config = (0, _objectWithoutProperties2.default)(_ref13$config, _excluded21),
+    props = (0, _objectWithoutProperties2.default)(_ref13, _excluded22);
+  return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
+    type: "editor",
+    config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      language: 'zh-cn',
+      headers: {
+        Authorization: "Bearer "
+      }
+    }, _config), {}, {
+      onBlur: function onBlur(value) {
+        handleValueChange && handleValueChange(value);
+        _onBlur4 && _onBlur4(value);
+      }
+    })
+  }));
+};
+exports.getEditorItem = getEditorItem;

package/lib/helper/action.js

@@ -28,9 +28,7 @@ var doAction = function doAction(action) {
     showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
     callback = _ref.callback,
     _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
-    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
-    form_id = _ref.form_id,
-    effcode = _ref.effcode;
+    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -52,16 +50,20 @@ var doAction = function doAction(action) {
         onOk: onOk
       });
     };
+    var get = data.get,
+      post = data.post;
+    if (!get && !post) {
+      get = {};
+      post = data;
+    }
     var handleAction = function handleAction() {
-      (0, _utils2.behaviorCall)({
+      (0, _utils2.behaviorCall)((0, _objectSpread2.default)({
         behaviorKey: action,
-        moduleCode: moduleCode,
-        form_id: form_id,
-        effcode: effcode
-      }, data).then(function (res) {
+        moduleCode: moduleCode
+      }, get), post).then(function (res) {
         var code = res.code,
-          data = res.data;
-        callback && callback(code === 1, data, res);
+          _data = res.data;
+        callback && callback(code === 1, _data, res);
         if (code === 1 && showPopWhenSuccess) {
           (0, _utils.showPop)((0, _utils.formatMessage)({
             id: 'app.base.tip.operate.success'
@@ -135,11 +137,15 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
   }, {});
   beforeSubmit(data, values).then(function (backData) {
     if (backData) {
-      doAction(action, backData, {
+      doAction(action, {
+        get: {
+          form_id: form_id,
+          effcode: effcode
+        },
+        post: backData
+      }, {
         showConfirm: false,
-        callback: callback,
-        form_id: form_id,
-        effcode: effcode
+        callback: callback
       });
     }
   });

package/lib/helper/form.js

@@ -28,7 +28,8 @@ var defaultComName = {
   code: 'string',
   color: 'color',
   zone: 'region',
-  year: 'year'
+  year: 'year',
+  rte: 'editor'
 };
 
 /**

package/lib/utils/grid.js

@@ -15,7 +15,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _form = require("../helper/form");
 var _utils = require("@luck-design-biz/base/utils");
 var _excluded = ["comName", "property"],
-  _excluded2 = ["name", "isVr"],
+  _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
 var _getDvaApp;
 var _getDvaApp$_store = (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store,
@@ -88,10 +88,11 @@ var getGridColumn = function getGridColumn() {
     property = _ref.property,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
+  var _props$isVirtual = props.isVirtual,
+    isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
   var _translator = (0, _form.translator)(props),
     name = _translator.name,
-    _translator$isVr = _translator.isVr,
-    isVr = _translator$isVr === void 0 ? false : _translator$isVr,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
   var _merge = (0, _lodash.merge)(translateProps, (0, _form.formatCustomProps)(customProps)),
     filter = _merge.filter,
@@ -102,13 +103,13 @@ var getGridColumn = function getGridColumn() {
     title: _props.label,
     render: _props.render || getColumnRender(name, comName || _form.defaultComName[property], _props)
   };
+  if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region'], comName || _form.defaultComName[property])) data.sortable = false;
   // data.filter = false;
   if (filter) {
     // 因为后端升级问题，暂时关闭过滤功能
     data.filter = filter;
     data.filterParams = filterParams;
-  }
-  if (!isVr && !filter) {
+  } else if (!isTreeGrid && !isVirtual) {
     switch (comName || _form.defaultComName[property]) {
       case 'switch':
         data.filter = 'select';
@@ -196,8 +197,9 @@ var getGridColumn = function getGridColumn() {
         };
         break;
       default:
+        data.filter = 'text';
     }
-  }
+  } else data.filter = false;
   return data;
 };
 exports.getGridColumn = getGridColumn;

package/package.json

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