@lingxiteam/ebe-utils 0.3.26 → 0.3.28

package/lib/pcpublic/src/components/pcfactory/src/Description/index.tsx

@@ -195,11 +195,15 @@ const Description = React.forwardRef<any, MyDescriptionProps>((props, ref) => {
             }
           }
         }
-
         // 如果配置了换行符则根据换行符进行切割
         if (lineBreak && typeof text === 'string') {
-          return content.split(lineBreak).map((_c: any, _i: any) => <div key={_i}>{_c}</div>);
+          let temlineBreak = lineBreak;
+          if (temlineBreak === '\\n') {
+            temlineBreak = lineBreak.replace(/\\n/g, '\n');
+          }
+          return content.split(temlineBreak).map((_c: any, _i: any) => <div key={_i}>{_c}</div>);
         }
+
         // 自定义渲染函数
         if (c.jsx) {
           content = (

package/lib/pcpublic/src/components/pcfactory/src/Table/EditComponent/index.tsx

@@ -1,6 +1,6 @@
 import { DatePicker, Input, InputNumber, Select, Radio, Switch, Form } from 'antd';
 import moment, { Moment } from 'moment';
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import ComSelect from '../../SuperSelect/ComSelect';
 import ModalSelect from '../../ModalSelect';
 import { initMomentLocale, getRegExp } from '../../utils/common';
@@ -55,6 +55,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
     engineApis,
     onChange,
     onBlur,
+    form,
   } = props;
   const { dataIndex } = c;
   const {
@@ -75,6 +76,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
   const [tempInputValue, updateTempInputValue] = useState<string | undefined>();
 
   const { getLocale } = useLocale(engineApis || {});
+  const fieldName = getFormItemFieldName({ compId, currentRowKey, rowData, rowId, dataIndex });
 
   const limitRangeTime: {
     startTime: Moment;
@@ -212,6 +214,21 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
     return res?.length > 0 ? res : null;
   }, [initialValueType, isNaNValue, rules, validateDateCustomExpress]);
 
+  const needFormItem = useMemo(() => supportEditComponents.includes(edittype) && validateRules,
+    [supportEditComponents, edittype,
+      validateRules]);
+
+  useEffect(() => {
+    if (needFormItem && fieldName) {
+      const currentValue = tempInputValue ?? initialValue;
+      const formValue = form.getFieldValue(fieldName);
+      if (formValue !== currentValue) {
+        // 值不一样时需要通过表单赋值更新成由外部传入的新值
+        form.setFieldValue(fieldName, currentValue);
+      }
+    }
+  }, [needFormItem, fieldName, tempInputValue, initialValue]);
+
   const getDisabledDate = useCallback((current: Moment) => {
     // custom 自定义规则通过form表单进行校验
     if (!limitRange || limitRange === 'no' || limitRange === 'custom') {
@@ -498,8 +515,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
     }
   };
 
-  if (supportEditComponents.includes(edittype) && validateRules) {
-    const fieldName = getFormItemFieldName({ compId, currentRowKey, rowData, rowId, dataIndex });
+  if (needFormItem) {
     return (
       <Form.Item
         style={{ height: 'auto' }}
@@ -507,7 +523,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
         // TODO: 设置的 filedName 目前实际没作用，只是为了防止formitem错误告警
         name={fieldName}
         initialValue={initialValue}
-        rules={validateRules}
+        rules={validateRules as any}
       >
         {renderComponent(true)}
       </Form.Item>

package/lib/public/src/components/ImportBusiObjModal/index.tsx

@@ -590,6 +590,11 @@ const ImportBusiObjModal = forwardRef<ImportBusiObjModalHooks, ImportBusiObjModa
           xhr.onload = async () => {
             response = JSON.parse(xhr.responseText || xhr.response);
             if (xhr.status === 200) {
+              if (Object.prototype.toString.call(response?.resultObject) === '[object Object]' && response?.resultObject.hasOwnProperty('resultCode') && response?.resultObject?.resultCode !== '0') {
+                response.resultCode = response?.resultObject?.resultCode;
+                response.resultMsg = response?.resultObject?.resultMsg;
+                response.resultObject = undefined;
+              }
               let result = response?.resultObject;
               let isAsyncImport = false;
               if (hasUploadProcess) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.3.26",
+  "version": "0.3.28",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.3.26"
+    "@lingxiteam/ebe": "0.3.28"
   },
   "publishConfig": {
     "access": "public"

package/es/renameComponents.d.ts

@@ -1 +0,0 @@
-export declare function renameComponents(data: any): string;

package/es/renameComponents.js

@@ -1,70 +0,0 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-export function renameComponents(data) {
-  // 读取 JSON 文件
-  //   const data: JsonData = JSON.parse(jsonContent);
-
-  // 用于存储已使用的名称计数
-  var nameCounters = {};
-  var renameObject = {};
-
-  // 递归处理组件
-  function processComponents(components) {
-    if (!Array.isArray(components)) return;
-    components.forEach(function (component) {
-      // 处理当前组件
-      if (component.id && /^[A-Za-z]+_\d+$/.test(component.id)) {
-        var baseName = component.id.split('_')[0];
-        // 生成新的有意义的名字
-        var newName = generateMeaningfulName(baseName, component.id, nameCounters);
-        component.id = newName;
-      }
-
-      // 递归处理子组件
-      if (component.components) {
-        processComponents(component.components);
-      }
-    });
-  }
-
-  // 生成有意义的名称
-  function generateMeaningfulName(baseName, label, counters) {
-    if (!counters[baseName]) {
-      counters[baseName] = 1;
-    } else {
-      counters[baseName] += 1;
-    }
-    // 从 Form1 开始，防止变量名和组件名相同
-    var rename = "".concat(baseName).concat(counters[baseName]);
-    renameObject[label] = rename;
-    return rename;
-  }
-
-  // 处理所有组件
-  if (data.components) {
-    processComponents(data.components);
-  }
-
-  // 将对象转换为字符串
-  var jsonString = JSON.stringify(data, null, 4);
-
-  // 全局替换所有引用
-  Object.entries(renameObject).forEach(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-      oldName = _ref2[0],
-      newName = _ref2[1];
-    // 使用正则表达式确保只替换完整的匹配
-    var regex = oldName.trim();
-    // @ts-ignore
-    jsonString = jsonString.replaceAll(regex, newName);
-  });
-  return JSON.parse(jsonString);
-  // 写回文件
-  //   fs.writeFileSync('./Page_ceshi1.json', jsonString, 'utf8');
-  //   console.log('组件重命名完成！');
-  //   console.log('/重命名映射关系：', renameObject);
-}