vesoft-inc · huaxiabuluo · Jan 3, 2023 · Dec 29, 2022 · Dec 29, 2022 · Dec 29, 2022
diff --git a/app/config/locale/en-US.json b/app/config/locale/en-US.json
@@ -194,7 +194,9 @@
     "importYaml": "Import the YAML file",
     "templateMatchError": "The {type} in the configuration does not match the current login account/host",
     "uploadSuccessfully": "Upload files successfully.",
-    "fileSizeLimit": "The file is too large and exceeds the upload limit({size}), please modify the MaxBytes in the startup configuration file and restart the service"
+    "fileSizeLimit": "The file is too large and exceeds the upload limit({size}), please modify the MaxBytes in the startup configuration file and restart the service",
+    "noHttp": "The address in the configuration file does not support http protocol, please remove http(s)://",
+    "addressMatch": "The address in the configuration file must contain the Graph address of current login connection. Separate multiple addresses with "
   },
   "schema": {
     "spaceList": "Graph Space List",
@@ -264,7 +266,9 @@
     "danglingEdge": "Dangling edge",
     "showDDL": "View Schema DDL",
     "downloadNGQL": "Download.nGQL",
-    "getDDLError": "Failed to get the schema DDL, Please try again"
+    "getDDLError": "Failed to get the schema DDL, Please try again",
+    "totalVertices": "Total Vertices Count",
+    "totalEdges": "Total Edges Count"
   },
   "empty": {
     "stats": "No Statistics Data",

diff --git a/app/config/locale/zh-CN.json b/app/config/locale/zh-CN.json
@@ -194,7 +194,9 @@
     "importYaml": "导入 YAML 文件",
     "templateMatchError": "配置中的{type}与当前登录账号/地址不匹配",
     "uploadSuccessfully": "上传文件成功",
-    "fileSizeLimit": "文件过大，超过上传限制({size})，请修改启动配置文件中的 MaxBytes 并重启服务"
+    "fileSizeLimit": "文件过大，超过上传限制({size})，请修改启动配置文件中的 MaxBytes 并重启服务",
+    "noHttp": "配置文件中的 address 不支持携带 http 协议，请去除 http(s)://",
+    "addressMatch": "配置文件中的 address 字段必须包含当前登录的 Graph 地址。多个地址用“,”隔开。"
   },
   "schema": {
     "spaceList": "图空间列表",
@@ -264,7 +266,9 @@
     "danglingEdge": "悬挂边",
     "showDDL": "查看 Schema DDL",
     "downloadNGQL": "下载 .NGQL 文件",
-    "getDDLError": "获取 Schema DDL 失败, 请重试"
+    "getDDLError": "获取 Schema DDL 失败, 请重试",
+    "totalVertices": "总计点数量",
+    "totalEdges": "总计边数量"
   },
   "empty": {
     "stats": "暂无统计数据",

diff --git a/app/pages/Console/ExportModal.tsx b/app/pages/Console/ExportModal.tsx
@@ -28,18 +28,19 @@ const ExportModal = (props: IProps) => {
   const { headers, tables } = data;
   const { intl } = useI18n();
   const handleExport = (values) => {
-    const { type, vertexId, srcId, dstId, edgeType, rank } = values;
+    const { type, vertexIds, srcId, dstId, edgeType, rank } = values;
     const vertexes =
       type === 'vertex'
-        ? tables
-          .map(vertex => {
-            if (vertex.type === 'vertex') {
-              return vertex.vid;
-            } else {
-              return vertex[vertexId].toString();
-            }
-          })
-          .filter(vertexId => vertexId !== '')
+        ? tables.reduce((acc, cur) => {
+          if (cur.type === 'vertex') {
+            acc.push(cur.vid);
+          } else {
+            vertexIds.forEach(id => {
+              acc.push(cur[id].toString());
+            });
+          }
+          return acc;
+        }, []).filter(vertexId => vertexId !== '')
         : tables
           .map(edge => [edge[srcId], edge[dstId]])
           .flat()
@@ -90,8 +91,8 @@ const ExportModal = (props: IProps) => {
             const type = getFieldValue('type');
             return type === 'vertex' ? <>
               <p>{intl.get('console.exportVertex')}</p>
-              <Form.Item label="vid" name="vertexId" rules={[{ required: true, message: intl.get('formRules.vidRequired') }]}>
-                <Select>
+              <Form.Item label="vid" name="vertexIds" rules={[{ required: true, message: intl.get('formRules.vidRequired') }]}>
+                <Select mode="multiple" allowClear>
                   {headers.map(i => (
                     <Option value={i} key={i}>
                       {i}

diff --git a/app/pages/Import/TaskList/TemplateModal/index.tsx b/app/pages/Import/TaskList/TemplateModal/index.tsx
@@ -39,6 +39,9 @@ const TemplateModal = (props: IProps) => {
       const parseContent = yaml.load(content);
       if(typeof parseContent === 'object') {
         const connection = parseContent.clientSettings?.connection || {};
+        if(connection.address.startsWith('http')) {
+          throw new Error(intl.get('import.noHttp'));
+        }
         if(connection.address !== host) {
           throw new Error(intl.get('import.templateMatchError', { type: 'address' }));
         }
@@ -50,6 +53,17 @@ const TemplateModal = (props: IProps) => {
             throw new Error(intl.get('import.fileNotExist', { name: file.path }));
           }
         });
+        // empty props in yaml will converted to null, but its required in nebula-importer
+        parseContent.files.forEach(file => {
+          if(file.schema.edge) {
+            file.schema.edge.props = file.schema.edge?.props || [];
+          }
+          if(file.schema.vertex) {
+            file.schema.vertex?.tags.forEach(tag => {
+              tag.props = tag.props || [];
+            });
+          }
+        });
         setConfig(JSON.stringify(parseContent, null, 2));
         form.setFieldsValue({
           name: `task-${Date.now()}`,

diff --git a/app/pages/Schema/SchemaConfig/List/SpaceStats/index.module.less b/app/pages/Schema/SchemaConfig/List/SpaceStats/index.module.less
@@ -1,20 +1,28 @@
 @import '~@app/common.less';
 .nebulaStats {
-  .operations {
+  .row {
     margin: 20px 0 17px;
+    font-size: 14px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .operations {
     display: flex;
     align-items: center;
-    font-size: 14px;
     :global(.ant-btn) {
       width: 110px;
     }
-    .label, .tip{
-      margin-left: 30px;
-      color: @darkGray;
-    }
-    .label::after {
-      content: ": ";
-      padding-right: 5px;
-    }
+  }
+  .label, .tip{
+    margin-left: 30px;
+    color: @darkGray;
+  }
+  .label::after {
+    content: ": ";
+    padding-right: 5px;
+  }
+  .totalItem {
+    display: inline-block;
   }
 }
diff --git a/app/pages/Schema/SchemaConfig/List/SpaceStats/index.tsx b/app/pages/Schema/SchemaConfig/List/SpaceStats/index.tsx
@@ -14,7 +14,17 @@ const SpaceStats = () => {
   const timer = useRef<NodeJS.Timeout | null>(null);
   const { intl } = useI18n();
   const { schema: { getJobStatus, submitStats, getStats, currentSpace } } = useStore();
-  const [data, setData] = useState([]);
+  const [data, setData] = useState<{
+    list: {
+      Type: string,
+      Name: string,
+      Count: number,
+    }[],
+    total: {
+      vertices: number,
+      edges: number,
+    } | null
+  } | null>(null);
   const [updateTime, setUpdateTime] = useState('');
   const [jobId, setJobId] = useState<any>(null);
   const [loading, setLoading] = useState(false);
@@ -44,13 +54,30 @@ const SpaceStats = () => {
   const initData = () => {
     setJobId(null);
     setUpdateTime('');
-    setData([]);
+    setData({
+      list: [],
+      total: null
+    });
   };
 
   const getData = async () => {
     const { code, data } = await getStats();
     if (code === 0) {
-      setData(data.tables);
+      const _data = data.tables.reduce((prev, cur) => {
+        if (cur.Type === 'Space') {
+          if(!prev.total) {
+            prev.total = {
+              vertex: 0,
+              edge: 0,
+            };
+          }
+          prev.total[cur.Name] = cur.Count;
+        } else {
+          prev.list.push(cur);
+        }
+        return prev;
+      }, { list: [], total: null });
+      setData(_data);
     }
   };
 
@@ -99,25 +126,37 @@ const SpaceStats = () => {
   const showTime = updateTime && jobId == null && !loading;
   return (
     <div className={styles.nebulaStats}>
-      <div className={styles.operations}>
-        <Button
-          type="primary"
-          onClick={handleSubmitStats}
-          loading={loading || jobId !== null}
-        >
-          {intl.get(updateTime ? 'schema.refresh' : 'schema.startStat')}
-        </Button>
-        {showTime ? <>
-          <span className={styles.label}>{intl.get('schema.lastRefreshTime')}</span>
-          <span>
-            {dayjs(updateTime).format('YYYY-MM-DD HH:mm:ss')}
-          </span>
-        </> : <span className={styles.tip}>
-          {intl.get('schema.statTip')}
-        </span>}
+      <div className={styles.row}>
+        <div className={styles.operations}>
+          <Button
+            type="primary"
+            onClick={handleSubmitStats}
+            loading={loading || jobId !== null}
+          >
+            {intl.get(updateTime ? 'schema.refresh' : 'schema.startStat')}
+          </Button>
+          {showTime ? <>
+            <span className={styles.label}>{intl.get('schema.lastRefreshTime')}</span>
+            <span>
+              {dayjs(updateTime).format('YYYY-MM-DD HH:mm:ss')}
+            </span>
+          </> : <span className={styles.tip}>
+            {intl.get('schema.statTip')}
+          </span>}
+        </div>
+        {data?.total && <div className={styles.totalCount}>
+          <div className={styles.totalItem}>
+            <span className={styles.label}>{intl.get('schema.totalVertices')}</span>
+            <span>{data.total.vertices}</span>
+          </div>
+          <div className={styles.totalItem}>
+            <span className={styles.label}>{intl.get('schema.totalEdges')}</span>
+            <span>{data.total.edges}</span>
+          </div>
+        </div>}
       </div>
       <Table
-        dataSource={data}
+        dataSource={data?.list || []}
         columns={columns}
         rowKey="Name"
         locale={{ emptyText: <EmptyTableTip text={intl.get('empty.stats')} tip={intl.get('empty.statsTip')} /> }}

diff --git a/app/stores/sketchModel.ts b/app/stores/sketchModel.ts
@@ -267,6 +267,7 @@ export class SketchStore {
     this.editor = new VEditor({
       dom: container,
       showBackGrid: false,
+      disableCopy: true,
       ...options
     });
     this.container = container;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "@tweenjs/tween.js": "^18.6.4",
     "@vesoft-inc/force-graph": "2.0.7",
     "@vesoft-inc/i18n": "^1.0.0",
-    "@vesoft-inc/veditor": "4.3.6",
+    "@vesoft-inc/veditor": "4.4.2",
     "accessor-fn": "^1.3.2",
     "antd": "^4.23.0",
     "axios": "^0.21.1",