Merge pull request #18 from secretflow/sprint/v1.5

v1.5: 版本迭代更新

.circleci/config.yml

@@ -1,3 +1,4 @@
+
 version: 2.1
 
 jobs:

.vscode/settings.json

@@ -33,8 +33,8 @@
   "editor.rulers": [88],
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit",
-    "source.fixAll.stylelint": "explicit"
+    "source.fixAll.eslint": true,
+    "source.fixAll.stylelint": true
   },
   "[markdown]": {
     "editor.quickSuggestions": {

README.md

@@ -9,6 +9,7 @@ pnpm bootstrap
 pnpm dev
 ```
 
-For more details on development and deployment，please refer 🛠 [Dev Guidelines](https://secretflow.github.io/secretpad-frontend/dev-doc).
+For more details on development and deployment，please refer 🛠
+[Dev Guidelines](https://secretflow.github.io/secretpad-frontend/dev-doc).
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for more info.

README.zh-Hans.md

@@ -8,6 +8,8 @@
 pnpm bootstrap
 pnpm dev
 ```
-想了解更多开发和部署细节， 请参考 🛠 [Dev Guidelines](https://secretflow.github.io/secretpad-frontend/dev-doc)
+
+想了解更多开发和部署细节， 请参考 🛠
+[Dev Guidelines](https://secretflow.github.io/secretpad-frontend/dev-doc)
 
 见 [CONTRIBUTING.md](CONTRIBUTING.zh-Hans.md).

apps/docs/README.md

@@ -1,4 +1,4 @@
-# sceretpad DEV docs
+# sceretpad-doc
 
 A static site base on [dumi](https://d.umijs.org).
 

apps/docs/docs/dev-doc/index.md

@@ -1,6 +1,6 @@
 ---
 nav:
-  title: 文档
+  title: 开发文档
   order: -1
 group:
   title: 入门

apps/docs/docs/dev-doc/qiankun.md

@@ -0,0 +1,51 @@
+---
+nav: 文档
+group:
+  title: 微前端集成
+  order: 6
+order: 1
+mobile: false
+---
+
+# qiankun
+
+支持通过 [qiankun](https://qiankun.umijs.org/zh/guide) 进行集成, 可快速将其配置为 [qiankun](https://qiankun.umijs.org/zh/guide) 的子应用。
+
+只需要在 `platform/config.ts` 中开启如下配置即可
+
+```ts
+export default defineConfig({
+  plugins: ['@umijs/plugins/dist/qiankun'],
+  qiankun: {
+    slave: {},
+  },
+});
+```
+
+如果你的主应用项目是基于 `Umi` 开发的，可以开启以下配置接入子应用, 具体可参考 [UmiJS 文档](https://umijs.org/docs/max/micro-frontend)
+
+```ts
+export default defineConfig({
+  qiankun: {
+    master: {
+      apps: [
+        {
+          name: 'secretpad',
+          entry: '//localhost:8009', // 子应用启动的服务
+        },
+      ],
+    },
+  },
+  routes: [
+    {
+      name: 'secretpad',
+      path: '/secretpad/*',
+      microApp: 'secretpad',
+    },
+  ],
+});
+```
+
+在你的主应用项目中，访问 `/secretpad/*` 路由即可看到平台被成功接入。
+
+如果你的主应用不是基于 `Umi` 开发的, 接入子应用请参考 [qiankun 文档](https://qiankun.umijs.org/zh/guide)

apps/docs/package.json

@@ -6,7 +6,8 @@
     "start": "pnpm run dev",
     "dev": "PORT=8001 dumi dev",
     "build": "dumi build",
-    "prepare": "dumi setup"
+    "prepare": "dumi setup",
+    "preview": "dumi preview"
   },
   "authors": [],
   "license": "MIT",

apps/platform/config/config.ts

@@ -44,7 +44,7 @@ export default defineConfig({
   //   apps: [
   //     {
   //       name: 'secretpad', // 后端应用名
-  //       tag: 'feat/cx_merge', // 分支 tag
+  //       tag: 'release/0.6.0b0_cml', // 分支 tag
   //       source: 'ZAPPINFO', // 应用来源，默认 ZAPPINFO，其他来源可在官网的应用信息中查看
   //     },
   //   ],

apps/platform/package.json

@@ -1,5 +1,6 @@
 {
   "private": true,
+  "name": "secretpad",
   "scripts": {
     "dev": "umi dev",
     "build": "umi build",

apps/platform/src/components/datatable-preview.tsx

@@ -7,6 +7,8 @@ import { getProjectDatatable } from '@/services/secretpad/ProjectController';
 
 import styles from './datatable-preview.less';
 import { EdgeAuthWrapper } from './edge-wrapper-auth';
+import { useLocation } from 'umi';
+import { openNewTab } from '@/util/path';
 
 interface DatatablePreviewInterface {
   // tableInfo: Record<string, any>;
@@ -65,7 +67,7 @@ export const DatatablePreview = (props: DatatablePreviewInterface) => {
       getDatatableInfo(props.node?.nodeId || '', props?.datatableId || '');
     }
   }, [popoverOpen]);
-
+  const { pathname } = useLocation();
   const content = (
     <>
       <Table
@@ -79,10 +81,8 @@ export const DatatablePreview = (props: DatatablePreviewInterface) => {
         <EdgeAuthWrapper>
           <Link
             onClick={() => {
-              const a = document.createElement('a');
-              a.href = `/node?nodeId=${props.node.nodeId}&tab=data-management`;
-              a.target = '_blank';
-              a.click();
+              const serarch = `nodeId=${props.node.nodeId}&tab=data-management`;
+              openNewTab(pathname, '/node', serarch);
             }}
           >
             查看全部

apps/platform/src/components/platform-wrapper.tsx

@@ -22,8 +22,8 @@ export const EdgeRouteWrapper = (props: { children?: React.ReactNode }) => {
  * 判断当前是不是p2p 的工作台页面
  * @returns boolean
  */
-export const isP2PWorkbench = () => {
-  const { pathname, search } = window.location;
+export const isP2PWorkbench = (pathname: string) => {
+  const { search } = window.location;
   const { tab } = parse(search);
   return pathname === '/edge' && tab === 'workbench';
 };

apps/platform/src/modules/component-config/config-item-render/config-render-contribution.ts

@@ -106,6 +106,10 @@ export class DefaultConfigRender implements ConfigRenderProtocol {
         canHandle: (node: AtomicConfigNode) => (node.type === 'AT_STRING' ? 1 : false),
         component: DefaultInput,
       },
+      {
+        canHandle: (node: AtomicConfigNode) => (node.type === 'AT_PARTY' ? 1 : false),
+        component: DefaultNodeSelect,
+      },
     ];
   }
 }

apps/platform/src/modules/component-config/template-quick-config/quick-config-psi.tsx

@@ -5,14 +5,13 @@ import { parse } from 'query-string';
 import type { Dispatch, SetStateAction } from 'react';
 import { useState, useEffect } from 'react';
 import { useLocation } from 'umi';
+import { MultiTableFeatureSelection } from '../config-item-render/default-feature-selection/table-feature-selection';
 
 import {
   getProject,
   getProjectDatatable,
 } from '@/services/secretpad/ProjectController';
 
-import { MultiTableFeatureSelection } from '../config-item-render/default-feature-selection/table-feature-selection';
-
 import styles from './index.less';
 
 const { Option } = Select;
@@ -40,6 +39,13 @@ export const QuickConfigPSIComponent = (props: QuickConfigPSIComponentProps) =>
   const { search } = useLocation();
   const { projectId } = parse(search) as { projectId: string };
 
+  const [nodeOptions, setNodeOptions] = useState<
+    {
+      label: string;
+      value: string;
+    }[]
+  >([]);
+
   const [selectedTableInfo, setSelectedTableInfo] = useState<
     {
       datatableId: string;
@@ -85,6 +91,14 @@ export const QuickConfigPSIComponent = (props: QuickConfigPSIComponentProps) =>
     }[];
 
     if (tableSelected.length > 1) setSelectedTableInfo(tableSelected);
+    if (tableSelected.length > 0) {
+      setNodeOptions(
+        tableSelected.map((table) => ({
+          value: table.nodeId as string,
+          label: table.nodeName as string,
+        })),
+      );
+    }
   }, [selectedReceiver, selectedSender, projectId]);
 
   useEffect(() => {
@@ -279,7 +293,24 @@ export const QuickConfigPSIComponent = (props: QuickConfigPSIComponentProps) =>
           ))
         }
       </Form.List>
-
+      {type === 'MPC' && (
+        <Form.Item
+          name={'leftSide'}
+          label={<div className={styles.configItemLabel}>左表节点</div>}
+          required
+          messageVariables={{ label: '左表节点' }}
+          valuePropName="value"
+          getValueProps={(value) => {
+            return { value: value?.ss };
+          }}
+          tooltip={'和允许求交键重复的求交类型搭配使用'}
+          getValueFromEvent={(value) => {
+            return { ss: [value] };
+          }}
+        >
+          <Select options={nodeOptions} />
+        </Form.Item>
+      )}
       {type === 'MPC' && (
         <Form.Item
           name="featureSelects"

apps/platform/src/modules/component-config/template-quick-config/quick-config-risk.tsx

@@ -104,38 +104,12 @@ export const QuickConfigRisk = () => {
 
   return (
     <>
-      <QuickConfigPSIComponent tables={tables} tableList={tableList} form={form} />
-
-      <Form.Item
-        name="featureSelects"
-        label={<div className={styles.configItemLabel}>选择特征</div>}
-        required
-        messageVariables={{ msg: '请选择特征列' }}
-        rules={[
-          {
-            required: true,
-            message: '${msg}',
-            validator: (_, val) => {
-              if (!val || val.length === 0) return Promise.reject(new Error('${msg}'));
-
-              return Promise.resolve();
-            },
-          },
-        ]}
-        getValueProps={(value) => {
-          return { value: value?.ss };
-        }}
-        getValueFromEvent={(value) => {
-          return { ss: value };
-        }}
-      >
-        <MultiTableFeatureSelection
-          tableKeys={selectedTableInfo}
-          size={'small'}
-          rules={{ min: 1 }}
-        />
-      </Form.Item>
-
+      <QuickConfigPSIComponent
+        type="MPC"
+        tables={tables}
+        tableList={tableList}
+        form={form}
+      />
       <Form.Item
         name="labelSelects"
         label={<div className={styles.configItemLabel}>选择标签</div>}

apps/platform/src/modules/component-config/utils.ts

@@ -48,6 +48,7 @@ export const typesMap: Record<AtomicParameterType, keyof AtomicParameter> = {
   AT_FLOATS: 'fs',
   AT_INTS: 'i64s',
   AT_STRINGS: 'ss',
+  AT_PARTY: 'ss',
   AT_SF_TABLE_COL: 'ss',
   // AT_UNDEFINED: undefined,
 };

apps/platform/src/modules/component-tree/component-protocol.ts

@@ -14,7 +14,8 @@ export type AtomicParameterType =
   | 'AT_BOOLS'
   // Special types.
   // | 'ATTR_TYPE_UNSPECIFIED'
-  | 'AT_SF_TABLE_COL';
+  | 'AT_SF_TABLE_COL'
+  | 'AT_PARTY';
 
 // export const ColSelectionParameter = 'AT_SF_TABLE_COL';