@luck-design-biz/luckda 0.0.25-9 → 0.0.26-1

package/lib/components/LdFormList/index.js

@@ -17,9 +17,8 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _lodash = require("lodash");
-var _bpm = require("@luck-design-biz/bpm");
 var _ahooks = require("ahooks");
+var _createDeepCompareEffect = require("ahooks/es/createDeepCompareEffect");
 var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
 var _FormList = require("@luck-design-biz/base/FormList");
@@ -30,11 +29,16 @@ var _Builder = require("../Builder");
 var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
-var _useTodo3 = _interopRequireDefault(require("../../lowcode/engine/tools/useTodo"));
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules"],
+var _lodash = require("lodash");
+var _bpm = require("@luck-design-biz/bpm");
+var _services = require("../../services");
+var _querystring = require("querystring");
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded4 = ["ldId", "initData", "overModel"];
+var useDeepCompareAsyncEffect = (0, _createDeepCompareEffect.createDeepCompareEffect)(_ahooks.useAsyncEffect);
+
 // 组件
 var LdFormList = function LdFormList(_ref) {
   var _formList$find;
@@ -62,10 +66,8 @@ var LdFormList = function LdFormList(_ref) {
     } : _ref$renderFormExtra,
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
-    setVerifyRules = _ref.setVerifyRules,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
-  var currentValueRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     submitLoading = _useState2[0],
@@ -78,10 +80,6 @@ var LdFormList = function LdFormList(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     bizData = _useState6[0],
     setBizData = _useState6[1];
-  var _useTodo = (0, _useTodo3.default)(),
-    _useTodo2 = (0, _slicedToArray2.default)(_useTodo, 2),
-    _ = _useTodo2[0],
-    callBehavior = _useTodo2[1];
   var luckTheme = (0, _ahooks.useCreation)(function () {
     return document.body.getAttribute('luck-theme');
   }, []);
@@ -95,9 +93,6 @@ var LdFormList = function LdFormList(_ref) {
   var formListRef = (0, _react.useRef)(null);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
-      getCValue: function getCValue() {
-        return currentValueRef.current || props.formData;
-      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         if (props.formMode !== 'add') {
@@ -110,8 +105,7 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      },
-      ticketData: props.ticketData
+      }
     });
   });
   var handleValueChange = (0, _ahooks.useMemoizedFn)(function (change) {
@@ -122,7 +116,6 @@ var LdFormList = function LdFormList(_ref) {
       var getValue = ((_formRefs$key = formRefs[key]) !== null && _formRefs$key !== void 0 && (_formRefs$key = _formRefs$key.formRef) !== null && _formRefs$key !== void 0 && _formRefs$key.current ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
       return (0, _defineProperty2.default)({}, key, getValue && getValue());
     });
-    currentValueRef.current = data;
     onValueChange(change, data);
   });
   var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig, type) {
@@ -141,8 +134,8 @@ var LdFormList = function LdFormList(_ref) {
       placement: luckTheme === 'base' && (affixLayout || defaultLayout) !== 'top' ? 'topRight' : 'bottomRight'
     }, bpmButtonProps)));
   };
-  (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _props$formData$mainF, _params, response, _yield$callBehavior, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+  useDeepCompareAsyncEffect( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -152,14 +145,13 @@ var LdFormList = function LdFormList(_ref) {
           }
           _params = {
             indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
-            mainDataSetKey: mainDataSetKey
-          }; // 请求是否有工作流服务
-          _context.next = 4;
-          return callBehavior({
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
+            mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
-          }, _params);
+          }; // 请求是否有工作流服务
+          _context.next = 4;
+          return (0, _services.readBehaviorCall)(_params);
         case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
@@ -167,15 +159,14 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return callBehavior({
-            moduleCode: rest.moduleCode,
-            datasetCode: mainDataSetKey,
+          return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
+            // bizKey: bizData.bizKey,
             behaviorKey: 'readBpm'
-          }, _params);
+          }));
         case 8:
-          _yield$callBehavior = _context.sent;
-          code = _yield$callBehavior.code;
-          data = _yield$callBehavior.data;
+          _yield$readBehaviorCa = _context.sent;
+          code = _yield$readBehaviorCa.code;
+          data = _yield$readBehaviorCa.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
             tempObj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.formData[mainFormLdId]), {}, {
@@ -243,11 +234,7 @@ var LdFormList = function LdFormList(_ref) {
     renderExtra: renderExtra
   });
   var formList = (0, _ahooks.useCreation)(function () {
-    var _list = renderFormList(formConfig);
-    return (0, _lodash.reduce)(_list, function (result, item) {
-      if (!item.serial || item.serialEffect === 'disable' || (0, _lodash.includes)(resources, item.serial)) result.push(item);
-      return result;
-    }, []);
+    return renderFormList(formConfig);
   }, [formConfig]);
   var formExtra = (0, _ahooks.useCreation)(function () {
     return renderFormExtra && (0, _lodash.isArray)(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
@@ -255,7 +242,7 @@ var LdFormList = function LdFormList(_ref) {
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
-  return formList.length > 0 ? /*#__PURE__*/_react.default.createElement(_FormList.FormList, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_FormList.FormList, (0, _extends2.default)({
     editFlow: true,
     formState: formState,
     formMode: formMode,
@@ -282,32 +269,30 @@ var LdFormList = function LdFormList(_ref) {
     var _o$props;
     return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
   }).map(function (formProps) {
-    var _formProps$type = formProps.type,
-      type = _formProps$type === void 0 ? 'auto' : _formProps$type;
-    if ((0, _lodash.includes)(['auto', 'writer', 'grid'], type)) {
+    if (formProps.dataSetKey) {
       var _ref8 = formProps || {},
         ldId = _ref8.id,
         _ref8$header = _ref8.header,
         header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
         title = _ref8.title,
-        selfReadOnly = _ref8.readOnly,
+        _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,
-        serial = _ref8.serial,
         _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;
-      var _readOnly = selfReadOnly || serial && !(0, _lodash.includes)(resources, serial);
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
         title: title || ldId,
-        extra: type === 'auto' && formProps.dataSetKey && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
+        extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-      }, formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -316,19 +301,18 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
-        },
-        setVerifyRules: setVerifyRules
+        }
       })));
       return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
         key: ldId
       }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
         title: title || ldId,
         id: ldId
-      }), type === 'auto' && formProps.dataSetKey && /*#__PURE__*/_react.default.createElement("div", {
+      }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -337,8 +321,7 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'), _renderTopLeft()];
-        },
-        setVerifyRules: setVerifyRules
+        }
       })));
     }
     return _utils.ChildrenUtil.deepMap(formProps, function (child) {
@@ -347,7 +330,7 @@ var LdFormList = function LdFormList(_ref) {
         mode: child.props.mode || 'tab'
       }) : child.props);
     })[0];
-  })) : null;
+  }));
 };
 
 // 构建带有model的组件

package/lib/components/LdGrid/index.js

@@ -20,7 +20,7 @@ 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", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable", "autoRowClick"],
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "uiSettings", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 var LdGrid = function LdGrid(_ref) {
   var columns = _ref.columns,
@@ -28,18 +28,18 @@ var LdGrid = function LdGrid(_ref) {
     actions = _ref.actions,
     doAction = _ref.doAction,
     afterInit = _ref.afterInit,
+    _ref$uiSettings = _ref.uiSettings,
+    uiSettings = _ref$uiSettings === void 0 ? {} : _ref$uiSettings,
     namespace = _ref.namespace,
     wrapperRef = _ref.wrapperRef,
     list = _ref.list,
     detail = _ref.detail,
     params = _ref.params,
     filters = _ref.filters,
-    _loading = _ref._loading,
     loading = _ref.loading,
     unclosableSet = _ref.unclosableSet,
     onQuery = _ref.onQuery,
     doQuery = _ref.doQuery,
-    pagination = _ref.pagination,
     current = _ref.pageno,
     pageSize = _ref.pagesize,
     total = _ref.totalCount,
@@ -53,8 +53,6 @@ var LdGrid = function LdGrid(_ref) {
     isFlow = _ref.isFlow,
     isTreeGrid = _ref.isTreeGrid,
     writable = _ref.writable,
-    _ref$autoRowClick = _ref.autoRowClick,
-    autoRowClick = _ref$autoRowClick === void 0 ? false : _ref$autoRowClick,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var gridRef = (0, _react.useRef)(null);
   var treeConfig = (0, _ahooks.useCreation)(function () {
@@ -75,19 +73,8 @@ var LdGrid = function LdGrid(_ref) {
   (0, _react.useEffect)(function () {
     readFilter && readFilter(params, filters);
   }, [params, filters]);
-  (0, _react.useEffect)(function () {
-    if (autoRowClick) {
-      if (list[0]) props.onRowClick && props.onRowClick(detail[list[0]], 0);else props.onRowClick && props.onRowClick(null);
-    }
-  }, [list[0]]);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, gridRef.current), {}, {
-      getProps: function getProps() {
-        var _getDvaApp;
-        return {
-          apiUrl: (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 || (_getDvaApp = _getDvaApp._store.getState()[namespace]) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.apiUrl
-        };
-      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
@@ -103,6 +90,7 @@ var LdGrid = function LdGrid(_ref) {
       });
     });
   }, [batchOperations]);
+  var gridPresetData = uiSettings && uiSettings.grid && uiSettings.grid[0] && uiSettings.grid[0].preset ? JSON.parse(uiSettings.grid[0].preset) : {};
 
   /**
    * 优先级
@@ -110,16 +98,11 @@ var LdGrid = function LdGrid(_ref) {
    * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = (0, _ahooks.useCreation)(function () {
-    if (columnsReset) {
-      if (_lodash.isFunction) {
-        return columnsReset(columns);
-      }
-      return columnsReset;
-    }
-    var _columnsRewrite = (0, _lodash.isFunction)(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
+    if (columnsReset) return columnsReset;
     var defaultColumns = (0, _lodash.keyBy)(columns, 'aliaName');
-    var customColumns = (0, _lodash.keyBy)(_columnsRewrite, 'field');
-    var mergeFields = (0, _lodash.union)((0, _lodash.keys)(customColumns), (0, _lodash.keys)(defaultColumns));
+    var customColumns = (0, _lodash.keyBy)(columnsRewrite, 'field');
+    var presetColumns = (0, _lodash.keyBy)(gridPresetData.gridPreset, 'field'); // ui配置的已排序的列
+    var mergeFields = (0, _lodash.union)((0, _lodash.keys)(presetColumns), (0, _lodash.keys)(defaultColumns), (0, _lodash.keys)(customColumns)); // 以UI配置的列排序
     return (0, _lodash.transform)(mergeFields, function (result, field) {
       var _customColumns$field;
       if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
@@ -127,9 +110,14 @@ var LdGrid = function LdGrid(_ref) {
       } else if (!defaultColumns[field]) {
         // 数据集中不存在的字段以自定义的形式展示
         result.push(customColumns[field]);
-      } else if (defaultColumns[field].isShowInGrid)
+      } else if (defaultColumns[field].isShowInGrid) {
+        // 该字段配置的表单显示信息
+        var columnUiData = gridPresetData.gridPreset ? gridPresetData.gridPreset.find(function (c) {
+          return c.field === field;
+        }) : {};
         // 数据集中存在的字段和自定义结合展示
-        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
+        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable, columnUiData));
+      }
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = (0, _ahooks.useCreation)(function () {
@@ -155,21 +143,18 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
-
-  // console.log('_columns',columns,_columns)
-
   return /*#__PURE__*/_react.default.createElement(_List.GridList, (0, _extends2.default)({
     columns: _columns
     // 资源串、行为配置
     ,
     actionsColumn: _actionsColumn,
     batchOperations: _batchOperations,
-    loading: _loading || loading,
-    pagination: isFlow ? false : (0, _objectSpread2.default)({
+    loading: loading,
+    pagination: isFlow ? false : {
       total: total,
       current: current,
       pageSize: pageSize
-    }, pagination),
+    },
     dataSource: formatDataSource(list, detail),
     resultSet: _resultSet,
     gridId: namespace,
@@ -195,16 +180,16 @@ var LdIndex = function LdIndex(_ref2) {
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   var isTreeGrid = (0, _lodash.isNil)(_isTreeGrid) ? (0, _lodash.includes)(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = (0, _ahooks.useCreation)(function () {
-    var _getDvaApp2, _getDvaApp3;
-    (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
-    if (!((_getDvaApp3 = (0, _umi.getDvaApp)()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
-      var _getDvaApp4;
-      (_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
+    var _getDvaApp, _getDvaApp2;
+    (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
+    if (!((_getDvaApp2 = (0, _umi.getDvaApp)()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
+      var _getDvaApp3;
+      (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        isFlow: isTreeGrid || !!props.isFlow
       }, overModel), {}, {
-        isFlow: isTreeGrid || !!props.isFlow,
-        moduleCode: moduleCode,
         dataSetKey: props.dataSetKey,
+        moduleCode: moduleCode,
+        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid',
         afterQuery: afterQuery
       })));
     }
@@ -212,7 +197,7 @@ var LdIndex = function LdIndex(_ref2) {
       suppressInit: suppressInit,
       afterInit: props.afterInit
     });
-  }, [namespace, props.dataSetKey]);
+  }, [namespace]);
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     isTreeGrid: isTreeGrid,
     namespace: namespace
@@ -231,14 +216,6 @@ Index.propTypes = {
   _propTypes.default.shape({
     field: _propTypes.default.string.isRequired
   })),
-  pagination: _propTypes.default.shape({
-    pageSize: _propTypes.default.number,
-    pageSizeOptions: _propTypes.default.arrayOf(_propTypes.default.string),
-    showSizeChanger: _propTypes.default.bool,
-    showQuickJumper: _propTypes.default.bool,
-    hideOnSinglePage: _propTypes.default.bool,
-    simple: _propTypes.default.bool
-  }),
   batchOperations: _propTypes.default.array,
   // 批量操作元素
   formatDataSource: _propTypes.default.func,

package/lib/components/LdGridForm/index.js

@@ -19,7 +19,7 @@ var _utils = require("../../utils");
 var _form = require("../../helper/form");
 var _Builder = require("../Builder");
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "uiSettings", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -29,11 +29,12 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     actions = _ref$actions === void 0 ? {} : _ref$actions,
     _ref$doAction = _ref.doAction,
     doAction = _ref$doAction === void 0 ? function () {} : _ref$doAction,
+    _ref$uiSettings = _ref.uiSettings,
+    uiSettings = _ref$uiSettings === void 0 ? {} : _ref$uiSettings,
     ldId = _ref.ldId,
     dataSetKey = _ref.dataSetKey,
     _ref$columnsRewrite = _ref.columnsRewrite,
     columnsRewrite = _ref$columnsRewrite === void 0 ? [] : _ref$columnsRewrite,
-    columnsReset = _ref.columnsReset,
     _ref$onQuery = _ref.onQuery,
     onQuery = _ref$onQuery === void 0 ? {} : _ref$onQuery,
     _ref$onAdd = _ref.onAdd,
@@ -59,12 +60,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     className = _ref.className,
     formRef = _ref.formRef,
     formMode = _ref.formMode,
-    fields = _ref.fields,
-    setVerifyRules = _ref.setVerifyRules,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/(0, _react.createRef)({});
+  var defaultValues = /*#__PURE__*/(0, _react.createRef)();
   var isMain = ldId === mainFormLdId;
   var gridColumns = columns.map(function (col) {
     if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
@@ -72,15 +71,12 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     });
     return col;
   });
+  var gridPresetData = uiSettings && uiSettings.grid && uiSettings.grid[0] && uiSettings.grid[0].preset ? JSON.parse(uiSettings.grid[0].preset) : {};
+  var mergedArray = (0, _utils.mergeAndSort)(gridColumns, gridPresetData.gridPreset || [], 'field');
   var _columns = function () {
-    var fieldsObj = (0, _lodash.keyBy)(fields, 'field');
-    var columnsObj = (0, _lodash.keyBy)(gridColumns, 'field');
-    var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
-    var _nodes = (0, _lodash.reduce)(keys, function (result, key) {
-      var setting = fieldsObj[key];
-      var col = columnsObj[key];
-      if (col !== null && col !== void 0 && col.isShowInForm) {
+    var _nodes = (0, _lodash.transform)(mergedArray, function (result, col) {
+      if (col.isShowInForm) {
         var _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.aliaName;
@@ -90,24 +86,21 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           mode: 'grid'
         });
         _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        var newCol = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
-          setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
-        });
-        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
-        result.push((0, _utils.getFormColumn)(type, newCol, (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _lodash.pick)(setting, defaultSet)), customColumn), {}, {
+        // 该字段配置的表单显示信息
+        var columnUiData = gridPresetData.gridPreset ? gridPresetData.gridPreset.find(function (c) {
+          return c.field === col.field;
+        }) : {};
+        result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
           formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
             formRef: formRef,
-            formMode: formMode,
-            setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field']))
+            formMode: formMode
           })
-        })));
+        }), columnUiData));
       }
-      return result;
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps && setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (col) {
+    setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (col) {
       var node = col.renderBasicFormItem();
       var renderBasicFormItem = node === null || node === void 0 ? void 0 : node.props;
       return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
@@ -116,11 +109,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         }, renderBasicFormItem)
       });
     })));
-    return columnsReset ? columnsReset(_nodes) : _nodes;
+    return _nodes;
   }();
-  var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
-    return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
-  }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
+  var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {
     formId: ldId,
     columns: _columns,
@@ -160,10 +151,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     orderByAdd: "asc",
     rowSelection: true,
     type: type,
-    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno',
-    wrapperProps: {
-      id: ldId
-    }
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
   }, props, {
     onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: _utils.behaviorCall,
@@ -180,9 +168,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, onQuery), {}, {
       format: function format(data) {
         var formItemData = data.map(function (item) {
-          return (0, _utils.formItemDataFormat)(gridColumns.map(function (c) {
-            return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
-          }), item);
+          return (0, _utils.formItemDataFormat)(gridColumns, item);
         });
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
         return formItemData;

package/lib/components/LdRuntimeCom/index.js

@@ -1,31 +1,23 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var Babel = _interopRequireWildcard(require("@babel/standalone"));
 var LuckAntd = _interopRequireWildcard(require("luck-design/antd"));
 var LuckDesign = _interopRequireWildcard(require("luck-design"));
-var _lodash = _interopRequireWildcard(require("lodash"));
-var Lodash = _lodash;
-var ahooks = _interopRequireWildcard(require("ahooks"));
-var _excluded = ["children"];
 /**
  * 实时代码渲染组件
  * todo：沙箱上下文的集成
  * todo：Loading效果的优化
  */
 var LdRuntimeCom = function LdRuntimeCom(_ref) {
-  var children = _ref.children,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var children = _ref.children;
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     Component = _useState2[0],
@@ -38,25 +30,20 @@ var LdRuntimeCom = function LdRuntimeCom(_ref) {
         presets: ['react']
       }).code;
 
+      // 输出编译后的代码用于排错
+      console.log('transformedCode', transformedCode);
+
       // 自动
       var functionNameMatch = transformedCode.match(/function\s+([^\s(]+)/);
       if (functionNameMatch && functionNameMatch.length > 1) {
         var functionName = functionNameMatch[1];
-        var argsName = (0, _lodash.keys)(rest);
-        var _args = argsName.map(function (n) {
-          return rest[n];
-        });
-        var execute = (0, _construct2.default)(Function, ['React', 'LuckAntd', 'LuckDesign', 'libs'].concat((0, _toConsumableArray2.default)(argsName), ["".concat(transformedCode, "; return ").concat(functionName, ";")]));
+        var execute = new Function('React', 'LuckAntd', 'LuckDesign', "".concat(transformedCode, "; return ").concat(functionName, ";"));
         // 设置组件状态
-        var ReactComponent = execute.apply(void 0, [_react.default, LuckAntd, LuckDesign, {
-          Lodash: Lodash,
-          ahooks: ahooks
-        }].concat((0, _toConsumableArray2.default)(_args)));
+        var ReactComponent = execute(_react.default, LuckAntd, LuckDesign);
         setComponent( /*#__PURE__*/_react.default.createElement(ReactComponent, null));
       }
     }
   }, [code]);
-  if (code === '') return null;
-  return Component ? Component : 'JSX Component';
+  return Component ? Component : /*#__PURE__*/_react.default.createElement("div", null, "Loading...");
 };
 var _default = exports.default = LdRuntimeCom;