@luck-design-biz/luckda 0.0.14 → 0.0.15-2

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,
@@ -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

@@ -1,15 +1,18 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 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 = ["namespace", "formState", "formMode", "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"];
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+  _excluded2 = ["dataSets", "doAction", "resources"],
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded4 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
 import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
-import { useCreation, useMemoizedFn } from 'ahooks';
+import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
 import { BasicDivider } from 'luck-design';
 import { ChildrenUtil } from '@luck-design-biz/base/utils';
 import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
@@ -20,6 +23,9 @@ import { LuckDaContext } from '../Builder';
 import { LuckDaPopContext } from '../LdPop';
 import createModel from './model';
 import { onBatchSubmitAction } from '../../helper/action';
+import { isArray, sortBy, mapValues } from 'lodash';
+import { BpmButton } from '@luck-design-biz/base/bpm';
+import { readBehaviorCall } from '../../services';
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -27,6 +33,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,
@@ -50,11 +57,21 @@ var LdFormList = function LdFormList(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     submitLoading = _useState2[0],
     setSubmitLoading = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isCustomRenderAffixRight = _useState4[0],
+    setIsCustomRenderAffixRight = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    bizData = _useState6[0],
+    setBizData = _useState6[1];
   var _ref2 = useContext(LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
   var _ref3 = useContext(LuckDaContext) || {},
     dataSets = _ref3.dataSets,
-    doAction = _ref3.doAction;
+    doAction = _ref3.doAction,
+    resources = _ref3.resources,
+    rest = _objectWithoutProperties(_ref3, _excluded2);
   var formListRef = useRef(null);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, formListRef.current), {}, {
@@ -89,11 +106,62 @@ var LdFormList = function LdFormList(_ref) {
       formId: formId
     }, extraConfig)));
   });
+
+  /**zss添加**/
+  var renderAffixRightCustom = function renderAffixRightCustom() {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, {
+      bizData: bizData,
+      suppressDept: false
+    }));
+  };
+  useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _props$ticketData, _params, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(formMode !== 'add')) {
+            _context.next = 8;
+            break;
+          }
+          _params = {
+            'indocno': (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
+            moduleCode: rest.moduleCode,
+            datasetCode: mainDataSetKey,
+            mainDataSetKey: mainDataSetKey,
+            behaviorKey: 'readBpm'
+          };
+          _context.next = 4;
+          return readBehaviorCall(_params);
+        case 4:
+          _yield$readBehaviorCa = _context.sent;
+          code = _yield$readBehaviorCa.code;
+          data = _yield$readBehaviorCa.data;
+          if (code == 1 && data) {
+            bpmInfoObj = data.bpmInfo;
+            tempObj = {
+              bizKey: bpmInfoObj.bizKey,
+              sname: bpmInfoObj.name,
+              modelKey: bpmInfoObj.bpmKey,
+              // basekey :  bpmInfoObj.buskey,
+              idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
+              moduleCode: rest.moduleCode,
+              datasetCode: mainDataSetKey,
+              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
+            };
+            setBizData(tempObj);
+            setIsCustomRenderAffixRight(true);
+          }
+        case 8:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), []);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
-    var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      formCode = _ref6.formCode,
-      formKey = _ref6.formKey,
-      formUid = _ref6.formUid;
+    var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      formCode = _ref7.formCode,
+      formKey = _ref7.formKey,
+      formUid = _ref7.formUid;
     setSubmitLoading(true);
     onBatchSubmitAction({
       values: values,
@@ -150,7 +218,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 +234,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,
@@ -171,68 +250,71 @@ var LdFormList = function LdFormList(_ref) {
   }), /*#__PURE__*/React.createElement(FormListAffix, {
     showSaveBtn: !readOnly && showSaveBtn,
     renderLeft: renderAffixLeft,
-    renderRight: renderAffixRight,
+    renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     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 _ref8 = formProps || {},
+        ldId = _ref8.id,
+        _ref8$header = _ref8.header,
+        header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
+        title = _ref8.title,
+        _readOnly = _ref8.readOnly,
+        _ref8$extraConfig = _ref8.extraConfig,
+        extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
+        _ref8$renderTopLeft = _ref8.renderTopLeft,
+        _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
+          return /*#__PURE__*/React.createElement(React.Fragment, null);
+        } : _ref8$renderTopLeft,
+        _props = _objectWithoutProperties(_ref8, _excluded3);
+      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];
   }));
 };
 
@@ -245,9 +327,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return connect(function (_ref8) {
-    var modelName = _ref8[namespace],
-      loading = _ref8.loading;
+  return connect(function (_ref9) {
+    var modelName = _ref9[namespace],
+      loading = _ref9.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -258,11 +340,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
     };
   })(WrappedComponent);
 };
-var Index = function Index(_ref9) {
-  var namespace = _ref9.ldId,
-    initData = _ref9.initData,
-    overModel = _ref9.overModel,
-    props = _objectWithoutProperties(_ref9, _excluded3);
+var Index = function Index(_ref10) {
+  var namespace = _ref10.ldId,
+    initData = _ref10.initData,
+    overModel = _ref10.overModel,
+    props = _objectWithoutProperties(_ref10, _excluded4);
   var match = useRouteMatch();
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

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,
@@ -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/utils/grid.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["comName", "property"],
   _excluded2 = ["name"],
@@ -33,7 +34,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':
@@ -95,11 +96,11 @@ export var getGridColumn = function getGridColumn() {
     filter = _merge.filter,
     filterParams = _merge.filterParams,
     _props = _objectWithoutProperties(_merge, _excluded3);
-  var data = {
+  var data = _objectSpread(_objectSpread({}, _props), {}, {
     field: name,
     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 (!isNil(filter)) {
@@ -109,6 +110,7 @@ export var getGridColumn = function getGridColumn() {
   } 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;
     }

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,
@@ -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

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -25,15 +27,20 @@ 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"],
-  _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
-  _excluded3 = ["ldId", "initData", "overModel"];
+var _lodash = require("lodash");
+var _bpm = require("@luck-design-biz/base/bpm");
+var _services = require("../../services");
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+  _excluded2 = ["dataSets", "doAction", "resources"],
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded4 = ["ldId", "initData", "overModel"];
 // 组件
 var LdFormList = function LdFormList(_ref) {
   var _formList$find;
   var namespace = _ref.namespace,
     formState = _ref.formState,
     formMode = _ref.formMode,
+    formOperates = _ref.formOperates,
     loading = _ref.loading,
     wrapperRef = _ref.wrapperRef,
     readOnly = _ref.readOnly,
@@ -57,11 +64,21 @@ var LdFormList = function LdFormList(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     submitLoading = _useState2[0],
     setSubmitLoading = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    isCustomRenderAffixRight = _useState4[0],
+    setIsCustomRenderAffixRight = _useState4[1];
+  var _useState5 = (0, _react.useState)({}),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    bizData = _useState6[0],
+    setBizData = _useState6[1];
   var _ref2 = (0, _react.useContext)(_LdPop.LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
   var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     dataSets = _ref3.dataSets,
-    doAction = _ref3.doAction;
+    doAction = _ref3.doAction,
+    resources = _ref3.resources,
+    rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
   var formListRef = (0, _react.useRef)(null);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
@@ -96,11 +113,62 @@ var LdFormList = function LdFormList(_ref) {
       formId: formId
     }, extraConfig)));
   });
+
+  /**zss添加**/
+  var renderAffixRightCustom = function renderAffixRightCustom() {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, {
+      bizData: bizData,
+      suppressDept: false
+    }));
+  };
+  (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _props$ticketData, _params, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
+    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(formMode !== 'add')) {
+            _context.next = 8;
+            break;
+          }
+          _params = {
+            'indocno': (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
+            moduleCode: rest.moduleCode,
+            datasetCode: mainDataSetKey,
+            mainDataSetKey: mainDataSetKey,
+            behaviorKey: 'readBpm'
+          };
+          _context.next = 4;
+          return (0, _services.readBehaviorCall)(_params);
+        case 4:
+          _yield$readBehaviorCa = _context.sent;
+          code = _yield$readBehaviorCa.code;
+          data = _yield$readBehaviorCa.data;
+          if (code == 1 && data) {
+            bpmInfoObj = data.bpmInfo;
+            tempObj = {
+              bizKey: bpmInfoObj.bizKey,
+              sname: bpmInfoObj.name,
+              modelKey: bpmInfoObj.bpmKey,
+              // basekey :  bpmInfoObj.buskey,
+              idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
+              moduleCode: rest.moduleCode,
+              datasetCode: mainDataSetKey,
+              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
+            };
+            setBizData(tempObj);
+            setIsCustomRenderAffixRight(true);
+          }
+        case 8:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), []);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
-    var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      formCode = _ref6.formCode,
-      formKey = _ref6.formKey,
-      formUid = _ref6.formUid;
+    var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      formCode = _ref7.formCode,
+      formKey = _ref7.formKey,
+      formUid = _ref7.formUid;
     setSubmitLoading(true);
     (0, _action.onBatchSubmitAction)({
       values: values,
@@ -157,7 +225,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 +241,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,
@@ -178,68 +257,71 @@ var LdFormList = function LdFormList(_ref) {
   }), /*#__PURE__*/_react.default.createElement(_FormList.FormListAffix, {
     showSaveBtn: !readOnly && showSaveBtn,
     renderLeft: renderAffixLeft,
-    renderRight: renderAffixRight,
+    renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     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 _ref8 = formProps || {},
+        ldId = _ref8.id,
+        _ref8$header = _ref8.header,
+        header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
+        title = _ref8.title,
+        _readOnly = _ref8.readOnly,
+        _ref8$extraConfig = _ref8.extraConfig,
+        extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
+        _ref8$renderTopLeft = _ref8.renderTopLeft,
+        _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
+          return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+        } : _ref8$renderTopLeft,
+        _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
+      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];
   }));
 };
 
@@ -252,9 +334,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return (0, _umi.connect)(function (_ref8) {
-    var modelName = _ref8[namespace],
-      loading = _ref8.loading;
+  return (0, _umi.connect)(function (_ref9) {
+    var modelName = _ref9[namespace],
+      loading = _ref9.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -265,11 +347,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
     };
   })(WrappedComponent);
 };
-var Index = function Index(_ref9) {
-  var namespace = _ref9.ldId,
-    initData = _ref9.initData,
-    overModel = _ref9.overModel,
-    props = (0, _objectWithoutProperties2.default)(_ref9, _excluded3);
+var Index = function Index(_ref10) {
+  var namespace = _ref10.ldId,
+    initData = _ref10.initData,
+    overModel = _ref10.overModel,
+    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded4);
   var match = (0, _umi.useRouteMatch)();
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

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,
@@ -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/utils/grid.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getColumnRender = getColumnRender;
 exports.getGridColumn = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _umi = require("umi");
@@ -40,7 +41,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':
@@ -102,11 +103,11 @@ var getGridColumn = function getGridColumn() {
     filter = _merge.filter,
     filterParams = _merge.filterParams,
     _props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
-  var data = {
+  var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
     field: name,
     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 (!(0, _lodash.isNil)(filter)) {
@@ -116,6 +117,7 @@ var getGridColumn = function getGridColumn() {
   } 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;
     }

package/package.json

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