Merge branch 'master' into feature/2.9.42310.01-薪资项目拓扑图

src/pages/calcTable/index.tsx

@@ -49,7 +49,7 @@ const index: FunctionComponent<Props> = (props) => {
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
       const {
-        columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {},
+        columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {},
         showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail,
         fixed = true, tableScrollHeight, sumRow, optWidth
       } = data;

src/pages/salaryFileTable/index.tsx

@@ -40,7 +40,7 @@ const Index: FunctionComponent<Props> = (props) => {
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
       const {
-        columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {},
+        columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {},
         selectedKey, showOperateBtn, showDelSalaryFileBtn, DCChiefPermission
       } = data;
       setShowOperateBtn(showOperateBtn);

src/pages/unitTable/index.tsx

@@ -22,7 +22,7 @@ const UnitTable: FC = (props) => {
   const [pageInfo, setPageInfo] = useState<Partial<PaginationData>>({});
   const [sumRow, setSumRow] = useState<Partial<{}>>({});//总计行数据
   const [i18n, setI18n] = useState<any>({});
-  const [extraParams, setExtraParams] = useState<Partial<extraType>>({});//额外参数
+  const [extraParams, setExtraParams] = useState<Partial<extraType>>({ selectedRowKeys: [] });//额外参数
 
   useEffect(() => {
     window.parent.postMessage({ type: "init" }, "*");
@@ -46,7 +46,7 @@ const UnitTable: FC = (props) => {
       setSumRow(sumDataSource);
       setExtraParams({
         selectedKey, scrollHeight, permission, rowKey, showTotalCell,
-        selectedRowKeys: [extraParams.selectedRowKeys, ...rowKeys]
+        selectedRowKeys: [...extraParams.selectedRowKeys as string[] | number[], ...rowKeys]
       });
     }
   };

src/pages/unitTable/renderColsOpts.tsx

@@ -304,7 +304,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
           return (
             <Space>
               <Button type="link"
-                      onClick={() => postMessageToParent("VIEW", record)}>{i18n?.["查看详情"]}</Button>
+                      onClick={() => postMessageToParent("EDIT", record)}>{i18n?.["编辑"]}</Button>
               <Button type="link"
                       onClick={() => postMessageToParent("DEL", record)}>{i18n?.["删除"]}</Button>
             </Space>

src/pages/welfareArchiveTable/index.tsx

@@ -39,7 +39,7 @@ const Index: FunctionComponent<Props> = (props) => {
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
       const {
-        columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {},
+        columns, dataSource, pageInfo, selectedRowKeys: rowKeys = [], i18n: i18nRes = {},
         runStatuses, showOperateBtn
       } = data;
       setShowOperateBtn(showOperateBtn);