@luck-design-biz/luckda 0.0.24-2 → 0.0.24-3

package/es/components/Builder/index.js

@@ -2,16 +2,16 @@ 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 React, { forwardRef, createContext, useState, useRef } from 'react';
+import React, { createContext, useState, useRef, useEffect } from 'react';
 import { useRequest, useSetState, useMemoizedFn } from 'ahooks';
 import { BasicForm, BasicFormItem } from 'luck-design';
 import LdPop from "../LdPop";
-import { readModlue } from "../../services";
+import { readModlue, readUI } from "../../services";
 import { doAction as doActionUtils } from "../../helper/action";
 import { formatMessage } from '@luck-design-biz/base/utils';
 var LuckDaContext = /*#__PURE__*/createContext();
 var builder = function builder(WrappedComponent, moduleCode) {
-  var Component = /*#__PURE__*/forwardRef(function (props, ref) {
+  var Component = function Component(props) {
     if (!moduleCode) return formatMessage({
       id: 'luckda.paramMiss.moduleCode',
       label: '缺少模块Key'
@@ -28,21 +28,28 @@ var builder = function builder(WrappedComponent, moduleCode) {
     var _useRequest = useRequest(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 = useRequest(readUI, {
+        defaultParams: [{
+          moduleCode: moduleCode
+        }]
+      }),
+      loading2 = _useRequest2.loading,
+      uiResult = _useRequest2.data;
+    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 = useMemoizedFn(function (ldId, params) {
       setPops(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, ldId, _objectSpread(_objectSpread({}, prev[ldId]), params)));
@@ -92,7 +99,7 @@ var builder = function builder(WrappedComponent, moduleCode) {
       var _props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       fieldProps.current = _objectSpread(_objectSpread({}, fieldProps.current), _props);
     };
-    if (loading) return null;
+    if (loading1 || loading2) return null;
     if (!moduleData) return formatMessage({
       id: 'luckda.module.loadFailed',
       label: '模块信息加载失败'
@@ -110,9 +117,7 @@ var builder = function builder(WrappedComponent, moduleCode) {
         setFieldProps: setFieldProps,
         moduleCode: moduleCode
       })
-    }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({
-      ref: ref
-    }, moduleData || {}, {
+    }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, moduleData || {}, {
       doAction: doAction,
       openPop: openPop,
       closePop: closePop
@@ -128,7 +133,7 @@ var builder = function builder(WrappedComponent, moduleCode) {
         }, pops[ldId])
       });
     }));
-  });
+  };
   return Component;
 };
 export default builder;

package/es/components/LdAutoForm/index.js

@@ -2,12 +2,12 @@ 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 _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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"];
 import React, { createRef, useContext } from 'react';
 import { transform } from 'lodash';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from "../../helper/ldBuilder";
-import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
+import { getFormItem, formItemDataFormat, dataFormat, behaviorCall, mergeAndSort } from "../../utils";
 import { LuckDaContext } from "../Builder";
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
@@ -18,6 +18,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,
@@ -46,14 +48,21 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     setFieldProps = _ref2.setFieldProps;
   var defaultValues = /*#__PURE__*/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 = mergeAndSort(columns, formPreset.formFieldPreset || [], 'field');
   var basicItems = function () {
     var _defaultValues = {};
-    var _nodes = transform(columns, function (result, col) {
+    var _nodes = transform(mergedArray, function (result, col) {
       if (col.isShowInForm) {
         var customFiled = filedsRewrite.find(function (field) {
           return field.name === col.aliaName;
         }) || {};
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, 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(getFormItem(col, _objectSpread(_objectSpread({
           formId: ldId,
           moduleCode: moduleCode
@@ -61,7 +70,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           handleValueChange: function handleValueChange(value) {
             return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliaName, value)));
           }
-        })));
+        }), colUiData));
       }
     }, []);
     defaultValues.current = _defaultValues;
@@ -75,7 +84,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
+    defaultDataSource: _objectSpread(_objectSpread({}, 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/es/components/LdFormList/index.js

@@ -14,6 +14,7 @@ import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, u
 import { connect, getDvaApp, useRouteMatch, useModel } from 'umi';
 import PropTypes from 'prop-types';
 import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
+import { createDeepCompareEffect } from 'ahooks/es/createDeepCompareEffect';
 import { BasicDivider } from 'luck-design';
 import { ChildrenUtil } from '@luck-design-biz/base/utils';
 import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
@@ -28,6 +29,7 @@ import { isArray, sortBy, mapValues } from 'lodash';
 import { BpmButton } from '@luck-design-biz/bpm';
 import { readBehaviorCall } from "../../services";
 import { parse, stringify } from 'querystring';
+var useDeepCompareAsyncEffect = createDeepCompareEffect(useAsyncEffect);
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -124,7 +126,7 @@ var LdFormList = function LdFormList(_ref) {
       placement: luckTheme === 'base' && (affixLayout || defaultLayout) !== 'top' ? 'topRight' : 'bottomRight'
     }, bpmButtonProps)));
   };
-  useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  useDeepCompareAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -150,6 +152,7 @@ var LdFormList = function LdFormList(_ref) {
           }
           _context.next = 8;
           return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
+            // bizKey: bizData.bizKey,
             behaviorKey: 'readBpm'
           }));
         case 8:

package/es/components/LdGrid/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "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"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
@@ -20,6 +20,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,
@@ -30,7 +32,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,
@@ -81,6 +82,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) : {};
 
   /**
    * 优先级
@@ -91,7 +93,8 @@ var LdGrid = function LdGrid(_ref) {
     if (columnsReset) return columnsReset;
     var defaultColumns = keyBy(columns, 'aliaName');
     var customColumns = keyBy(columnsRewrite, 'field');
-    var mergeFields = union(keys(defaultColumns), keys(customColumns));
+    var presetColumns = keyBy(gridPresetData.gridPreset, 'field'); // ui配置的已排序的列
+    var mergeFields = union(keys(presetColumns), keys(defaultColumns), keys(customColumns)); // 以UI配置的列排序
     return transform(mergeFields, function (result, field) {
       var _customColumns$field;
       if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
@@ -99,9 +102,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(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
+        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable, columnUiData));
+      }
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = useCreation(function () {
@@ -127,9 +135,6 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
-
-  // console.log('_columns',columns,_columns)
-
   return /*#__PURE__*/React.createElement(GridList, _extends({
     columns: _columns
     // 资源串、行为配置
@@ -137,11 +142,11 @@ var LdGrid = function LdGrid(_ref) {
     actionsColumn: _actionsColumn,
     batchOperations: _batchOperations,
     loading: loading,
-    pagination: isFlow ? false : _objectSpread({
+    pagination: isFlow ? false : {
       total: total,
       current: current,
       pageSize: pageSize
-    }, pagination),
+    },
     dataSource: formatDataSource(list, detail),
     resultSet: _resultSet,
     gridId: namespace,
@@ -203,14 +208,6 @@ Index.propTypes = {
   PropTypes.shape({
     field: PropTypes.string.isRequired
   })),
-  pagination: PropTypes.shape({
-    pageSize: PropTypes.number,
-    pageSizeOptions: PropTypes.arrayOf(PropTypes.string),
-    showSizeChanger: PropTypes.bool,
-    showQuickJumper: PropTypes.bool,
-    hideOnSinglePage: PropTypes.bool,
-    simple: PropTypes.bool
-  }),
   batchOperations: PropTypes.array,
   // 批量操作元素
   formatDataSource: PropTypes.func,

package/es/components/LdGridForm/index.js

@@ -2,13 +2,13 @@ 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 _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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 _excluded = ["columns", "resources", "actions", "doAction", "uiSettings", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
 import React, { createRef, useContext } from 'react';
 import { transform } from 'lodash';
 import classNames from 'classnames';
 import ldBuilder from "../../helper/ldBuilder";
 import { GridForm } from '@luck-design-biz/base/FormList';
-import { getFormColumn, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
+import { getFormColumn, formItemDataFormat, dataFormat, behaviorCall, mergeAndSort } from "../../utils";
 import { defaultComName } from "../../helper/form";
 import { LuckDaContext } from "../Builder";
 import styles from "./index.less";
@@ -21,6 +21,8 @@ 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,
@@ -61,9 +63,11 @@ 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 = mergeAndSort(gridColumns, gridPresetData.gridPreset || [], 'field');
   var _columns = function () {
     var _defaultValues = {};
-    var _nodes = transform(gridColumns, function (result, col) {
+    var _nodes = transform(mergedArray, function (result, col) {
       if (col.isShowInForm) {
         var _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
@@ -74,13 +78,17 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           mode: 'grid'
         });
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
+        // 该字段配置的表单显示信息
+        var columnUiData = gridPresetData.gridPreset ? gridPresetData.gridPreset.find(function (c) {
+          return c.field === col.field;
+        }) : {};
         result.push(getFormColumn(type, col, _objectSpread(_objectSpread({}, customColumn), {}, {
           formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
             formRef: formRef,
             formMode: formMode
           })
-        })));
+        }), columnUiData));
       }
     }, []);
     defaultValues.current = _defaultValues;

package/es/helper/form.js

@@ -62,9 +62,15 @@ export function translator() {
     label: allConfig.fieldName,
     config: {
       required: !!allConfig.isNotNull,
-      disabled: !!allConfig.isReadOnly
+      disabled: !!allConfig.isReadOnly,
+      placeholder: allConfig.placeholder,
+      rows: allConfig.rows
     },
-    layout: 'block'
+    layout: 'block',
+    align: allConfig.align,
+    headerAlign: allConfig.headerAlign,
+    width: allConfig.width,
+    tip: allConfig.tip
   };
   if (!isNil(allConfig['dataFormat'])) _props.dataFormat = allConfig['dataFormat'];
   // if (allConfig.tip) _props.config.placeholder = allConfig.tip;

package/es/helper/ldBuilder.js

@@ -11,6 +11,8 @@ var builder = function builder(wrapped) {
       actions = _ref.actions,
       _ref$dataSets = _ref.dataSets,
       dataSets = _ref$dataSets === void 0 ? [] : _ref$dataSets,
+      _ref$moduleUiList = _ref.moduleUiList,
+      moduleUiList = _ref$moduleUiList === void 0 ? {} : _ref$moduleUiList,
       _ref$isTree = _ref.isTree,
       isTree = _ref$isTree === void 0 ? [] : _ref$isTree,
       doAction = _ref.doAction,
@@ -38,7 +40,8 @@ var builder = function builder(wrapped) {
       resources: resources,
       actions: actions,
       doAction: doAction,
-      moduleCode: moduleCode
+      moduleCode: moduleCode,
+      uiSettings: moduleUiList[dataSetKey] // form和grid的页面配置信息
     });
     return wrapped(wrappedProps);
   };