@luck-design-biz/luckda 0.0.25 → 0.0.26-2

package/es/lowcode/view/lc-components/Wrapper.js

@@ -1,8 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { useEffect } from 'react';
-import { useLatest, useCreation } from 'ahooks';
+import React, { useEffect, useRef } from 'react';
 import { useLDContext } from "../../engine/provider/ContextProvider";
-import { findNodeAndParent, getPathNodesById } from "../../engine/tools/dataProcess";
+import { findNodeAndParent } from "../../engine/tools/dataProcess";
 import { CELL_CLASS_NAME } from "../../constants";
 var LCWrapper = function LCWrapper(_ref) {
   var id = _ref.id,
@@ -10,40 +9,32 @@ var LCWrapper = function LCWrapper(_ref) {
     getTargetDom = _ref.getTargetDom,
     api = _ref.api;
   var context = useLDContext();
-  var _pageData = useLatest(context.pageData);
-  var _api = useCreation(function () {
-    return {
-      getSelfAndParentLCData: function getSelfAndParentLCData() {
-        return findNodeAndParent(id, _pageData.current);
-      },
-      getLevelNodes: function getLevelNodes() {
-        return getPathNodesById(_pageData.current, id);
-      }
-    };
-  }, []);
+  var _apiRef = useRef({
+    getSelfAndParentLCData: function getSelfAndParentLCData() {
+      return findNodeAndParent(id, context.pageData);
+    }
+  });
   useEffect(function () {
-    setTimeout(function () {
-      var dom = getTargetDom();
-      if (dom) {
-        dom.setAttribute('id', id);
-        dom.classList.add(CELL_CLASS_NAME);
-      }
-      context._register(id, new Proxy({
-        dom: dom
-      }, {
-        get: function get(target, property, receiver) {
-          if (property === 'api') {
-            return api ? _objectSpread(_objectSpread({}, _api), api.current) : _api;
-          }
-          return Reflect.get(target, property, receiver);
+    var dom = getTargetDom();
+    if (dom) {
+      dom.setAttribute('id', id);
+      dom.classList.add(CELL_CLASS_NAME);
+    }
+    context.register(id, new Proxy({
+      dom: dom
+    }, {
+      get: function get(target, property, receiver) {
+        if (property === 'api') {
+          return api ? _objectSpread(_objectSpread({}, _apiRef.current), api.current) : _apiRef.current;
         }
-      }));
-      context.$publisher(context.topics.COMPONENT_MOUNT, {
-        id: id
-      });
+        return Reflect.get(target, property, receiver);
+      }
+    }));
+    context.$publisher(context.topics.COMPONENT_MOUNT, {
+      id: id
     });
     return function () {
-      context._unregister(id);
+      context.unregister(id);
       context.$publisher(context.topics.COMPONENT_UNMOUNT, {
         id: id
       });

package/es/lowcode/view/style/page.less

@@ -2,4 +2,5 @@
   position: relative;
   width: 100%;
   height: 100%;
+  overflow: hidden;
 }

package/es/services.js

@@ -20,15 +20,32 @@ function _readModlue() {
   }));
   return _readModlue.apply(this, arguments);
 }
-export function readBehaviorCall(_x2, _x3) {
-  return _readBehaviorCall.apply(this, arguments);
+export function readUI(_x2) {
+  return _readUI.apply(this, arguments);
 }
-function _readBehaviorCall() {
-  _readBehaviorCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(get, post) {
+function _readUI() {
+  _readUI = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(get) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", request("".concat(api.LUCKDA_HOST, "/to/behavior/call?").concat(stringify(get)), {
+          return _context2.abrupt("return", request("".concat(api.LUCKDA_HOST, "/ui/builder/noAuthFetchModuleDataSetUI?").concat(stringify(get))));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _readUI.apply(this, arguments);
+}
+export function readBehaviorCall(_x3, _x4) {
+  return _readBehaviorCall.apply(this, arguments);
+}
+function _readBehaviorCall() {
+  _readBehaviorCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(get, post) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", request("".concat(api.LUCKDA_HOST, "/to/behavior/call?").concat(stringify(get)), {
             method: 'POST',
             body: post,
             headers: {
@@ -37,9 +54,9 @@ function _readBehaviorCall() {
           }));
         case 1:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _readBehaviorCall.apply(this, arguments);
 }

package/es/upload/Form/gridForm.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
+var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "supportTypes", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
 import React, { useState, useRef, forwardRef } from 'react';
 import { getDvaApp } from 'umi';
 import { useMemoizedFn, useCreation } from 'ahooks';
@@ -55,6 +55,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     operates = _ref$operates === void 0 ? ['read', 'add', 'delete', 'download'] : _ref$operates,
     loading = _ref.loading,
     uploadUrl = _ref.uploadUrl,
+    supportTypes = _ref.supportTypes,
     _ref$forbiddenTypes = _ref.forbiddenTypes,
     forbiddenTypes = _ref$forbiddenTypes === void 0 ? [] : _ref$forbiddenTypes,
     _beforeUpload = _ref.beforeUpload,
@@ -78,8 +79,8 @@ var UploadGridForm = function UploadGridForm(_ref) {
   var _getDvaApp$_store$get = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
   var supportUploadTypes = useCreation(function () {
-    return getSupportUploadTypes(forbiddenTypes);
-  }, [forbiddenTypes]);
+    return getSupportUploadTypes(forbiddenTypes, supportTypes);
+  }, [forbiddenTypes, supportTypes]);
 
   // 下载
   var downloadFile = function downloadFile(filenames, tag) {
@@ -372,7 +373,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
       directory: false,
       num: 99,
       multiple: true,
-      autoUpload: false,
       beforeUpload: function beforeUpload(file, fileList) {
         return _beforeUpload2({
           file: file,

package/es/upload/FormItem/index.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "forbiddenTypes", "children", "dataFormat", "listType"];
+var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "supportTypes", "forbiddenTypes", "children", "dataFormat", "listType"];
 import React from 'react';
 import { BasicFormItem } from 'luck-design';
 import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes } from '@luck-design-biz/base/utils';
@@ -35,6 +35,7 @@ function buildComponent(props) {
     note = _props$note === void 0 ? '' : _props$note,
     _props$config = props.config,
     config = _props$config === void 0 ? {} : _props$config,
+    supportTypes = props.supportTypes,
     forbiddenTypes = props.forbiddenTypes,
     children = props.children,
     dataFormat = props.dataFormat,
@@ -44,8 +45,8 @@ function buildComponent(props) {
     return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
   var supportUploadTypes = useCreation(function () {
-    return getSupportUploadTypes(forbiddenTypes);
-  }, [forbiddenTypes]);
+    return getSupportUploadTypes(forbiddenTypes, supportTypes);
+  }, [forbiddenTypes, supportTypes]);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
     extra: "".concat(formatMessage({
       id: 'app.upload.supportUpload',

package/es/utils/form.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -22,6 +23,7 @@ import * as formItemUtils from "../helper/FromItems";
  * 根据动态表单配置项生成formItem
  * @param {动态表单配置项} props
  * @param {自定义动态表单配置项} customProps
+ * @param {formUi配置项} formUiPreset
  * @returns <BasicForm name='' ... />
  */
 export function getFormItem() {
@@ -30,9 +32,10 @@ export function getFormItem() {
     property = _ref.property,
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var formUiPreset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
   if (property === 'sint' || property === 'number') props.opt_decimal = 0;
-  var _translator = translator(props),
+  var _translator = translator(_objectSpread(_objectSpread({}, props), formUiPreset)),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(
@@ -40,6 +43,7 @@ export function getFormItem() {
     translateProps, formatCustomProps(customProps)),
     type = _merge.type,
     _props = _objectWithoutProperties(_merge, _excluded3);
+  console.log('getFormItem', translateProps, _props);
   if (customProps.renderBasicFormItem) {
     var com = customProps.renderBasicFormItem(_props);
     var comProps = merge(_props, com.props);
@@ -189,8 +193,12 @@ export var dataFormat = function dataFormat() {
 /**
  *
  * @param formType
+ * @param comName
+ * @param property
  * @param props
+ * @param formItemRewrite
  * @param customProps
+ * @param gridUiPreset
  * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
 export var getFormColumn = function getFormColumn() {
@@ -203,9 +211,10 @@ export var getFormColumn = function getFormColumn() {
   var _ref5 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     formItemRewrite = _ref5.formItemRewrite,
     customProps = _objectWithoutProperties(_ref5, _excluded7);
+  var gridUiPreset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var formItemType = comName || defaultComName[property];
   if (formItemType === 'radio') formItemType = 'select';
-  var _translator2 = translator(props),
+  var _translator2 = translator(_objectSpread(_objectSpread({}, props), gridUiPreset)),
     name = _translator2.name,
     translateProps = _objectWithoutProperties(_translator2, _excluded8);
   var _merge2 = merge(
@@ -216,7 +225,7 @@ export var getFormColumn = function getFormColumn() {
     _props = _objectWithoutProperties(_merge2, _excluded9);
   var columnRender = getColumnRender(name, formItemType, _props);
   if (formType !== 'writer') _props.name = name;
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({}, _props), {}, {
     title: translateProps.label,
     editable: formType === 'writer' && {
       required: _props.required || ((_props$config = _props.config) === null || _props$config === void 0 ? void 0 : _props$config.required)
@@ -245,4 +254,29 @@ export var getFormColumn = function getFormColumn() {
     },
     field: name
   });
+};
+
+/**
+ * 合并两个数组，并且数据顺序以arr2为准
+ * @param arr1
+ * @param arr2
+ * @param rowKey
+ */
+export var mergeAndSort = function mergeAndSort(arr1, arr2, rowKey) {
+  // 将a2转换为一个Map，便于快速查找
+  var a2Map = new Map(arr2.map(function (item) {
+    return [item[rowKey], item];
+  }));
+  // 创建一个新的数组，按a2的顺序填充元素，同时包含a1中不在a2中的元素
+  var mergedArray = arr2.map(function (item) {
+    var a1Item = arr1.find(function (a1) {
+      return a1[rowKey] === item[rowKey];
+    });
+    return a1Item ? _objectSpread(_objectSpread({}, item), a1Item) : item;
+  });
+  // 将a1中未出现在a2中的元素追加到合并后的数组末尾
+  mergedArray.push.apply(mergedArray, _toConsumableArray(arr1.filter(function (a1Item) {
+    return !a2Map.has(a1Item[rowKey]);
+  })));
+  return mergedArray;
 };

package/es/utils/grid.js

@@ -6,7 +6,7 @@ var _excluded = ["comName", "property"],
   _excluded3 = ["filter", "filterParams"];
 import React from 'react';
 import { getDvaApp } from 'umi';
-import { merge, isNil, isArray, includes, capitalize, isString } from 'lodash';
+import { merge, isNil, isArray, includes, capitalize } from 'lodash';
 import { Switch, Tag } from 'luck-design/antd';
 import moment from 'moment';
 import UploadGridCell from "../upload/GridCell";
@@ -69,9 +69,9 @@ export function getColumnRender(name, type) {
       break;
     case 'region':
       render = function render(text, record) {
-        return record["".concat(name, "_virtual")] || (text ? (isString(text) ? JSON.parse(text) : text).map(function (i) {
+        return record["".concat(name, "_virtual")] || text ? text.map(function (i) {
           return i.name;
-        }).join('/') : undefined);
+        }).join('/') : undefined;
       };
       break;
     case 'upload':
@@ -115,11 +115,12 @@ export var getGridColumn = function getGridColumn() {
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
   var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var gridUiPreset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var _props$isVirtual = props.isVirtual,
     isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual,
     _props$extra = props.extra,
     extra = _props$extra === void 0 ? {} : _props$extra;
-  var _translator = translator(props),
+  var _translator = translator(_objectSpread(_objectSpread({}, props), gridUiPreset)),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(translateProps, formatCustomProps(customProps)),
@@ -127,11 +128,12 @@ export var getGridColumn = function getGridColumn() {
     filterParams = _merge.filterParams,
     _props = _objectWithoutProperties(_merge, _excluded3);
   var _extra = JSON.parse(extra) || {};
-  var data = _objectSpread(_objectSpread({}, _props), {}, {
+  var data = _objectSpread(_objectSpread({
+    headerAlign: getAlign(_extra, 'sheading_alignment_virtual'),
+    align: getAlign(_extra, 'scell_alignment_virtual')
+  }, _props), {}, {
     field: name,
     title: _props.label,
-    headerAlign: getAlign(_extra, 'sheading_alignment_virtual'),
-    align: getAlign(_extra, 'scell_alignment_virtual'),
     render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
   });
   if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || defaultComName[property])) data.sortable = false;

package/lib/components/Builder/index.js

@@ -36,21 +36,28 @@ var builder = function builder(WrappedComponent, moduleCode) {
     var _useRequest = (0, _ahooks.useRequest)(_services.readModlue, {
         defaultParams: [{
           moduleCode: moduleCode
-        }],
-        onSuccess: function onSuccess(res) {
-          var code = res.code,
-            data = res.data;
-          if (code === 1) {
-            setModuleData({
-              actions: data.actions || {},
-              dataSets: data.dataSets || {},
-              isTree: data.isTree || [],
-              resources: data.resources || []
-            });
-          }
-        }
+        }]
       }),
-      loading = _useRequest.loading;
+      loading1 = _useRequest.loading,
+      moduleResult = _useRequest.data;
+    var _useRequest2 = (0, _ahooks.useRequest)(_services.readUI, {
+        defaultParams: [{
+          moduleCode: moduleCode
+        }]
+      }),
+      loading2 = _useRequest2.loading,
+      uiResult = _useRequest2.data;
+    (0, _react.useEffect)(function () {
+      if (!loading1 && !loading2 && (moduleResult === null || moduleResult === void 0 ? void 0 : moduleResult.code) === 1 && (uiResult === null || uiResult === void 0 ? void 0 : uiResult.code) === 1) {
+        setModuleData({
+          actions: moduleResult.data.actions || {},
+          dataSets: moduleResult.data.dataSets || {},
+          isTree: moduleResult.data.isTree || [],
+          resources: moduleResult.data.resources || [],
+          moduleUiList: uiResult.data.moduleUiList || {}
+        });
+      }
+    }, [loading1, loading2, moduleResult, uiResult]);
     var openPop = (0, _ahooks.useMemoizedFn)(function (ldId, params) {
       setPops(function (prev) {
         return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, prev), {}, (0, _defineProperty2.default)({}, ldId, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, prev[ldId]), params)));
@@ -100,7 +107,7 @@ var builder = function builder(WrappedComponent, moduleCode) {
       var _props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       fieldProps.current = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, fieldProps.current), _props);
     };
-    if (loading) return null;
+    if (loading1 || loading2) return null;
     if (!moduleData) return (0, _utils.formatMessage)({
       id: 'luckda.module.loadFailed',
       label: '模块信息加载失败'

package/lib/components/LdAutoForm/index.js

@@ -16,7 +16,7 @@ var _FormList = require("@luck-design-biz/base/FormList");
 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 _excluded = ["columns", "resources", "actions", "doAction", "uiSettings", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -26,6 +26,8 @@ var buildLdAutoForm = function buildLdAutoForm(_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$filedsRewrite = _ref.filedsRewrite,
@@ -54,14 +56,21 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     setFieldProps = _ref2.setFieldProps;
   var defaultValues = /*#__PURE__*/(0, _react.createRef)();
   var isMain = ldId === mainFormLdId;
+  var formPreset = uiSettings && uiSettings.form && uiSettings.form[0] && uiSettings.form[0].preset ? JSON.parse(uiSettings.form[0].preset) : {};
+  var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'field');
   var basicItems = function () {
     var _defaultValues = {};
-    var _nodes = (0, _lodash.transform)(columns, function (result, col) {
+    var _nodes = (0, _lodash.transform)(mergedArray, function (result, col) {
       if (col.isShowInForm) {
         var customFiled = filedsRewrite.find(function (field) {
           return field.name === col.aliaName;
         }) || {};
         _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
+
+        // 该字段配置的表单显示信息
+        var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
+          return c.field === col.field;
+        }) : {};
         result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
           moduleCode: moduleCode
@@ -69,7 +78,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           handleValueChange: function handleValueChange(value) {
             return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
           }
-        })));
+        }), colUiData));
       }
     }, []);
     defaultValues.current = _defaultValues;
@@ -83,7 +92,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
+    defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current)),
+    col: formPreset.formCol
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};

package/lib/components/LdFormList/index.js

@@ -18,6 +18,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 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");
@@ -36,6 +37,8 @@ var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading"
   _excluded2 = ["dataSets", "doAction", "resources"],
   _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;
@@ -131,7 +134,7 @@ 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() {
+  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) {
@@ -157,6 +160,7 @@ var LdFormList = function LdFormList(_ref) {
           }
           _context.next = 8;
           return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
+            // bizKey: bizData.bizKey,
             behaviorKey: 'readBpm'
           }));
         case 8:

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", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
+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,6 +28,8 @@ 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,
@@ -38,7 +40,6 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet = _ref.unclosableSet,
     onQuery = _ref.onQuery,
     doQuery = _ref.doQuery,
-    pagination = _ref.pagination,
     current = _ref.pageno,
     pageSize = _ref.pagesize,
     total = _ref.totalCount,
@@ -89,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) : {};
 
   /**
    * 优先级
@@ -96,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)(defaultColumns), (0, _lodash.keys)(customColumns));
+    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) {
@@ -113,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 () {
@@ -141,9 +143,6 @@ 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
     // 资源串、行为配置
@@ -151,11 +150,11 @@ var LdGrid = function LdGrid(_ref) {
     actionsColumn: _actionsColumn,
     batchOperations: _batchOperations,
     loading: loading,
-    pagination: isFlow ? false : (0, _objectSpread2.default)({
+    pagination: isFlow ? false : {
       total: total,
       current: current,
       pageSize: pageSize
-    }, pagination),
+    },
     dataSource: formatDataSource(list, detail),
     resultSet: _resultSet,
     gridId: namespace,
@@ -217,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,