@lingxiteam/ebe-utils 0.1.5 → 0.1.8

package/es/constants.js

@@ -166,7 +166,7 @@ var componentsRule = {
 };
 export var lingxiDslRules = {
   editorVersion: isTrue,
-  createdEditorVersion: isTrue,
+  // createdEditorVersion: isTrue,
   terminalType: isTrue,
   platformType: isTrue,
   imgInfoList: isTrue,

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

@@ -16,6 +16,7 @@ import { getRegExp, initMomentLocale } from '../../utils/common';
 import { useLocale } from '../../utils/hooks/useLocale';
 import { ExpressionRenderingParams } from '../../utils/PropsType';
 import { EDIT_COMPONENT_STOP_PROPAGATION_CLS } from '../constant';
+import { getFormItemFieldName } from '../utils';
 
 export interface MyEditComponent {
   inlineVChange: (date: any, _label: any) => void;
@@ -531,9 +532,16 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
   };
 
   if (supportEditComponents.includes(edittype) && validateRules) {
-    const fieldName = `${compId}_${currentRowKey}_${
-      rowData[currentRowKey] || rowId
-    }_${dataIndex}`;
+    // const fieldName = `${compId}_${currentRowKey}_${
+    //   rowData[currentRowKey] || rowId
+    // }_${dataIndex}`;
+    const fieldName = getFormItemFieldName({
+      compId,
+      currentRowKey,
+      rowData,
+      rowId,
+      dataIndex,
+    });
     return (
       <Form.Item
         style={{ height: 'auto' }}

package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useCMDActions.ts

@@ -20,6 +20,7 @@ interface UseCommonCMDAction {
   setOuterDataSource: Function;
   onRowSelected: Function;
   engineApis?: EngineApisType;
+  form?: any;
 }
 
 interface UseCMDActionPropsType extends UseCommonCMDAction {
@@ -94,6 +95,10 @@ const useCMDAction = (props: UseCMDActionPropsType) => {
      * 加载表格数据（加载完之后，表格就脱离了数据源的控制了）
      */
     setTableData: (data: { dataSource: any[]; total: any; current: any }) => {
+      // 重置表格，避免下次加载后编辑组件还保留原始值
+      if (typeof form?.resetFields === 'function') {
+        form.resetFields();
+      }
       if (tableUpdateInnerDataSource) {
         setInnerDataSource(data?.dataSource || []);
       } else {
@@ -291,6 +296,7 @@ const useCommonCMDAction = (props: UseCommonCMDAction) => {
     setInnerDataSource,
     setOuterDataSource,
     engineApis,
+    form,
   } = props;
 
   const [loading, setLoading] = useState(false);
@@ -341,6 +347,9 @@ const useCommonCMDAction = (props: UseCommonCMDAction) => {
       }
     },
     clearData: () => {
+      if (typeof form?.resetFields === 'function') {
+        form.resetFields();
+      }
       setInnerDataSource([]);
       if (!tableUpdateInnerDataSource) {
         // 3.8.1前，清空表格数据后，会脱离数据源控制

package/lib/pcpublic/src/components/pcfactory/src/Table/hooks/useRowEdit.ts

@@ -3,6 +3,7 @@ import { EDIT_COMPONENT_STOP_PROPAGATION_CLS } from '../constant';
 import {
   deleteTempRowProperties,
   EMPTY_ROW_TEMP_KEY_ATTR,
+  getFormItemFieldName,
   LATEST_EMPTY_ROW_FLAG_ATTR,
 } from '../utils';
 
@@ -28,6 +29,8 @@ const useRowEdit = (props: any) => {
     onBeforeInlineEdit,
     onBeforeInlineSave,
     engineApis,
+    compId,
+    form,
   } = props;
 
   const [nowInlineEditKey, setNowInlineEditKey] = useState<string | null>();
@@ -103,6 +106,22 @@ const useRowEdit = (props: any) => {
   };
 
   const onRowCancelClick = (row: any) => {
+    // 取消时重置为原始数据
+    if (typeof form?.setFieldsValue === 'function') {
+      const originRow: Record<string, any> = {};
+      Object.keys(row).forEach((key) => {
+        // 表单项名称
+        const fieldName = getFormItemFieldName({
+          compId,
+          currentRowKey,
+          rowData: row,
+          rowId: row[currentRowKey],
+          dataIndex: key,
+        });
+        originRow[fieldName] = row[key];
+      });
+      form.setFieldsValue(originRow);
+    }
     setNowEditingData(null);
     setNowInlineEditKey(null);
     // 取消编辑的时候，如果当前行是刚刚新增的空白行，则过滤当前行

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

@@ -210,6 +210,8 @@ const MyTable = React.forwardRef<any, MyTableProps>((props, ref) => {
     selectedRows,
     onRowSelected,
     engineApis,
+    compId,
+    form,
   });
 
   const { rowSpanColMap, rowSpanMap, rowClassMap } = useRowMerge({

package/lib/pcpublic/src/components/pcfactory/src/Table/utils/index.ts

@@ -492,3 +492,19 @@ export const getFullCheckedKeySet = <T extends {}>(params: {
     }, [] as (string | number)[]),
   );
 };
+
+// 获取编辑组件表单项字段编码
+export const getFormItemFieldName = ({
+  compId,
+  currentRowKey,
+  rowData,
+  rowId,
+  dataIndex,
+}: {
+  compId: string;
+  currentRowKey: string;
+  rowData: any;
+  rowId?: string | number;
+  dataIndex: string | string[];
+}) =>
+  `${compId}_${currentRowKey}_${rowData[currentRowKey] || rowId}_${dataIndex}`;

package/lib/pcpublic/src/hooks/useCompatConfig.ts

@@ -0,0 +1,80 @@
+import { version } from '@/utils/version';
+import { useMemo } from 'react';
+
+interface CompatConfigParams {
+  createdEditorVersion: string;
+}
+
+export const useCompatConfig = (params: CompatConfigParams) => {
+  const { createdEditorVersion } = params;
+
+  const lessThanV331 = useMemo(() => {
+    const versionStr = version.getMainVersion(createdEditorVersion);
+    if (versionStr) {
+      return version.isLessThan(versionStr, '3.3.1');
+    }
+    return false;
+  }, [createdEditorVersion]);
+
+  const lessThanV381 = useMemo(() => {
+    const versionStr = version.getMainVersion(createdEditorVersion);
+    if (versionStr) {
+      return version.isLessThan(versionStr, '3.8.1');
+    }
+    return false;
+  }, [createdEditorVersion]);
+
+  return {
+    isFormCompat: lessThanV331,
+
+    /**
+     * 是否开启联动规则
+     */
+    openLinkageRule: true,
+
+    /**
+     * 表单重置到默认值
+     */
+    resetFormToDefaultValue: !lessThanV381,
+
+    /**
+     * 指令兼容
+     */
+    cmd: {
+      /**
+       * 小于3.8.1 自定义代码块里面更改数据源后，触发页面绑定数据的刷新，大于等于3.8.1不刷新
+       */
+      customActionCodeNotUpdateData: !lessThanV381,
+
+      /**
+       * 指令作用域只生效在同层级，3.8.1之后生效
+       */
+      peerScope: !lessThanV381,
+
+      /**
+       * 阻止onClick冒泡的指令
+       */
+      stopPropagation: !lessThanV331 ? ['onClick'] : undefined,
+
+      /**
+       * 调用任意页面自定义事件兼容(3.3.1 之后 使用engineRelation 去调用任意页面事件，否则都使用lcdapi去调用)
+       */
+      compatCallCustomPageFunc: lessThanV331,
+
+      /**
+       * pc设置表单值动作是否需要触发表单值变化回掉（3.3.1之前 不论绑定数据源还是不绑定数据源都触发）
+       */
+      setFieldsValueToOnValuesChange: lessThanV331,
+
+      /**
+       * 3.3.1后业务组件和页面容器动作控制隐藏，通过dsiplay none
+       */
+      boFramePageViewVisibleDisplayNone: !lessThanV331,
+
+      /**
+       * 3.8.1 后表格所有动作只操作内部数据，不上报到数据源
+       */
+      tableUpdateInnerDataSource: !lessThanV381,
+    },
+  };
+};

package/lib/public/src/utils/version.ts

@@ -0,0 +1,81 @@
+/**
+ * 2个数组位数对齐
+ * @param list1
+ * @param list2
+ * @returns
+ */
+const repairArr = (list1: number[], list2: number[]) => {
+  if (list1.length === list2.length) {
+    return [list1, list2];
+  }
+  if (list1.length > list2.length) {
+    list2.push(...new Array(list1.length - list2.length).fill(0));
+    return [list1, list2];
+  }
+
+  list1.push(...new Array(list2.length - list1.length).fill(0));
+  return [list1, list2];
+};
+
+/**
+ * 分割"." 获取number数组
+ * @param version
+ * @returns
+ */
+const splitVersionNumber = (version: string) => {
+  return version
+    .split('.')
+    .map((v) => parseInt(v.replace(/[^\d]/g, ''), 10) || 0);
+};
+
+export const version = {
+  /**
+   * version1 是否小于 version2
+   * @param version1
+   * @param version2
+   */
+  isLessThan(version1: string, version2: string) {
+    if (
+      !version1 ||
+      !version2 ||
+      typeof version1 !== 'string' ||
+      typeof version2 !== 'string'
+    ) {
+      return false;
+    }
+
+    let splitVerArr1 = splitVersionNumber(version1);
+    let splitVerArr2 = splitVersionNumber(version2);
+
+    [splitVerArr1, splitVerArr2] = repairArr(splitVerArr1, splitVerArr2);
+
+    for (let index = 0; index < splitVerArr1.length; index += 1) {
+      const ver1 = splitVerArr1[index];
+      const ver2 = splitVerArr2[index];
+      // 如果版本号中同位版本一致则继续比较下一位，否则返回比较结果
+      if (ver1 !== ver2) {
+        return ver1 < ver2;
+      }
+    }
+    return false;
+  },
+
+  /**
+   * 获取主版本号
+   * @param str 版本号
+   */
+  getMainVersion(str?: string): string {
+    if (!str) {
+      return '';
+    }
+    let versions: string[] = [];
+    if (typeof str === 'string') {
+      versions = str.split('.');
+    }
+
+    if (versions.length !== 4) {
+      return '';
+    }
+    return versions.slice(0, 3).join('.');
+  },
+};

package/package.json

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