fix bug、

config/proxy.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:00:52
- * @LastEditTime: 2022-07-26 09:31:13
+ * @LastEditTime: 2022-08-01 09:49:23
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/config/proxy.ts
@@ -15,8 +15,8 @@
 const proxy: { [key: string]: any } = {
   dev: {
     '/master': {
+      //target: 'http://192.168.50.246:7003/',
       target: 'http://112.124.59.133:7001/',
-      // target: 'http://112.124.59.133:7002/',
       changeOrigin: true,
       pathRewrite: { '^/master': '' },
     },

src/app.tsx

@@ -257,6 +257,7 @@ export function useQiankunStateForSlave() {
 export const layout = ({ initialState: { userData } }: { initialState: InitialStateType }): BasicLayoutProps => {
   return {
     headerRender: false,
+    
     rightContentRender: () => <>right</>,
     footerRender: () => null,
     onPageChange: () => {

src/components/KCModal/index.tsx

@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2022-01-12 15:26:43
- * @LastEditTime: 2022-02-14 08:57:17
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-08-01 10:57:12
+ * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/components/KCModal/index.tsx
  */
@@ -30,6 +30,7 @@ const KCModal: React.FC<KCModalType.KCModalProps> = ({
         bodyStyle: {
           maxHeight: '72vh',
           overflowY: 'auto',
+          overflowX:'hidden'
         },
         ...modalProps,
       }}

src/components/topBar/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-16 09:12:37
- * @LastEditTime: 2022-07-14 16:07:56
+ * @LastEditTime: 2022-07-29 12:47:03
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/index/components/topBar/index.tsx
@@ -52,7 +52,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
 
   const _systemTabClickHandle = (item: TopBar.Tab) => {
     //导航栏tab点击
-    console.log('_systemTabClickHandle',item);
+    // console.log('_systemTabClickHandle',item);
     onTabClick && onTabClick(item);
     localStorage.setItem('currentSelectedTab', JSON.stringify(item));
     setCurrentSelectedTab(item);
@@ -61,6 +61,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
 
 
   const _systemListClickHandle = (data: TopBar.Tab, currentActivedBlockIndex: number, index: number, i: number) => {
+ 
     //导航栏系统菜单列表点击回调
     if (currentSelectedTab?.menuId == data.menuId) return;
 

src/global.less

@@ -17,5 +17,32 @@ input {
 }
 
 
+// div {
+//    overflow-x: hidden;
+// }
+
+
+div::-webkit-scrollbar{
+  
+  width:5px;
+  height:5px;
+  /**/
+}
+div::-webkit-scrollbar-track{
+  background:transparent;
+  border-radius:2px;
+}
+div::-webkit-scrollbar-thumb{
+  background: #bfbfbf;
+  border-radius:10px;
+}
+div::-webkit-scrollbar-thumb:hover{
+  background: rgb(136, 135, 135);
+}
+div::-webkit-scrollbar-corner{
+  background:rgb(136, 135, 135) ;
+}
+
+
 
 //--------------------

src/layouts/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-09 13:56:33
- * @LastEditTime: 2022-07-12 09:24:24
+ * @LastEditTime: 2022-07-29 12:46:45
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/layouts/index.tsx
@@ -26,7 +26,7 @@ const TopHoc = ({ currentSelectedSys, openedSysLists, navData,set_emptyPageConte
   };
 
   const onTabClickHandle = async (data: TopBar.Tab) => {
-    // console.log({data});
+  
     if(JSON.stringify(data) != '{}'){
       await setInitialState((s) => ({ ...s, currentSelectedSys: data }));
   
@@ -45,7 +45,7 @@ const TopHoc = ({ currentSelectedSys, openedSysLists, navData,set_emptyPageConte
         }else{
           localStorage.setItem('isChildShowMenu','true');
         }
-  
+     
         history.push(data.path);
       }
     }

src/pages/platform/components/menuEditer/menu.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-14 14:03:42
- * @LastEditTime: 2022-07-21 15:01:36
+ * @LastEditTime: 2022-08-01 18:06:54
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/hospManage/modals/menu.tsx
@@ -141,7 +141,7 @@ const MenuEditer: React.FC<MenuEditerType> = ({ value = [], onChange, noAction =
     return (
       <Transfer
         {...restProps}
-        listStyle={{width:100,height:600}}
+        listStyle={{width:100,height:500}}
         targetKeys={targetKeys}
         rowKey={record => record.menuId}
         dataSource={transferDataSource}
@@ -160,11 +160,13 @@ const MenuEditer: React.FC<MenuEditerType> = ({ value = [], onChange, noAction =
                 checkable
                 checkStrictly={false}
                 defaultExpandAll
-                height={600}
+                height={460}
 
                 checkedKeys={checkedKeys}
                 treeData={generateTree(dataSource, targetKeys)}
-                onCheck={(keys,{node}) => {
+                onCheck={(keys,{node,halfCheckedKeys,...rest}) => {
+
+                  // console.log({keys,node,rest});
                  
                   // 差集
                   let difference = (keys as Key[]).filter(v => !targetKeys.includes(v as string) );
@@ -183,7 +185,7 @@ const MenuEditer: React.FC<MenuEditerType> = ({ value = [], onChange, noAction =
                   }else{
                          //取消勾选
                          const cancelKeys = map(node.children,(v:any)=>v.key);
-                         onItemSelectAll([node.key,...cancelKeys] as string[],false)
+                         onItemSelectAll([node.key,...cancelKeys,...halfCheckedKeys as Key[]] as string[],false)
                   }
                   
                 }}

src/pages/platform/setting/hospManage/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-13 15:22:48
- * @LastEditTime: 2022-07-08 18:05:52
+ * @LastEditTime: 2022-07-28 16:17:38
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/hospManage/index.tsx
@@ -68,7 +68,7 @@ const HospManage: FC<PageProps> = ({ hospManageModel: state, dispatch }) => {
     },
     {
       title: '医院等级',
-      dataIndex: 'hospitalLevel',
+      dataIndex: 'hospitalLevelName',
     },
     // {
     //   title: '医院类型',

src/pages/platform/setting/hospManage/modals/modal.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-12 17:11:11
- * @LastEditTime: 2022-07-13 11:23:50
+ * @LastEditTime: 2022-08-01 10:57:31
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/userManage/modal.tsx
@@ -215,7 +215,7 @@ const ActModal: React.FC<ActModalProps> = ({ dispatch, isShowModal, tableAct, cu
       visible={isShowModal}
       onVisibleChange={onVisibleChangeHandle}
       layout="horizontal"
-      width={600}
+      // width={1000}
       initialValues={setInitialValues()}
       title={setModalTitle()}
       labelCol={{