@luck-design-biz/luckda 1.0.6-13tl → 1.0.7

package/lib/utils/form.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getFormColumn = exports.formItemDataFormat = exports.dataFormat = void 0;
 exports.getFormItem = getFormItem;
+exports.mergeAndSort = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -30,6 +32,7 @@ var _excluded = ["comName", "property"],
  * 根据动态表单配置项生成formItem
  * @param {动态表单配置项} props
  * @param {自定义动态表单配置项} customProps
+ * @param {formUi配置项} formUiPreset
  * @returns <BasicForm name='' ... />
  */
 function getFormItem() {
@@ -38,10 +41,11 @@ function getFormItem() {
     property = _ref.property,
     props = (0, _objectWithoutProperties2.default)(_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.default.createElement(_react.default.Fragment, null);
   if (property === 'sint' || property === 'number' || property === 'long') props.opt_decimal = 0;
   var comType = comName || _form.defaultComName[property];
-  var _translator = (0, _form.translator)(props),
+  var _translator = (0, _form.translator)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), formUiPreset)),
     name = _translator.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
   var _merge = (0, _lodash.merge)(
@@ -82,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;
@@ -210,8 +214,12 @@ var dataFormat = exports.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: *}}
  */
 var getFormColumn = exports.getFormColumn = function getFormColumn() {
@@ -224,9 +232,10 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
   var _ref5 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     formItemRewrite = _ref5.formItemRewrite,
     customProps = (0, _objectWithoutProperties2.default)(_ref5, _excluded7);
+  var gridUiPreset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var formItemType = comName || _form.defaultComName[property];
   if (formItemType === 'radio') formItemType = 'select';
-  var _translator2 = (0, _form.translator)(props),
+  var _translator2 = (0, _form.translator)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), gridUiPreset)),
     name = _translator2.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator2, _excluded8);
   var _merge2 = (0, _lodash.merge)(
@@ -237,7 +246,7 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
     _props = (0, _objectWithoutProperties2.default)(_merge2, _excluded9);
   var columnRender = (0, _grid.getColumnRender)(name, formItemType, _props);
   if (formType !== 'writer') _props.name = name;
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
     title: translateProps.label,
     editable: formType === 'writer' && {
       required: _props.required || ((_props$config = _props.config) === null || _props$config === void 0 ? void 0 : _props$config.required)
@@ -267,4 +276,29 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
     field: name,
     exportField: (0, _grid.getExportField)(name, formItemType, _props)
   });
+};
+
+/**
+ * 合并两个数组，并且数据顺序以arr2为准
+ * @param arr1
+ * @param arr2
+ * @param rowKey
+ */
+var mergeAndSort = exports.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 ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), a1Item) : item;
+  });
+  // 将a1中未出现在a2中的元素追加到合并后的数组末尾
+  mergedArray.push.apply(mergedArray, (0, _toConsumableArray2.default)(arr1.filter(function (a1Item) {
+    return !a2Map.has(a1Item[rowKey]);
+  })));
+  return mergedArray;
 };

package/lib/utils/grid.js

@@ -130,12 +130,13 @@ var getGridColumn = exports.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 comType = comName || _form.defaultComName[property];
   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 = (0, _form.translator)(props),
+  var _translator = (0, _form.translator)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), gridUiPreset)),
     name = _translator.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
   var _merge = (0, _lodash.merge)(translateProps, (0, _form.formatCustomProps)(comType, customProps)),

package/package.json

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