nsgm-cli 2.1.13 → 2.1.15

package/client/redux/template/manage/actions.ts

@@ -1,171 +1,160 @@
 import * as types from './types'
-import { getTemplateService, addTemplateService, updateTemplateService, deleteTemplateService, searchTemplateService, batchDeleteTemplateService } from '@/service/template/manage'
+import {
+  getTemplateService,
+  addTemplateService,
+  updateTemplateService,
+  deleteTemplateService,
+  searchTemplateService,
+  batchDeleteTemplateService,
+} from '@/service/template/manage'
 import { AppDispatch } from '@/redux/store'
 
-export const getTemplate = (page=0, pageSize=10) => (
-  dispatch: AppDispatch
-) => {
-  dispatch({
-    type: types.GET_TEMPLATE
-  })
+export const getTemplate =
+  (page = 0, pageSize = 10) =>
+  (dispatch: AppDispatch) => {
+    dispatch({
+      type: types.GET_TEMPLATE,
+    })
 
-  getTemplateService(page, pageSize)
-    .then((res: any) => {
-      //console.log('action_res', res)
-      const { data } = res
-      dispatch({
-        type: types.GET_TEMPLATE_SUCCEEDED,
-        payload: {
-          template: data.template
-        }
+    getTemplateService(page, pageSize)
+      .then((res: any) => {
+        const { data } = res
+        dispatch({
+          type: types.GET_TEMPLATE_SUCCEEDED,
+          payload: {
+            template: data.template,
+          },
+        })
       })
-    })
-    .catch(() => {
-      dispatch({
-        type: types.GET_TEMPLATE_FAILED
+      .catch(() => {
+        dispatch({
+          type: types.GET_TEMPLATE_FAILED,
+        })
       })
-    })
-}
+  }
 
-export const searchTemplate = (page=0, pageSize=10, data: any) => (
-  dispatch: AppDispatch
-) => {
-  dispatch({
-    type: types.SEARCH_TEMPLATE
-  })
+export const searchTemplate =
+  (page = 0, pageSize = 10, data: any) =>
+  (dispatch: AppDispatch) => {
+    dispatch({
+      type: types.SEARCH_TEMPLATE,
+    })
 
-  searchTemplateService(page, pageSize, data)
-    .then((res: any) => {
-      //console.log('action_res', res)
-      const { data } = res
-      dispatch({
-        type: types.SEARCH_TEMPLATE_SUCCEEDED,
-        payload: {
-          template: data.templateSearch
-        }
+    searchTemplateService(page, pageSize, data)
+      .then((res: any) => {
+        const { data } = res
+        dispatch({
+          type: types.SEARCH_TEMPLATE_SUCCEEDED,
+          payload: {
+            template: data.templateSearch,
+          },
+        })
       })
-    })
-    .catch(() => {
-      dispatch({
-        type: types.SEARCH_TEMPLATE_FAILED
+      .catch(() => {
+        dispatch({
+          type: types.SEARCH_TEMPLATE_FAILED,
+        })
       })
-    })
-}
+  }
 
-export const updateSSRTemplate = (template: any) => (
-  dispatch: AppDispatch
-) => {
+export const updateSSRTemplate = (template: any) => (dispatch: AppDispatch) => {
   dispatch({
     type: types.UPDATE_SSR_TEMPLATE,
     payload: {
-      template: template
-    }
+      template: template,
+    },
   })
 }
 
-export const addTemplate = (obj:any) => (
-  dispatch: AppDispatch
-) => {
+export const addTemplate = (obj: any) => (dispatch: AppDispatch) => {
   dispatch({
-    type: types.ADD_TEMPLATE
+    type: types.ADD_TEMPLATE,
   })
 
   addTemplateService(obj)
     .then((res: any) => {
-      //console.log('action_res', res)
       const { data } = res
       const template = {
         id: data.templateAdd,
-        ...obj
+        ...obj,
       }
       dispatch({
         type: types.ADD_TEMPLATE_SUCCEEDED,
         payload: {
-          template
-        }
+          template,
+        },
       })
     })
     .catch(() => {
       dispatch({
-        type: types.ADD_TEMPLATE_FAILED
+        type: types.ADD_TEMPLATE_FAILED,
       })
     })
 }
 
-export const modTemplate = (id: number, obj: any) => (
-  dispatch: AppDispatch
-) => {
+export const modTemplate = (id: number, obj: any) => (dispatch: AppDispatch) => {
   dispatch({
-    type: types.MOD_TEMPLATE
+    type: types.MOD_TEMPLATE,
   })
 
   updateTemplateService(id, obj)
-    .then((res: any) => {
-      console.log('action_res', res)
+    .then((_res: any) => {
       const template = {
         id,
-        ...obj
+        ...obj,
       }
       dispatch({
         type: types.MOD_TEMPLATE_SUCCEEDED,
         payload: {
-          template
-        }
+          template,
+        },
       })
     })
     .catch(() => {
       dispatch({
-        type: types.MOD_TEMPLATE_FAILED
+        type: types.MOD_TEMPLATE_FAILED,
       })
     })
 }
 
-export const delTemplate = (id: number) => (
-  dispatch: AppDispatch
-) => {
+export const delTemplate = (id: number) => (dispatch: AppDispatch) => {
   dispatch({
-    type: types.DEL_TEMPLATE
+    type: types.DEL_TEMPLATE,
   })
 
   deleteTemplateService(id)
-    .then((res: any) => {
-      console.log('action_res', res)
-
+    .then((_res: any) => {
       dispatch({
         type: types.DEL_TEMPLATE_SUCCEEDED,
         payload: {
-          id
-        }
+          id,
+        },
       })
     })
     .catch(() => {
       dispatch({
-        type: types.DEL_TEMPLATE_FAILED
+        type: types.DEL_TEMPLATE_FAILED,
       })
     })
 }
 
-export const batchDelTemplate = (ids:any) => (
-  dispatch: AppDispatch
-) => {
+export const batchDelTemplate = (ids: any) => (dispatch: AppDispatch) => {
   dispatch({
-    type: types.BATCH_DEL_TEMPLATE
+    type: types.BATCH_DEL_TEMPLATE,
   })
 
   batchDeleteTemplateService(ids)
-    .then((res: any) => {
-      console.log('action_res', res)
-
+    .then((_res: any) => {
       dispatch({
         type: types.BATCH_DEL_TEMPLATE_SUCCEEDED,
         payload: {
-          ids
-        }
+          ids,
+        },
       })
     })
     .catch(() => {
       dispatch({
-        type: types.BATCH_DEL_TEMPLATE_FAILED
+        type: types.BATCH_DEL_TEMPLATE_FAILED,
       })
     })
-}
+}

package/client/redux/template/manage/reducers.ts

@@ -5,112 +5,100 @@ const initialState = {
   firstLoadFlag: true,
   template: {
     totalCounts: 0,
-    items: []
-  }
+    items: [],
+  },
 }
 
 export const templateManageReducer = (state = initialState, { type, payload }) => {
   const { template } = state
   const { totalCounts, items } = template
-  let newItems:any = []
+  let newItems: any = []
 
   switch (type) {
     case types.UPDATE_SSR_TEMPLATE:
-      //console.log('reducer_payload_ssr', payload)
       return {
         ...state,
         firstLoadFlag: true,
-        template: payload.template
+        template: payload.template,
       }
     case types.GET_TEMPLATE_SUCCEEDED:
-      //console.log('reducer_payload_get', payload)
       return {
         ...state,
         firstLoadFlag: false,
-        template: payload.template
+        template: payload.template,
       }
     case types.SEARCH_TEMPLATE_SUCCEEDED:
-      console.log('reducer_payload_search', payload)
       return {
         ...state,
         firstLoadFlag: false,
-        template: payload.template
+        template: payload.template,
       }
     case types.ADD_TEMPLATE_SUCCEEDED:
-      //console.log('reducer_payload_add', payload)
       newItems = [...items]
       newItems.push(payload.template)
-
-      //console.log('newItems-add', newItems)
       return {
         ...state,
         firstLoadFlag: false,
         template: {
           totalCounts: totalCounts + 1,
-          items: newItems
-        }
+          items: newItems,
+        },
       }
     case types.MOD_TEMPLATE_SUCCEEDED:
-      //console.log('reducer_payload_mod', payload)
       const modItem = payload.template
 
-      _.each(items, (item:any, index) => { 
+      _.each(items, (item: any) => {
         if (item.id == modItem.id) {
           newItems.push(modItem)
-        } else { 
+        } else {
           newItems.push(item)
         }
       })
-
-      //console.log('newItems-mod', newItems)
       return {
         ...state,
         firstLoadFlag: false,
         template: {
           totalCounts: totalCounts,
-          items: newItems
-        }
+          items: newItems,
+        },
       }
     case types.DEL_TEMPLATE_SUCCEEDED:
-      //console.log('reducer_payload_del', payload)
       const delItemId = payload.id
 
-      _.each(items, (item:any, index) => { 
-        if (item.id != delItemId) { 
+      _.each(items, (item: any) => {
+        if (item.id != delItemId) {
           newItems.push(item)
         }
       })
 
-      //console.log('newItems-del', newItems)
       return {
         ...state,
         firstLoadFlag: false,
         template: {
           totalCounts: totalCounts - 1,
-          items: newItems
-        }
+          items: newItems,
+        },
       }
     case types.BATCH_DEL_TEMPLATE_SUCCEEDED:
       const delItemIds = payload.ids
-      const allIds = _.map(_.map(items, (item) => _.pick(item, ['id'])), 'id')
+      const allIds = _.map(
+        _.map(items, (item) => _.pick(item, ['id'])),
+        'id'
+      )
       const diffIds = _.xor(allIds, delItemIds)
 
-      console.log('delItemIds', delItemIds, allIds, diffIds)
-
-      newItems = _.filter(items, (item:any) => _.includes(diffIds, item.id))
+      newItems = _.filter(items, (item: any) => _.includes(diffIds, item.id))
 
       let newTotalCounts = totalCounts - delItemIds.length
-      if (newTotalCounts < 0)
-        newTotalCounts = 0
-      
-      console.log('newItems-batch-del', newItems, newTotalCounts)
+      if (newTotalCounts < 0) newTotalCounts = 0
+
       return {
         ...state,
         firstLoadFlag: false,
         template: {
           totalCounts: newTotalCounts,
-          items: newItems
-        }
+          items: newItems,
+        },
       }
     default:
       return state

package/client/redux/template/manage/types.ts

@@ -22,4 +22,4 @@ export const SEARCH_TEMPLATE_FAILED = 'SEARCH_TEMPLATE_FAILED'
 
 export const BATCH_DEL_TEMPLATE = 'BATCH_DEL_TEMPLATE'
 export const BATCH_DEL_TEMPLATE_SUCCEEDED = 'BATCH_DEL_TEMPLATE_SUCCEEDED'
-export const BATCH_DEL_TEMPLATE_FAILED = 'BATCH_DEL_TEMPLATE_FAILED'
+export const BATCH_DEL_TEMPLATE_FAILED = 'BATCH_DEL_TEMPLATE_FAILED'

package/client/service/template/manage.ts

@@ -11,20 +11,19 @@ export const getTemplateService = (page = 0, pageSize = 10) => {
 
   return getLocalGraphql(getTemplateQuery, {
     page,
-    pageSize
-  }, true) // 启用缓存，因为这是查询操作
+    pageSize,
+  })
 }
 
 export const searchTemplateByIdService = (id: number) => {
-
   const searchTemplateByIdQuery = `query ($id: Int) { templateGet(id: $id){
       id name
     }
   }`
 
   return getLocalGraphql(searchTemplateByIdQuery, {
-    id
-  }, true) // 启用缓存，因为这是查询操作
+    id,
+  })
 }
 
 export const searchTemplateService = (page = 0, pageSize = 10, data: any) => {
@@ -42,9 +41,9 @@ export const searchTemplateService = (page = 0, pageSize = 10, data: any) => {
     page,
     pageSize,
     data: {
-      name
-    }
-  }, true) // 启用缓存，因为这是查询操作
+      name,
+    },
+  })
 }
 
 export const addTemplateService = (data: any) => {
@@ -54,9 +53,9 @@ export const addTemplateService = (data: any) => {
 
   return getLocalGraphql(addTemplateQuery, {
     data: {
-      name
-    }
-  }, false) // 不使用缓存，因为这是变更操作，会自动添加 CSRF token
+      name,
+    },
+  })
 }
 
 export const updateTemplateService = (id: number, data: any) => {
@@ -67,31 +66,31 @@ export const updateTemplateService = (id: number, data: any) => {
   return getLocalGraphql(updateTemplateQuery, {
     id,
     data: {
-      name
-    }
-  }, false) // 不使用缓存，因为这是变更操作，会自动添加 CSRF token
+      name,
+    },
+  })
 }
 
 export const deleteTemplateService = (id: number) => {
   const deleteTemplateQuery = `mutation ($id: Int) { templateDelete(id: $id) }`
 
   return getLocalGraphql(deleteTemplateQuery, {
-    id
-  }, false) // 不使用缓存，因为这是变更操作，会自动添加 CSRF token
+    id,
+  })
 }
 
 export const batchAddTemplateService = (datas: any) => {
   const batchAddTemplateQuery = `mutation ($datas: [TemplateAddInput]) { templateBatchAdd(datas: $datas) }`
 
   return getLocalGraphql(batchAddTemplateQuery, {
-    datas
-  }, false) // 不使用缓存，因为这是变更操作，会自动添加 CSRF token
+    datas,
+  })
 }
 
 export const batchDeleteTemplateService = (ids: any) => {
   const batchDeleteTemplateQuery = `mutation ($ids: [Int]) { templateBatchDelete(ids: $ids) }`
 
   return getLocalGraphql(batchDeleteTemplateQuery, {
-    ids
-  }, false) // 不使用缓存，因为这是变更操作，会自动添加 CSRF token
-}
+    ids,
+  })
+}

package/client/styled/common.ts

@@ -3,7 +3,6 @@ import styled, { createGlobalStyle } from 'styled-components'
 export const GlobalStyle = createGlobalStyle`
   html,body,#__next {
     height: 100%;
-    border: 1px solid white;
   }
 
   body {
@@ -18,18 +17,18 @@ export const Container = styled.div`
 `
 
 export const LoginContainer = styled.div`
-   margin: auto;
-   margin-top: 100px;
-   width: 350px;
-   display: flex;
-   flex-direction: column;
-   justify-content: center;
-   align-items: center;
-   border: 1px solid #e8e8e8;
-   border-radius: 8px;
-   padding: 30px;
-   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-   background-color: #fff;
+  margin: auto;
+  margin-top: 100px;
+  width: 350px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #e8e8e8;
+  border-radius: 8px;
+  padding: 30px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+  background-color: #fff;
 
   .ant-form-item {
     margin-bottom: 20px;
@@ -53,4 +52,3 @@ export const Loading = styled.div`
   align-items: center;
   margin-top: 100px;
 `
-