@luck-design-biz/luckda 1.0.2-2 → 1.0.2-20temp

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)(
@@ -202,7 +206,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);
 };
@@ -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)
@@ -264,6 +273,32 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
         key: name
       }, _props));
     },
-    field: name
+    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

@@ -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"));
@@ -117,6 +117,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,
@@ -125,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)),
@@ -140,6 +146,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
   var _extra = JSON.parse(extra) || {};
   var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
     field: name,
+    exportField: getExportField(name, comName || _form.defaultComName[property], _props),
     title: _props.fieldAliasName || _props.label,
     headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
     align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
@@ -152,8 +159,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;
@@ -204,6 +211,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
         break;
       case 'select':
       case 'radio':
+      case 'dict':
         data.filter = 'select';
         if (_props.alias) {
           data.filterParams = {
@@ -277,6 +285,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
         case 'select':
         case 'group':
         case 'complex':
+        case 'dict':
           if (translateProps.multiple) {
             formItemProps = {
               dataFormat: function dataFormat(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "1.0.2-2",
+  "version": "1.0.2-20temp",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",
@@ -108,7 +108,6 @@
     "cross-var": "^1.1.0",
     "d3-selection": "^1.4.2",
     "dry-dry": "^0.4.0",
-    "enzyme": "^3.11.0",
     "eslint": "^7.32.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-react": "^7.31.10",

package/es/lowcode/painter/panel-section/JSEditor.js

@@ -1,49 +0,0 @@
-import React, { useRef } from 'react';
-import { useMemoizedFn } from 'ahooks';
-import { Button } from 'luck-design/antd';
-import { debounce } from 'lodash';
-import { formatMessage } from '@luck-design-biz/base/utils';
-import PopConfirm from "../components/PopConfirm";
-import FullScreenEditor from "../components/code-editor/FullScreenEditor";
-import JSEditor from "../components/code-editor/JSEditor";
-var _JSEditor = function _JSEditor(_ref) {
-  var defaultValue = _ref.defaultValue,
-    defaultCode = _ref.defaultCode,
-    onChange = _ref.onChange,
-    mustConfirm = _ref.mustConfirm,
-    children = _ref.children;
-  var editorRef = useRef();
-  var handleCodeChange = useRef(debounce(function (code) {
-    if (!mustConfirm) onChange(code);
-  }, 400));
-  var handleConfirm = useMemoizedFn(function () {
-    onChange(editorRef.current.editor.getValue());
-  });
-  var handleEditorLoad = useMemoizedFn(function () {
-    editorRef.current.editor.setValue(defaultValue || defaultCode);
-  });
-  return /*#__PURE__*/React.createElement(PopConfirm, {
-    placement: "left",
-    title: /*#__PURE__*/React.createElement(FullScreenEditor, {
-      ref: editorRef,
-      EditorComponent: JSEditor,
-      width: "600px",
-      height: "400px",
-      onChange: handleCodeChange.current,
-      onLoad: handleEditorLoad
-    }),
-    showBtn: mustConfirm,
-    onConfirm: handleConfirm
-  }, children !== null && children !== void 0 ? children : /*#__PURE__*/React.createElement("div", {
-    style: {
-      padding: '0 16px'
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    block: true,
-    size: "small"
-  }, formatMessage({
-    id: 'luckda.lowcode.painter.panel-section.style-panel.sourceedit',
-    label: '源码编辑'
-  }))));
-};
-export default _JSEditor;

package/es/lowcode/view/errorBoundary.js

@@ -1,61 +0,0 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-import React, { Component } from 'react';
-var ErrorBoundary = /*#__PURE__*/function (_Component) {
-  _inherits(ErrorBoundary, _Component);
-  var _super = _createSuper(ErrorBoundary);
-  function ErrorBoundary(props) {
-    var _this;
-    _classCallCheck(this, ErrorBoundary);
-    _this = _super.call(this, props);
-    _this.state = {
-      hasError: false,
-      error: '',
-      errorInfo: ''
-    };
-    return _this;
-  }
-  _createClass(ErrorBoundary, [{
-    key: "componentDidCatch",
-    value: function componentDidCatch(error, errorInfo) {
-      // 在此处记录错误信息
-      console.error(error);
-      this.props.onClear && this.props.onClear();
-      this.setState({
-        hasError: true,
-        error: error,
-        errorInfo: errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack
-      });
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      if (this.state.hasError) {
-        // 如果有错误,显示备用 UI
-        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("h3", {
-          style: {
-            whiteSpace: 'pre-line',
-            color: 'var(--luck-color-danger)',
-            fontSize: '1.5rem'
-          },
-          dangerouslySetInnerHTML: {
-            __html: this.state.error
-          }
-        }), /*#__PURE__*/React.createElement("p", {
-          style: {
-            whiteSpace: 'pre-line',
-            color: 'var(--luck-color-danger)'
-          },
-          dangerouslySetInnerHTML: {
-            __html: this.state.errorInfo
-          }
-        }));
-      }
-      return this.props.children;
-    }
-  }]);
-  return ErrorBoundary;
-}(Component);
-export default ErrorBoundary;

package/lib/lowcode/painter/panel-section/JSEditor.js

@@ -1,57 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _ahooks = require("ahooks");
-var _antd = require("luck-design/antd");
-var _lodash = require("lodash");
-var _utils = require("@luck-design-biz/base/utils");
-var _PopConfirm = _interopRequireDefault(require("../components/PopConfirm"));
-var _FullScreenEditor = _interopRequireDefault(require("../components/code-editor/FullScreenEditor"));
-var _JSEditor2 = _interopRequireDefault(require("../components/code-editor/JSEditor"));
-var _JSEditor = function _JSEditor(_ref) {
-  var defaultValue = _ref.defaultValue,
-    defaultCode = _ref.defaultCode,
-    onChange = _ref.onChange,
-    mustConfirm = _ref.mustConfirm,
-    children = _ref.children;
-  var editorRef = (0, _react.useRef)();
-  var handleCodeChange = (0, _react.useRef)((0, _lodash.debounce)(function (code) {
-    if (!mustConfirm) onChange(code);
-  }, 400));
-  var handleConfirm = (0, _ahooks.useMemoizedFn)(function () {
-    onChange(editorRef.current.editor.getValue());
-  });
-  var handleEditorLoad = (0, _ahooks.useMemoizedFn)(function () {
-    editorRef.current.editor.setValue(defaultValue || defaultCode);
-  });
-  return /*#__PURE__*/_react.default.createElement(_PopConfirm.default, {
-    placement: "left",
-    title: /*#__PURE__*/_react.default.createElement(_FullScreenEditor.default, {
-      ref: editorRef,
-      EditorComponent: _JSEditor2.default,
-      width: "600px",
-      height: "400px",
-      onChange: handleCodeChange.current,
-      onLoad: handleEditorLoad
-    }),
-    showBtn: mustConfirm,
-    onConfirm: handleConfirm
-  }, children !== null && children !== void 0 ? children : /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      padding: '0 16px'
-    }
-  }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
-    block: true,
-    size: "small"
-  }, (0, _utils.formatMessage)({
-    id: 'luckda.lowcode.painter.panel-section.style-panel.sourceedit',
-    label: '源码编辑'
-  }))));
-};
-var _default = exports.default = _JSEditor;

package/lib/lowcode/view/errorBoundary.js

@@ -1,69 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
-var _react = _interopRequireWildcard(require("react"));
-var ErrorBoundary = /*#__PURE__*/function (_Component) {
-  (0, _inherits2.default)(ErrorBoundary, _Component);
-  var _super = (0, _createSuper2.default)(ErrorBoundary);
-  function ErrorBoundary(props) {
-    var _this;
-    (0, _classCallCheck2.default)(this, ErrorBoundary);
-    _this = _super.call(this, props);
-    _this.state = {
-      hasError: false,
-      error: '',
-      errorInfo: ''
-    };
-    return _this;
-  }
-  (0, _createClass2.default)(ErrorBoundary, [{
-    key: "componentDidCatch",
-    value: function componentDidCatch(error, errorInfo) {
-      // 在此处记录错误信息
-      console.error(error);
-      this.props.onClear && this.props.onClear();
-      this.setState({
-        hasError: true,
-        error: error,
-        errorInfo: errorInfo === null || errorInfo === void 0 ? void 0 : errorInfo.componentStack
-      });
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      if (this.state.hasError) {
-        // 如果有错误,显示备用 UI
-        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("h3", {
-          style: {
-            whiteSpace: 'pre-line',
-            color: 'var(--luck-color-danger)',
-            fontSize: '1.5rem'
-          },
-          dangerouslySetInnerHTML: {
-            __html: this.state.error
-          }
-        }), /*#__PURE__*/_react.default.createElement("p", {
-          style: {
-            whiteSpace: 'pre-line',
-            color: 'var(--luck-color-danger)'
-          },
-          dangerouslySetInnerHTML: {
-            __html: this.state.errorInfo
-          }
-        }));
-      }
-      return this.props.children;
-    }
-  }]);
-  return ErrorBoundary;
-}(_react.Component);
-var _default = exports.default = ErrorBoundary;