@luck-design-biz/luckda 0.0.27-1 → 0.0.27-2

package/es/components/LdGridForm/index.js

@@ -104,7 +104,6 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     return _nodes;
   }();
   var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
-  console.log('defaultDataSource', defaultDataSource);
   var formConfig = {
     formId: ldId,
     columns: _columns,
@@ -163,9 +162,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         var formItemData = data.map(function (item) {
           return formItemDataFormat(gridColumns, item);
         });
-        (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) && console.log('formItemData111', onQuery.format(data, formItemData));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
-        console.log('formItemData222', formItemData);
         return formItemData;
       }
     }),

package/es/utils/form.js

@@ -16,7 +16,7 @@ import moment from 'moment';
 import { capitalize, merge, transform, isArray, omit, isNil, clone, cloneDeep } from 'lodash';
 import api from "@/services/ApiConfig";
 import { defaultComName, translator, splitStrToObj, formatCustomProps } from "../helper/form";
-import { getColumnRender } from "./grid";
+import { getColumnRender, getExportField } from "./grid";
 import * as formItemUtils from "../helper/FromItems";
 
 /**
@@ -184,7 +184,7 @@ export var dataFormat = function dataFormat() {
       default:
         result[name] = values[name];
     }
-    values = omit(values, [name, "".concat(name, "_cvt")]);
+    values = omit(values, [name, "".concat(name, "_virtual")]);
   }, {});
   return _objectSpread(_objectSpread({}, values), data);
 };
@@ -251,7 +251,8 @@ export var getFormColumn = function getFormColumn() {
         key: name
       }, _props));
     },
-    field: name
+    field: name,
+    exportField: getExportField(name, formItemType, _props)
   });
 };
 

package/es/utils/grid.js

@@ -38,7 +38,7 @@ export function getColumnRender(name, type) {
       break;
     case 'year':
       render = function render(text) {
-        return text;
+        return moment.isMoment(text) ? text.format('YYYY') : text;
       };
       break;
     case 'user':
@@ -107,6 +107,11 @@ var getAlign = function getAlign(extraData, alignClass) {
       return 'left';
   }
 };
+export var getExportField = function getExportField(name, type, props) {
+  var _props$config2;
+  if (type === 'number' && (_props$config2 = props.config) !== null && _props$config2 !== void 0 && _props$config2.precision || ['date', 'user', 'select', 'group', 'region', 'upload'].includes(type)) return "".concat(name, "_virtual");
+  return;
+};
 export var getGridColumn = function getGridColumn() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
@@ -134,6 +139,7 @@ export var getGridColumn = function getGridColumn() {
   }, _props), {}, {
     field: name,
     title: _props.label,
+    exportField: getExportField(name, comName || defaultComName[property], _props),
     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;
@@ -143,8 +149,8 @@ export var getGridColumn = function getGridColumn() {
     data.filter = filter;
     data.filterParams = filterParams;
   } else if (!isTreeGrid && !isVirtual) {
-    var _props$config2;
-    if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
+    var _props$config3;
+    if ((_props.mode || ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)) === 'multiple') {
       data.field = "".concat(name, "_virtual");
       data.filter = 'text';
       return data;

package/lib/components/LdGridForm/index.js

@@ -112,7 +112,6 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     return _nodes;
   }();
   var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
-  console.log('defaultDataSource', defaultDataSource);
   var formConfig = {
     formId: ldId,
     columns: _columns,
@@ -171,9 +170,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         var formItemData = data.map(function (item) {
           return (0, _utils.formItemDataFormat)(gridColumns, item);
         });
-        (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) && console.log('formItemData111', onQuery.format(data, formItemData));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
-        console.log('formItemData222', formItemData);
         return formItemData;
       }
     }),

package/lib/utils/form.js

@@ -193,7 +193,7 @@ var dataFormat = exports.dataFormat = function dataFormat() {
       default:
         result[name] = values[name];
     }
-    values = (0, _lodash.omit)(values, [name, "".concat(name, "_cvt")]);
+    values = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
   }, {});
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, values), data);
 };
@@ -260,7 +260,8 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
         key: name
       }, _props));
     },
-    field: name
+    field: name,
+    exportField: (0, _grid.getExportField)(name, formItemType, _props)
   });
 };
 

package/lib/utils/grid.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getColumnRender = getColumnRender;
-exports.getGridColumn = void 0;
+exports.getGridColumn = exports.getExportField = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -46,7 +46,7 @@ function getColumnRender(name, type) {
       break;
     case 'year':
       render = function render(text) {
-        return text;
+        return _moment.default.isMoment(text) ? text.format('YYYY') : text;
       };
       break;
     case 'user':
@@ -115,6 +115,11 @@ var getAlign = function getAlign(extraData, alignClass) {
       return 'left';
   }
 };
+var getExportField = exports.getExportField = function getExportField(name, type, props) {
+  var _props$config2;
+  if (type === 'number' && (_props$config2 = props.config) !== null && _props$config2 !== void 0 && _props$config2.precision || ['date', 'user', 'select', 'group', 'region', 'upload'].includes(type)) return "".concat(name, "_virtual");
+  return;
+};
 var getGridColumn = exports.getGridColumn = function getGridColumn() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
@@ -142,6 +147,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
   }, _props), {}, {
     field: name,
     title: _props.label,
+    exportField: getExportField(name, comName || _form.defaultComName[property], _props),
     render: _props.render || getColumnRender(name, comName || _form.defaultComName[property], _props)
   });
   if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || _form.defaultComName[property])) data.sortable = false;
@@ -151,8 +157,8 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
     data.filter = filter;
     data.filterParams = filterParams;
   } else if (!isTreeGrid && !isVirtual) {
-    var _props$config2;
-    if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
+    var _props$config3;
+    if ((_props.mode || ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)) === 'multiple') {
       data.field = "".concat(name, "_virtual");
       data.filter = 'text';
       return data;

package/package.json

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