报表动态

src/model/assetmanage.js

@@ -276,3 +276,19 @@ export function* getDirectoryChild(payload) {
 export function* queryCustomTypeRootDirectory() {
   return yield call(service.queryCustomTypeRootDirectory);
 }
+
+export function* listSupportReportTypes() {
+  return yield call(service.listSupportReportTypes)
+}
+
+export function* listWorkbooksByType(payload) {
+  return yield call(service.listWorkbooksByType, payload)
+}
+
+export function* getViewUrlByWorkbookId(payload) {
+  return yield call(service.getViewUrlByWorkbookId, payload)
+}
+
+export function* saveWorkbookByType(payload) {
+  return yield call(service.saveWorkbookByType, payload)
+}
\ No newline at end of file

src/service/dataassetmanager.js

@@ -283,3 +283,19 @@ export function getDirectoryChild(payload) {
 export function queryCustomTypeRootDirectory() {
   return GetJSON("/dataassetmanager/directoryApi/queryCustomTypeRootDirectory");
 }
+
+export function listSupportReportTypes() {
+  return GetJSON("/dataassetmanager/reportApi/listSupportReportTypes")
+}
+
+export function listWorkbooksByType(payload) {
+  return GetJSON("/dataassetmanager/reportApi/listWorkbooks", payload)
+}
+
+export function getViewUrlByWorkbookId(payload) {
+  return GetJSON("/dataassetmanager/reportApi/getViewUrlByWorkbookId", payload)
+}
+
+export function saveWorkbookByType(payload) {
+  return PostJSON("/dataassetmanager/reportApi/saveWorkbook", payload)
+}
\ No newline at end of file

src/view/Manage/AssetManage/Component/AssetTable.jsx

@@ -151,6 +151,8 @@ const AssetTable = (props) => {
   const [ worksheetModalVisible, setWorksheetModalVisible ] = useState(false);
   const [ workbookDrawerVisible, setWorkbookDrawerVisible ] = useState(false);
   const [ biType, setBiType ] = useState('');
+  const [ reportTypes, setReportTypes ] = useState();
+  const [ report, setReport ] = useState();
 
   const [ modal, contextHolder ] = Modal.useModal();
   const anchorId = getQueryParam(AnchorId, props.location.search);
@@ -202,6 +204,8 @@ const AssetTable = (props) => {
     if (reference===AssetRecycleReference) {
       getFilterElementsGroupThenGetDataAssets();
     }
+
+    getReportTypes()
     //eslint-disable-next-line react-hooks/exhaustive-deps
   }, [ env ])
 
@@ -219,6 +223,15 @@ const AssetTable = (props) => {
     }
   })
 
+  const getReportTypes = () => {
+    dispatch({
+      type: 'assetmanage.listSupportReportTypes',
+      callback: data => {
+        setReportTypes(data)
+      }
+    });
+  }
+
   const getDataAssetLocation = () => {
     setLoading(true);
     dispatch({
@@ -538,6 +551,22 @@ const AssetTable = (props) => {
     setFilterElementVisible(true);
   }
 
+  const onReportAnalyseClick = (val) => {
+    if ((checkedKeys||[]).length === 0) {
+      showMessage('warn', '请先选择一个资产');
+    } else if ((checkedKeys||[]).length > 1)  {
+      showMessage('warn', '只能选择一个资产');
+    } else {
+      setReport(val);
+      setWorksheetModalVisible(true);
+    }
+  }
+
+  const onReportWorkbookClick = (val) => {
+    setReport(val);
+    setWorkbookDrawerVisible(true);
+  }
+
   const onTableauAnalyseClick = () => {
     if ((checkedKeys||[]).length === 0) {
       showMessage('warn', '请先选择一个资产');
@@ -828,35 +857,20 @@ const AssetTable = (props) => {
       </Menu.Item>
 
       {
-        (reference===AssetManageReference) && <Menu.Item disabled={(checkedKeys||[]).length===0}>
-          <div className='text-center' onClick={onTableauAnalyseClick}>
-            tableau自助分析
-          </div>
-        </Menu.Item>
-      }
-
-      {
-        (reference===AssetManageReference) && <Menu.Item>
-          <div className='text-center' onClick={onTableauWorkbookClick}>
-          tableau工作簿
-          </div>
-        </Menu.Item>
-      }
-
-      {
-        (reference===AssetManageReference) && <Menu.Item disabled={(checkedKeys||[]).length===0}>
-          <div className='text-center' onClick={onSmartBIAnalyseClick}>
-            smartBI自助分析
+        reference===AssetManageReference && reportTypes?.map(item => 
+          <React.Fragment key={item.code}>
+            <Menu.Item disabled={(checkedKeys||[]).length===0}>
+              <div className='text-center' onClick={() => { onReportAnalyseClick(item) }}>
+                {`${item.name}自助分析`}
               </div>
             </Menu.Item>
-      }
-
-      {
-        (reference===AssetManageReference) && <Menu.Item>
-          <div className='text-center' onClick={onSmartBIWorkbookClick}>
-          smartBI工作簿
+            <Menu.Item>
+              <div className='text-center' onClick={() => { onReportWorkbookClick(item)}}>
+              {`${item.name}工作簿`}
               </div>
             </Menu.Item>
+          </React.Fragment>
+        )
       }
     </Menu>
   );
@@ -875,26 +889,22 @@ const AssetTable = (props) => {
           可见列设置
         </div>
       </Menu.Item>
+      {
+        reportTypes?.map(item => 
+          <React.Fragment key={item.code}>
             <Menu.Item disabled={(checkedKeys||[]).length===0}>
-        <div className='text-center' onClick={onTableauAnalyseClick}>
-          tableau自助分析
-        </div>
-      </Menu.Item>
-      <Menu.Item>
-        <div className='text-center' onClick={onTableauWorkbookClick}>
-        tableau工作簿
-        </div>
-      </Menu.Item>
-      <Menu.Item disabled={(checkedKeys||[]).length===0}>
-        <div className='text-center' onClick={onSmartBIAnalyseClick}>
-          smartBI自助分析
+              <div className='text-center' onClick={() => { onReportAnalyseClick(item) }}>
+                {`${item.name}自助分析`}
               </div>
             </Menu.Item>
             <Menu.Item>
-        <div className='text-center' onClick={onSmartBIWorkbookClick}>
-        smartBI工作簿
+              <div className='text-center' onClick={() => { onReportWorkbookClick(item)}}>
+              {`${item.name}工作簿`}
               </div>
             </Menu.Item>
+          </React.Fragment>
+        )
+      }
     </Menu>
   );
 
@@ -1089,7 +1099,7 @@ const AssetTable = (props) => {
         onCancel={onAssetDetailDrawerCancel}
       />
       <WorksheetModal 
-        type={biType}
+        report={report}
         visible={ worksheetModalVisible }
         id={ (checkedKeys||[]).length>0?checkedKeys[0]:'' }
         metadata={ (checkedItems||[]).length>0?checkedItems[0].metadata:{} }
@@ -1097,7 +1107,7 @@ const AssetTable = (props) => {
       />
 
       <WorkbookDrawer
-        type={biType}
+        report={report}
         visible={workbookDrawerVisible}
         onCancel={onWorkbookDrawerCancel}
       />

src/view/Manage/AssetManage/Component/WorkbookDrawer.jsx

@@ -4,7 +4,7 @@ import { Drawer, Pagination, List } from 'antd';
 import { dispatch } from '../../../../model';
 
 const WorkbookDrawer = (props) => {
-  const { onCancel, visible, type = 'tableau' } = props;
+  const { onCancel, visible, report } = props;
 
   const [ loading, setLoading ] = useState(false);
   const [ workbooks, setWorkbooks ] = useState([]);
@@ -25,13 +25,13 @@ const WorkbookDrawer = (props) => {
   const getWorkbooks = (p = 1, s = 20) => {
     setLoading(true);
 
-    const url = (type==='tableau') ? 'assetmanage.listWorkbooks' : 'assetmanage.listSmartBIWorkbooks';
 
     dispatch({
-      type: url,
+      type: 'assetmanage.listWorkbooksByType' ,
       payload: {
         pageNum: p,
-        pageSize: s
+        pageSize: s,
+        type: report?.code,
       },
       callback: data => {
         setLoading(false);
@@ -57,10 +57,8 @@ const WorkbookDrawer = (props) => {
   // }
 
   const onDevelopClick = (id) => {
-    const url = (type==='tableau') ? 'assetmanage.getWorkbookUrl' : 'assetmanage.getSmartBIWorkbookUrl';
-
     dispatch({
-      type: url,
+      type: 'assetmanage.getViewUrlByWorkbookId',
       payload: {
         workbookId: id,
       },
@@ -74,7 +72,7 @@ const WorkbookDrawer = (props) => {
     <Drawer 
       forceRender
       visible={ visible }
-      title={`${type}工作簿`}
+      title={`${report?.name}工作簿`}
       width={900}
       placement="right"
       closable={ true }

src/view/Manage/AssetManage/Component/WorksheetModal.jsx

@@ -6,16 +6,22 @@ import { showMessage } from '../../../../util';
 
 const WorksheetModal = (props) => {
 
-  const { onCancel, visible, id, type = 'tableau', metadata = {} } = props;
+  const { onCancel, visible, id, report, metadata = {} } = props;
   const [ confirmLoading, setConfirmLoading ] = useState(false);
 
   const [ form ] = Form.useForm();
 
   useEffect(() => {
     if (visible) {
-      form?.setFieldsValue({ tableName: metadata?.tableName, columnNames: metadata?.columnItems?.map(item => item.metadataColumnName) }); 
+      form?.setFieldsValue({ tableName: metadata?.tableName, columnNames: metadata?.columnItems?.map(item => {
+        return {
+          cnName: item.metadataColumnCnName,
+          metadataColumnId: item.metadataColumnId,
+          name: item.metadataColumnName
         }
-  }, [visible, type])
+      }) }); 
+    }
+  }, [visible, report, metadata])
 
   const onOk = async() => {
     try {
@@ -23,21 +29,15 @@ const WorksheetModal = (props) => {
 
       setConfirmLoading(true);
 
-      const url = (type === 'tableau') ? 'assetmanage.saveWorkbook': 'assetmanage.saveSmartBIWorkbook';
-
-      let metadataTableId = '';
-      metadata?.columnItems?.forEach(item => {
-        if (!metadataTableId) {
-          metadataTableId = item.metadataTableId;
-        }
-      })
-
       dispatch({
-        type: url,
+        type: 'assetmanage.saveWorkbookByType',
         payload: { 
           data: {
             dataAssetId:id,
-            metadataTableId,
+            metadataTableId: metadata?.metadataTableId,
+            tableName: metadata?.tableName,
+            tableCnName: metadata?.tableCnName,
+            type: report?.code,
             ...row,
           }
         },
@@ -80,7 +80,7 @@ const WorksheetModal = (props) => {
   return (
     <Modal
       forceRender
-      title='工作簿信息'
+      title={`${report?.name}工作簿信息`}
       visible={ visible }
       width={ 600 }
       onCancel={() => { 
@@ -109,10 +109,45 @@ const WorksheetModal = (props) => {
           label="字段"
           name="columnNames"
         >
-          <Checkbox.Group>
+          <ColumnsItem data={metadata?.columnItems} />
+        </Form.Item>
+        <Form.Item
+          label="元数据"
+          name="tableName"
+          hidden={true}
+        >
+          <Input />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+} 
+
+export default WorksheetModal;
+
+const ColumnsItem = ({ value, onChange, data }) => {
+  return (
+    <Checkbox.Group 
+      onChange={(checkedValue) => {
+        if ((checkedValue??[]).length === 0) {
+          onChange([])
+        } else {
+          const filterData = (data??[]).filter(item => checkedValue.includes(item.metadataColumnName))
+
+          onChange(filterData.map(item => {
+            return {
+              cnName: item.metadataColumnCnName,
+              metadataColumnId: item.metadataColumnId,
+              name: item.metadataColumnName
+            }
+          }))
+        }
+      }}
+      value={(value??[]).map(item => item.name)}
+    >
       <Row>
       {
-              metadata?.columnItems?.map((item, index) => <Col key={index} span={8}>
+        data?.map((item, index) => <Col key={index} span={8}>
           <Checkbox
             value={item.metadataColumnName}
             style={{
@@ -125,17 +160,5 @@ const WorksheetModal = (props) => {
       }
       </Row>
     </Checkbox.Group>
-        </Form.Item>
-        <Form.Item
-          label="元数据"
-          name="tableName"
-          hidden={true}
-        >
-          <Input />
-        </Form.Item>
-      </Form>
-    </Modal>
-  );
+  )
 }
\ No newline at end of file
-
-export default WorksheetModal;
\ No newline at end of file