服务目录修改

src/model/pds.js

@@ -5,6 +5,10 @@ export function* refreshCatalog(payload) {
   return yield call(pds.refreshCatalog, payload);
 }
 
+export function* loadDataServiceCatalog() {
+  return yield call(pds.loadDataServiceCatalog)
+}
+
 export function* loadStateCatalog(payload) {
   return yield call(pds.loadStateCatalog, payload);
 }

src/service/pds.js

@@ -4,6 +4,10 @@ export function refreshCatalog() {
   return GetJSON("/pdataservice/pdsCURD/refreshDataServiceCatalog")
 }
 
+export function loadDataServiceCatalog() {
+  return GetJSON("/pdataservice/pdsCURD/loadDataServiceCatalog");
+}
+
 export function loadStateCatalog(payload) {
   return GetJSON("/pdataservice/pdsCURD/loadDataServiceStateCatalog", payload)
 }

src/view/Manage/Model/Component/ModelTree.jsx

@@ -146,7 +146,7 @@ const ModelTree = (props) => {
 
     setLoading(true);
     dispatch({
-      type: (type==='refresh')?'pds.refreshCatalog':'datamodel.loadDataModelCatalog',
+      type: (type==='refresh')?'pds.refreshCatalog':'pds.loadDataServiceCatalog',
       callback: data => {
 
         data.key = data.id||'';
@@ -545,13 +545,13 @@ const ModelTree = (props) => {
           )
         }  */}
 
-        {/* {
+        {
           (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin) && isSetRootId && (
-              <Tooltip title="同步目录" className='ml-2'>
+              <Tooltip title="同步目录" className='ml-6'>
                 <Button type='text' icon={<SyncOutlined className='default' />} size='small' onClick={sync} />
               </Tooltip>
           )
-        }    */}
+        }   
       </div>
     }
       <div className='p-3'>
@@ -589,7 +589,7 @@ const ModelTree = (props) => {
             treeData={treeData} 
             selectedKeys={[item?item.key:'']} 
             titleRender={(nodeData) => {
-              return <span title={nodeData?.remark||''}>{nodeData?.name||''}</span>;
+              return <span title={nodeData?.remark||''}>{(nodeData.status===1)?`${nodeData?.name}_已下线`:nodeData?.name||''}</span>;
             }}
             onRightClick={({event, node}) => {
               if (viewSelectedKey==='dir'&& getDataModelerRole(user)===DataModelerRoleAdmin) {

src/view/Manage/Model/Component/UpdateTreeItemModal.jsx

@@ -70,6 +70,12 @@ class UpdateTreeItemForm extends React.Component {
           >
           <Input />
         </Form.Item>
+        <Form.Item 
+          label="编码" 
+          name="code"
+          >
+          <Input />
+        </Form.Item>
       </Form>
     );
   }
@@ -89,12 +95,12 @@ const UpdateTreeItemModal = (props) => {
         _action = item ? 'sub' : 'root';
       }
 
-      form.setFields([{ name: 'name', errors: [] }, { name: 'remark', errors: [] }]);
+      form.setFields([{ name: 'name', errors: [] }, { name: 'remark', errors: [] }, { name: 'code', errors: [] }]);
 
       if (type === 'add') {
-        form.setFieldsValue({ action: _action, name: '', remark: '' });
+        form.setFieldsValue({ action: _action, name: '', remark: '', code: '' });
       } else {
-        form.setFieldsValue({ action: '', name: item?item.name:'', remark: item?item.remark:'' });
+        form.setFieldsValue({ action: '', name: item?item.name:'', remark: item?item.remark:'', code: item?.code });
       }
     }
     //eslint-disable-next-line react-hooks/exhaustive-deps
@@ -112,12 +118,14 @@ const UpdateTreeItemModal = (props) => {
         payload = {
           name: values.name||'',
           remark: values.remark||'',
+          code: values.code||'',
           parentId: rootId
         };
       } else if (type === 'add') {
         payload = {
           name: values.name||'',
           remark: values.remark||'', 
+          code: values.code||'',
           parentId: item.id
         };
       } else {
@@ -125,6 +133,7 @@ const UpdateTreeItemModal = (props) => {
           ...item,
           name: values.name||'',
           remark: values.remark||'', 
+          code: values.code||'',
         }
       }