Browse Source

数据隔离bug修复

Leo 2 years ago
parent
commit
1bcbc2aaa5

+ 10 - 0
src/module/datasource/component/DatasourceManage.jsx

@@ -32,6 +32,7 @@ import {
   lakeTablePreview,
   lakeSchema,
 } from '../services'
+import moment from 'moment'
 
 const { Option } = Select
 const { TabPane } = Tabs
@@ -139,6 +140,9 @@ const DatasourceManage = ({ dataType }, ref) => {
           key: item.id,
           database_name: item.database_name,
           datatable_name: item.table_name,
+          create_time: moment(item.create_time * 1000).format(
+            'YYYY.MM.DD HH:mm:ss'
+          ),
         }
       })
       setLakeDataList(list)
@@ -459,6 +463,12 @@ const DatasourceManage = ({ dataType }, ref) => {
       key: 'datatable_name',
       align: 'center',
     },
+    {
+      title: '导入时间',
+      dataIndex: 'create_time',
+      key: 'create_time',
+      align: 'center',
+    },
     {
       title: '操作',
       key: 'operation',

+ 6 - 3
src/module/datasource/page/DatasourceView.jsx

@@ -149,7 +149,6 @@ export default function DatasourceView() {
   )
 
   const createAilabTable = () => {
-    console.log()
     ailabtableForm
       .validateFields()
       .then(async () => {
@@ -172,7 +171,6 @@ export default function DatasourceView() {
         }
       })
       .catch(err => {
-        console.log(err)
         message.error('请检查表单数据是否完整')
       })
   }
@@ -204,7 +202,12 @@ export default function DatasourceView() {
         ailabtableForm.resetFields()
         setIsCreateTable(false)
       }}>
-      <Form form={ailabtableForm} {...formItemLayout}>
+      <Form
+        form={ailabtableForm}
+        {...formItemLayout}
+        initialValues={{
+          database_field: [{ column_name: null, Column_type: null }],
+        }}>
         <FormItem
           name="table_name"
           label="数据表名称"

+ 9 - 1
src/module/layout/Main.jsx

@@ -236,6 +236,7 @@ const Main = () => {
         project_id: sessionStorage.getItem('project_id'),
       })
       if (data.code === 200) {
+        message.success('修改成功')
         getAllProjects()
       } else {
         message.error(data.msg)
@@ -386,8 +387,15 @@ const Main = () => {
             title="确认移除?"
             okText="确认"
             cancelText="取消"
+            disabled={sessionStorage.getItem('user_id') === String(record.key)}
             onConfirm={() => removeUser(record.key)}>
-            <Button type="link">移除</Button>
+            <Button
+              type="link"
+              disabled={
+                sessionStorage.getItem('user_id') === String(record.key)
+              }>
+              移除
+            </Button>
           </Popconfirm>
         </Space>
       ),