@luck-design-biz/luckda 1.0.2-20temp7 → 1.0.2-20temp8

package/es/components/LdAutoForm/index.js

@@ -66,10 +66,14 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   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 basicItems = function () {
+  var basicItems = function (_formPreset$formField) {
     var fieldsObj = keyBy(fields, 'field');
-    var mergedArray = mergeAndSort(columns, formPreset.formFieldPreset || [], 'aliasName');
-    var columnsObj = keyBy(mergedArray, 'aliasName');
+    var mergedArray = mergeAndSort(columns, formPreset.formFieldPreset || [], 'aliaName');
+    var columnsObj = keyBy(mergedArray, 'aliaName');
+    var fieldPresetMap = reduce((_formPreset$formField = formPreset.formFieldPreset) !== null && _formPreset$formField !== void 0 ? _formPreset$formField : [], function (ret, _item) {
+      ret[_item.aliasName] = _item;
+      return ret;
+    }, {});
     var keys = isEmpty(fields) ? Object.keys(columnsObj) : union(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
     var _nodes = reduce(keys, function (result, key) {
@@ -81,27 +85,26 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           key: key
         }));
       } else if (col !== null && col !== void 0 && col.isShowInForm && (isNil(setting) || setting !== null && setting !== void 0 && setting.isShow)) {
+        var _fieldPresetMap$col$a;
         var customFiled = filedsRewrite.find(function (_field) {
-          return _field.name === col.aliasName;
+          return _field.name === col.aliaName;
         }) || {};
-        _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliasName, col['optDefaultValue']), "".concat(col.aliasName, "_virtual"), col['optDefaultValueCvt']));
+        _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
         var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
         var newCol = _objectSpread(_objectSpread({}, col), {}, {
           setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldAliasName || col.fieldName
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
         }, pick(setting, defaultSet));
         // 该字段配置的表单显示信息
-        var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
-          return c.aliasName === col.aliasName;
-        }) : {};
+        var colUiData = (_fieldPresetMap$col$a = fieldPresetMap[col.aliaName]) !== null && _fieldPresetMap$col$a !== void 0 ? _fieldPresetMap$col$a : {};
         result.push(getFormItem(newCol, _objectSpread(_objectSpread({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
-            return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliasName, value)));
+            return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliaName, value)));
           },
-          setting: omit(setting, [].concat(defaultSet, ['uid', 'field', 'aliasName']))
+          setting: omit(setting, [].concat(defaultSet, ['uid', 'field', 'aliaName']))
         }), colUiData));
       }
       return result;
@@ -118,7 +121,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     formId: ldId,
     isMain: isMain,
     defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
-      return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.aliasName]);
+      return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.aliaName]);
     }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current)),
     col: formPreset.formCol
   };
@@ -168,7 +171,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     }, onQuery), {}, {
       format: function format(data, res) {
         var formItemData = _objectSpread({}, formItemDataFormat(columns.map(function (c) {
-          return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.aliasName]);
+          return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.aliaName]);
         }), data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;

package/es/components/LdGrid/index.js

@@ -112,8 +112,8 @@ var LdGrid = function LdGrid(_ref) {
     }
     var _columnsRewrite = isFunction(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = keyBy(columns, 'aliaName');
-    var customColumns = keyBy(_columnsRewrite, 'field');
-    var presetColumns = keyBy(gridPresetData.gridPreset, 'field'); // ui配置的已排序的列
+    var customColumns = keyBy(_columnsRewrite, 'aliaName');
+    var presetColumns = keyBy(gridPresetData.gridPreset, 'aliaName'); // ui配置的已排序的列
     var mergeFields = union(keys(presetColumns), keys(defaultColumns), keys(customColumns)); // 以UI配置的列排序
     return transform(mergeFields, function (result, field) {
       var _customColumns$field;
@@ -224,10 +224,8 @@ Index.propTypes = {
   // 数据集key
   readOnly: PropTypes.bool,
   // 是否只读
-  columnsRewrite: PropTypes.arrayOf(
-  //
-  PropTypes.shape({
-    field: PropTypes.string.isRequired
+  columnsRewrite: PropTypes.arrayOf(PropTypes.shape({
+    aliaName: PropTypes.string.isRequired
   })),
   pagination: PropTypes.shape({
     pageSize: PropTypes.number,

package/es/components/LdInfoPanel/index.js

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 import { useCreation, useRequest } from 'ahooks';
 import { InfoPanel } from 'luck-design';
 import { behaviorCall } from "../../utils";
-import { transform } from 'lodash';
+import { transform, isArray, isFunction } from 'lodash';
 import ldBuilder from "../../helper/ldBuilder";
 var formatInfoPanelData = function formatInfoPanelData(columns, data) {
   return transform(columns, function (result, col) {
@@ -51,14 +51,20 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
     });
   });
   var _columns = useCreation(function () {
-    return customColumns ? customColumns.map(function (col) {
-      var xCol = columns.find(function (column) {
-        return column.aliaName === col.dataIndex;
-      }) || {};
-      return _objectSpread({
-        title: xCol.fieldName
-      }, col);
-    }) : transform(columns, function (result, item) {
+    if (isArray(customColumns)) {
+      return customColumns.map(function (col) {
+        var xCol = columns.find(function (column) {
+          return column.aliaName === col.dataIndex;
+        }) || {};
+        return _objectSpread({
+          title: xCol.fieldName
+        }, col);
+      });
+    }
+    if (isFunction(customColumns)) {
+      return customColumns(columns);
+    }
+    return transform(columns, function (result, item) {
       if (item.isShowInForm) {
         result.push({
           title: item.fieldName,
@@ -103,7 +109,7 @@ Index.propTypes = {
   // 抑制初始化
   afterInit: PropTypes.func,
   // 初始化后
-  customColumns: PropTypes.array,
+  customColumns: PropTypes.oneOfType([PropTypes.array, PropTypes.func]),
   defaultParmas: PropTypes.object
 };
 Index.defaultProps = {

package/es/helper/form.js

@@ -66,7 +66,7 @@ export function translator() {
   var allConfig = _objectSpread(_objectSpread({}, props), JSON.parse(extra || '{}'));
   var _props = {
     name: allConfig.aliaName,
-    label: allConfig.fieldName,
+    label: allConfig.fieldAliasName || allConfig.fieldName,
     config: {
       required: !!allConfig.isNotNull,
       disabled: !!allConfig.isReadOnly,

package/es/helper/ldBuilder.js

@@ -57,11 +57,7 @@ var builder = function builder(wrapped) {
         label: '数据集'
       }));
     var wrappedProps = _objectSpread(_objectSpread({}, props), {}, {
-      columns: dataSets[dataSetKey].map(function (item) {
-        return _objectSpread(_objectSpread({}, item), {}, {
-          aliasName: item.aliaName
-        });
-      }),
+      columns: dataSets[dataSetKey],
       isTree: isTree,
       resources: resources,
       actions: actions,

package/es/utils/form.js

@@ -77,7 +77,7 @@ export var formItemDataFormat = function formItemDataFormat() {
     var translatorProps = translator(props);
     var name = translatorProps.name,
       dataFormat = translatorProps.dataFormat;
-    switch (comName || defaultComName[property]) {
+    if (values[name] || values["".concat(name, "_virtual")]) switch (comName || defaultComName[property]) {
       case 'date':
         result[name] = values["".concat(name, "_virtual")] ? moment(values["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss') : undefined;
         break;

package/lib/components/LdAutoForm/index.js

@@ -74,10 +74,14 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   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 basicItems = function () {
+  var basicItems = function (_formPreset$formField) {
     var fieldsObj = (0, _lodash.keyBy)(fields, 'field');
-    var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'aliasName');
-    var columnsObj = (0, _lodash.keyBy)(mergedArray, 'aliasName');
+    var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'aliaName');
+    var columnsObj = (0, _lodash.keyBy)(mergedArray, 'aliaName');
+    var fieldPresetMap = (0, _lodash.reduce)((_formPreset$formField = formPreset.formFieldPreset) !== null && _formPreset$formField !== void 0 ? _formPreset$formField : [], function (ret, _item) {
+      ret[_item.aliasName] = _item;
+      return ret;
+    }, {});
     var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : (0, _lodash.union)(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
     var _nodes = (0, _lodash.reduce)(keys, function (result, key) {
@@ -89,27 +93,26 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           key: key
         }));
       } else if (col !== null && col !== void 0 && col.isShowInForm && ((0, _lodash.isNil)(setting) || setting !== null && setting !== void 0 && setting.isShow)) {
+        var _fieldPresetMap$col$a;
         var customFiled = filedsRewrite.find(function (_field) {
-          return _field.name === col.aliasName;
+          return _field.name === col.aliaName;
         }) || {};
-        _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliasName, col['optDefaultValue']), "".concat(col.aliasName, "_virtual"), col['optDefaultValueCvt']));
+        _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 defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
         var newCol = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, col), {}, {
           setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldAliasName || col.fieldName
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
         }, (0, _lodash.pick)(setting, defaultSet));
         // 该字段配置的表单显示信息
-        var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
-          return c.aliasName === col.aliasName;
-        }) : {};
+        var colUiData = (_fieldPresetMap$col$a = fieldPresetMap[col.aliaName]) !== null && _fieldPresetMap$col$a !== void 0 ? _fieldPresetMap$col$a : {};
         result.push((0, _utils.getFormItem)(newCol, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
-            return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliasName, value)));
+            return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
           },
-          setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field', 'aliasName']))
+          setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field', 'aliaName']))
         }), colUiData));
       }
       return result;
@@ -126,7 +129,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     formId: ldId,
     isMain: isMain,
     defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
-      return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.aliasName]);
+      return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.aliaName]);
     }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current)),
     col: formPreset.formCol
   };
@@ -176,7 +179,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     }, onQuery), {}, {
       format: function format(data, res) {
         var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
-          return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.aliasName]);
+          return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.aliaName]);
         }), data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;

package/lib/components/LdGrid/index.js

@@ -120,8 +120,8 @@ var LdGrid = function LdGrid(_ref) {
     }
     var _columnsRewrite = (0, _lodash.isFunction)(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = (0, _lodash.keyBy)(columns, 'aliaName');
-    var customColumns = (0, _lodash.keyBy)(_columnsRewrite, 'field');
-    var presetColumns = (0, _lodash.keyBy)(gridPresetData.gridPreset, 'field'); // ui配置的已排序的列
+    var customColumns = (0, _lodash.keyBy)(_columnsRewrite, 'aliaName');
+    var presetColumns = (0, _lodash.keyBy)(gridPresetData.gridPreset, 'aliaName'); // 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;
@@ -232,10 +232,8 @@ Index.propTypes = {
   // 数据集key
   readOnly: _propTypes.default.bool,
   // 是否只读
-  columnsRewrite: _propTypes.default.arrayOf(
-  //
-  _propTypes.default.shape({
-    field: _propTypes.default.string.isRequired
+  columnsRewrite: _propTypes.default.arrayOf(_propTypes.default.shape({
+    aliaName: _propTypes.default.string.isRequired
   })),
   pagination: _propTypes.default.shape({
     pageSize: _propTypes.default.number,

package/lib/components/LdInfoPanel/index.js

@@ -59,14 +59,20 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
     });
   });
   var _columns = (0, _ahooks.useCreation)(function () {
-    return customColumns ? customColumns.map(function (col) {
-      var xCol = columns.find(function (column) {
-        return column.aliaName === col.dataIndex;
-      }) || {};
-      return (0, _objectSpread2.default)({
-        title: xCol.fieldName
-      }, col);
-    }) : (0, _lodash.transform)(columns, function (result, item) {
+    if ((0, _lodash.isArray)(customColumns)) {
+      return customColumns.map(function (col) {
+        var xCol = columns.find(function (column) {
+          return column.aliaName === col.dataIndex;
+        }) || {};
+        return (0, _objectSpread2.default)({
+          title: xCol.fieldName
+        }, col);
+      });
+    }
+    if ((0, _lodash.isFunction)(customColumns)) {
+      return customColumns(columns);
+    }
+    return (0, _lodash.transform)(columns, function (result, item) {
       if (item.isShowInForm) {
         result.push({
           title: item.fieldName,
@@ -111,7 +117,7 @@ Index.propTypes = {
   // 抑制初始化
   afterInit: _propTypes.default.func,
   // 初始化后
-  customColumns: _propTypes.default.array,
+  customColumns: _propTypes.default.oneOfType([_propTypes.default.array, _propTypes.default.func]),
   defaultParmas: _propTypes.default.object
 };
 Index.defaultProps = {

package/lib/helper/form.js

@@ -74,7 +74,7 @@ function translator() {
   var allConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), JSON.parse(extra || '{}'));
   var _props = {
     name: allConfig.aliaName,
-    label: allConfig.fieldName,
+    label: allConfig.fieldAliasName || allConfig.fieldName,
     config: {
       required: !!allConfig.isNotNull,
       disabled: !!allConfig.isReadOnly,

package/lib/helper/ldBuilder.js

@@ -64,11 +64,7 @@ var builder = function builder(wrapped) {
         label: '数据集'
       }));
     var wrappedProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-      columns: dataSets[dataSetKey].map(function (item) {
-        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-          aliasName: item.aliaName
-        });
-      }),
+      columns: dataSets[dataSetKey],
       isTree: isTree,
       resources: resources,
       actions: actions,

package/lib/utils/form.js

@@ -86,7 +86,7 @@ var formItemDataFormat = exports.formItemDataFormat = function formItemDataForma
     var translatorProps = (0, _form.translator)(props);
     var name = translatorProps.name,
       dataFormat = translatorProps.dataFormat;
-    switch (comName || _form.defaultComName[property]) {
+    if (values[name] || values["".concat(name, "_virtual")]) switch (comName || _form.defaultComName[property]) {
       case 'date':
         result[name] = values["".concat(name, "_virtual")] ? (0, _moment.default)(values["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss') : undefined;
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "1.0.2-20temp7",
+  "version": "1.0.2-20temp8",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",