create-jnrs-vue 1.2.36 → 2.0.1

package/jnrs-vue/src/api/examples/portfolio-management/project.ts

@@ -0,0 +1,125 @@
+/**
+ * @File   : portfolio-management/project.ts
+ * @Desc.  : 项目模块接口文档（右侧表格，归属项目集）
+ */
+
+import type { IPagination, IPageTableData } from '@/types'
+import { axiosRequest } from '../../request'
+
+/**
+ * 项目（归属项目集） - 详情
+ */
+export interface PortfolioProject {
+  id: string
+  /** 父项目集Id */
+  programId: string
+  /** 项目编码 */
+  code: number
+  /** 项目名称 */
+  name: string
+  /**
+   * 项目类型
+   * @dict projectType
+   * @enumValues [0, 1, 2]
+   */
+  projectType: number
+  /** 项目经理Id */
+  managerId: number
+  /** 项目经理名称 */
+  managerName: string
+  /** 预算 */
+  budget: number
+  /** 进度 */
+  progress: number
+  /**
+   * 项目状态
+   * @dict projectStatus
+   */
+  projectStatus: number
+  /** 计划开始时间 */
+  plannedStartDate: string
+  /** 计划完成时间 */
+  plannedFinishDate: string
+}
+
+/**
+ * 项目（归属项目集） - 新增
+ */
+export interface AddPortfolioProject {
+  programId?: string
+  code: number
+  name: string
+  projectType?: number
+  /**
+   * 项目经理
+   * @useSelectComponent SelectManager
+   */
+  managerId?: Record<string, unknown> | number
+  budget: number
+  plannedStartDate: string
+  plannedFinishDate: string
+}
+
+/**
+ * 项目（归属项目集） - 修改
+ */
+export interface UpdatePortfolioProject extends AddPortfolioProject {
+  id: string
+}
+
+/**
+ * 项目（归属项目集） - 查询
+ */
+export interface PortfolioProjectQuery extends IPagination {
+  /**
+   * 父项目集Id
+   * @foreignKey programId
+   */
+  programId?: string
+  name?: string
+  projectType?: number
+  projectStatus?: number
+}
+
+/**
+ * 项目（归属项目集） - 列表数据
+ */
+export const portfolioProjectTableApi = (params?: PortfolioProjectQuery): Promise<IPageTableData<PortfolioProject>> => {
+  return axiosRequest({
+    url: '/agentic/portfolio-project/list',
+    method: 'get',
+    params
+  })
+}
+
+/**
+ * 项目（归属项目集） - 新增
+ */
+export const addPortfolioProjectApi = (data: AddPortfolioProject) => {
+  return axiosRequest({
+    url: '/agentic/portfolio-project/save',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 项目（归属项目集） - 修改
+ */
+export const editPortfolioProjectApi = (data: UpdatePortfolioProject) => {
+  return axiosRequest({
+    url: '/agentic/portfolio-project/save',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 项目（归属项目集） - 删除
+ */
+export const deletePortfolioProjectApi = (id: string) => {
+  return axiosRequest({
+    url: `/agentic/portfolio-project/delete/${id}`,
+    method: 'delete'
+  })
+}

package/jnrs-vue/src/api/examples/program-management/index.ts

@@ -0,0 +1,143 @@
+/**
+ * @File   : program-management/index.ts
+ * @Desc.  : 项目集模块接口文档（主表）
+ */
+
+import type { IFullResponse } from '@jnrs/shared'
+import type { IPagination, IPageTableData } from '@/types'
+import { axiosRequest } from '../../request'
+
+/**
+ * 项目集 - 详情
+ */
+export interface Program {
+  id: string
+  /** 项目集编码 */
+  code: number
+  /** 项目集名称 */
+  name: string
+  /** 项目集描述 */
+  description: string
+  /** 项目经理Id */
+  managerId: number
+  /** 项目经理名称 */
+  managerName: string
+  /** 预算 */
+  budget: number
+  /** 开始日期 */
+  startDate: string
+  /** 结束日期 */
+  endDate: string
+  /**
+   * 项目集状态
+   * @dict programStatus
+   * @enumValues [0, 1, 2]
+   */
+  status: number
+  /**
+   * 启用状态
+   * @independentModification programEnableApi
+   */
+  enable: boolean
+  /** 子项目数量 */
+  projectCount: number
+}
+
+/**
+ * 项目集 - 新增
+ */
+export interface AddProgram {
+  code: number
+  name: string
+  description: string
+  /**
+   * 项目经理
+   * @useSelectComponent SelectManager
+   */
+  managerId?: Record<string, unknown> | number
+  budget: number
+  startDate: string
+  endDate: string
+  status?: number
+}
+
+/**
+ * 项目集 - 修改
+ */
+export interface UpdateProgram extends AddProgram {
+  id: string
+}
+
+/**
+ * 项目集 - 启用/禁用
+ */
+export interface ProgramEnable {
+  id: string
+  enable: boolean
+}
+
+/**
+ * 项目集 - 查询
+ */
+export interface ProgramQuery extends IPagination {
+  code?: string
+  name?: string
+  managerId?: number
+  status?: number
+}
+
+/**
+ * 项目集 - 列表数据
+ */
+export const programTableApi = (params?: ProgramQuery): Promise<IPageTableData<Program>> => {
+  return axiosRequest({
+    url: '/agentic/program/list',
+    method: 'get',
+    params
+  })
+}
+
+/**
+ * 项目集 - 新增
+ */
+export const addProgramApi = (data: AddProgram) => {
+  return axiosRequest({
+    url: '/agentic/program/save',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 项目集 - 修改
+ */
+export const editProgramApi = (data: UpdateProgram) => {
+  return axiosRequest({
+    url: '/agentic/program/save',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 项目集 - 删除
+ */
+export const deleteProgramApi = (id: string): Promise<IFullResponse<unknown>> => {
+  return axiosRequest({
+    url: `/agentic/program/delete/${id}`,
+    method: 'delete',
+    returnFullResponse: true
+  })
+}
+
+/**
+ * 项目集 - 启用/禁用
+ */
+export const programEnableApi = (data: ProgramEnable) => {
+  return axiosRequest({
+    url: '/agentic/program/enable',
+    method: 'put',
+    data,
+    returnFullResponse: true
+  })
+}

package/jnrs-vue/src/api/examples/program-management/sub-project.ts

@@ -0,0 +1,125 @@
+/**
+ * @File   : program-management/sub-project.ts
+ * @Desc.  : 子项目模块接口文档（从表，归属项目集）
+ */
+
+import type { IPagination, IPageTableData } from '@/types'
+import { axiosRequest } from '../../request'
+
+/**
+ * 子项目 - 详情
+ */
+export interface SubProject {
+  id: string
+  /** 父项目集Id */
+  programId: string
+  /** 子项目编码 */
+  code: number
+  /** 子项目名称 */
+  name: string
+  /**
+   * 项目类型
+   * @dict projectType
+   * @enumValues [0, 1, 2]
+   */
+  projectType: number
+  /** 项目经理Id */
+  managerId: number
+  /** 项目经理名称 */
+  managerName: string
+  /** 预算 */
+  budget: number
+  /** 进度 */
+  progress: number
+  /**
+   * 项目状态
+   * @dict projectStatus
+   */
+  projectStatus: number
+  /** 计划开始时间 */
+  plannedStartDate: string
+  /** 计划完成时间 */
+  plannedFinishDate: string
+}
+
+/**
+ * 子项目 - 新增
+ */
+export interface AddSubProject {
+  programId?: string
+  code: number
+  name: string
+  projectType?: number
+  /**
+   * 项目经理
+   * @useSelectComponent SelectManager
+   */
+  managerId?: Record<string, unknown> | number
+  budget: number
+  plannedStartDate: string
+  plannedFinishDate: string
+}
+
+/**
+ * 子项目 - 修改
+ */
+export interface UpdateSubProject extends AddSubProject {
+  id: string
+}
+
+/**
+ * 子项目 - 查询
+ */
+export interface SubProjectQuery extends IPagination {
+  /**
+   * 父项目集Id
+   * @foreignKey programId
+   */
+  programId?: string
+  name?: string
+  projectType?: number
+  projectStatus?: number
+}
+
+/**
+ * 子项目 - 列表数据
+ */
+export const subProjectTableApi = (params?: SubProjectQuery): Promise<IPageTableData<SubProject>> => {
+  return axiosRequest({
+    url: '/agentic/sub-project/list',
+    method: 'get',
+    params
+  })
+}
+
+/**
+ * 子项目 - 新增
+ */
+export const addSubProjectApi = (data: AddSubProject) => {
+  return axiosRequest({
+    url: '/agentic/sub-project/save',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 子项目 - 修改
+ */
+export const editSubProjectApi = (data: UpdateSubProject) => {
+  return axiosRequest({
+    url: '/agentic/sub-project/save',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 子项目 - 删除
+ */
+export const deleteSubProjectApi = (id: string) => {
+  return axiosRequest({
+    url: `/agentic/sub-project/delete/${id}`,
+    method: 'delete'
+  })
+}

package/jnrs-vue/src/api/{demos/project.ts → examples/project-management/index.ts}

@@ -8,7 +8,7 @@
 
 import type { IFullResponse, IBlobItem } from '@jnrs/shared'
 import type { IDocument, IAttachment, IPagination, IPageTableData } from '@/types'
-import { axiosRequest } from '../request'
+import { axiosRequest } from '../../request'
 import { objectToFormData } from '@/utils'
 
 /**
@@ -20,22 +20,39 @@ export interface Project {
   code: number
   name: string
   description: string
+  /**
+   * 项目状态
+   * @dict projectType
+   * @enumValues [0, 1, 2]
+   */
   projectType: number
   managerId: number
   managerName: string
+  pmoManagerId: number[]
+  pmoManagerName: string[]
   budget: number
   plannedStartDate: string
   plannedFinishDate: string
   milestoneFinishDate: string
-  progress: string
-  status: number
+  progress: number
+  /**
+   * 项目状态
+   * @dict projectStatus
+   */
+  projectStatus: number
+  /**
+   * 启用状态
+   * @independentModification projectEnableApi
+   */
   enable: boolean
   /**
    * 图片
+   * @fileField image
    */
   imageDocument?: IDocument
   /**
    * 附件
+   * @fileField attachment
    */
   attachmentDocument?: IDocument
 }
@@ -55,9 +72,23 @@ export interface AddProject {
   code: number
   name: string
   description: string
+  /**
+   * @dict projectType
+   * @enumValues [0, 1, 2]
+   */
   projectType?: number
+  /**
+   * 项目经理
+   * @useSelectComponent SelectManager
+   */
   managerId?: Record<string, unknown> | number
+  /**
+   * PMO经理
+   * @useSelectComponent SelectManager
+   */
+  pmoManagerId?: Record<string, unknown>[] | number[]
   budget: number
+  emergencyReserve: number
   plannedDateRange?: string[]
   plannedStartDate?: string
   plannedFinishDate?: string
@@ -69,20 +100,8 @@ export interface AddProject {
 /**
  * 项目 - 修改
  */
-export interface UpdateProject {
+export interface UpdateProject extends AddProject {
   id: string
-  code: number
-  name: string
-  description: string
-  projectType?: number
-  managerId?: Record<string, unknown> | number
-  budget: number
-  plannedDateRange?: string[]
-  plannedStartDate?: string
-  plannedFinishDate?: string
-  milestoneFinishDate?: string
-  newImageFiles: []
-  newAttachmentFile: []
 }
 
 /**
@@ -99,10 +118,13 @@ export interface ProjectEnable {
 export interface ProjectQuery extends IPagination {
   code?: string
   projectType?: number
-  managerName?: string
+  managerId?: number
+  pmoManagerId?: number[]
   plannedStartDate?: string
   startDate?: string
   endDate?: string
+  startDateTime?: string
+  endDateTime?: string
 }
 
 /**
@@ -156,14 +178,15 @@ export const projectEnableApi = (data: ProjectEnable) => {
   return axiosRequest({
     url: '/agentic/project/enable',
     method: 'put',
-    data
+    data,
+    returnFullResponse: true
   })
 }
 
 /**
  * 项目 - 列表数据
  */
-export const projectListApi = (params?: ProjectQuery): Promise<IPageTableData<Project>> => {
+export const projectTableApi = (params?: ProjectQuery): Promise<IPageTableData<Project>> => {
   return axiosRequest({
     url: '/agentic/project/list',
     method: 'get',
@@ -174,21 +197,23 @@ export const projectListApi = (params?: ProjectQuery): Promise<IPageTableData<Pr
 /**
  * 下载数据导入模板
  */
-export const templateProjectApi = (): Promise<Blob> => {
+export const templateProjectApi = (): Promise<IBlobItem> => {
   return axiosRequest({
     url: '/agentic/project/template',
-    method: 'post'
+    method: 'post',
+    responseType: 'blob'
   })
 }
 
 /**
  * 项目数据导入
  */
-export const importProjectApi = (data: FormData) => {
+export const importProjectApi = (data: FormData): Promise<IFullResponse<unknown>> => {
   return axiosRequest({
     url: '/agentic/project/import',
     method: 'post',
-    data
+    data,
+    returnFullResponse: true
   })
 }
 

package/jnrs-vue/src/api/{demos → examples/project-management}/manager.ts

@@ -7,7 +7,7 @@
  */
 
 import type { IPagination, IPageTableData } from '@/types'
-import { axiosRequest } from '../request'
+import { axiosRequest } from '../../request'
 
 /**
  * 项目经理 - 详情

package/jnrs-vue/src/api/request.ts

@@ -43,7 +43,7 @@ const axiosInstance = createAxiosInstance({
  * @example
  * ```typescript
  * // 基础用法 - 直接获取业务数据
- * const list = await ProjectListApi(params)
+ * const list = await projectTableApi(params)
  *
  * // 需要完整响应
  * const response = await axiosRequest({

package/jnrs-vue/src/api/system/index.ts

@@ -32,7 +32,7 @@ export const LoginApi = (data: LoginParams): Promise<LoginResult> => {
   return axiosRequest({
     url: '/auth/login',
     method: 'post',
-    data: objectToFormData(data),
+    data,
     noAuth: true
   })
 }
@@ -97,7 +97,7 @@ export const DictChangeApi = (data: IDictItem) => {
   return axiosRequest({
     url: '/dict-manager/detail',
     method: 'post',
-    data
+    data: objectToFormData(data)
   })
 }
 

package/jnrs-vue/src/assets/styles/root.scss

@@ -11,3 +11,8 @@
 .el-button--primary {
   --el-button-bg-color: var(--jnrs-color-primary);
 }
+
+.el-message-box,
+.el-dialog {
+  border: 1px solid var(--jnrs-font-primary-05);
+}

package/jnrs-vue/src/components/common/DictTag.vue

@@ -7,6 +7,7 @@
  -->
 
 <script setup lang="ts">
+import { getGlobalCssVar } from '@jnrs/shared'
 import { computed } from 'vue'
 import { getDictLabel, getDictColor } from '@/utils'
 
@@ -30,7 +31,12 @@ export interface Props {
 const { dictName = '', value = '', showColor = true, popover = '' } = defineProps<Props>()
 
 const computedColor = computed(() => {
-  return showColor ? getDictColor(dictName, value) : 'inherit'
+  const c = getDictColor(dictName, value) || 'inherit'
+  const g = getGlobalCssVar('--jnrs-card-primary') || '#fff'
+  return {
+    backgroundColor: showColor ? `color-mix(in srgb, ${c} 20%, ${g})` : 'inherit',
+    color: showColor ? c : 'inherit'
+  }
 })
 </script>
 
@@ -41,13 +47,13 @@ const computedColor = computed(() => {
         class="dictTag"
         :class="{ dictTag_showColor: showColor }"
         :style="{
-          backgroundColor: computedColor
+          backgroundColor: computedColor.backgroundColor
         }"
       >
         <span
           class="dictLabel"
           :style="{
-            color: computedColor
+            color: computedColor.color
           }"
         >
           {{ getDictLabel(dictName, value) }}
@@ -69,8 +75,8 @@ const computedColor = computed(() => {
 
 .dictTag_showColor {
   transform: scale(0.9);
-  .dictLabel {
-    filter: invert(0.5) brightness(0.5);
-  }
+  // .dictLabel {
+  //   filter: invert(0.5) brightness(0.5);
+  // }
 }
 </style>

package/jnrs-vue/src/components/common/ImageView.vue

@@ -70,7 +70,6 @@ const loadFilesRaw = async (keys: Props['loadKeys']) => {
     try {
       const blobItem = await fileDownloadApi(uniqueFileName)
       const { url, revoke } = blobToUrl(blobItem.blob)
-
       fileList.value = [{ src: url, fileName: blobItem.fileName || fileName || uniqueFileName || '' }]
       revokeFns.value = [revoke]
       posterUrl.value = url

package/jnrs-vue/src/components/select/SelectManager.vue

@@ -7,7 +7,7 @@
  -->
 
 <script setup lang="ts">
-import { ManagerListApi } from '@/api/demos/manager'
+import { ManagerListApi } from '@/api/examples/project-management/manager'
 import { JnSelectTemplate } from '@jnrs/vue-core/components'
 </script>
 

package/jnrs-vue/src/composables/useDateRangeField.ts

@@ -6,21 +6,25 @@
  * @Desc.  : 日期范围字段处理
  */
 
-import { computed } from 'vue'
+import { computed, type Ref } from 'vue'
 
 /**
  * 日期范围字段处理
- * @param form 表单对象
+ * @param form 表单对象的 Ref（注意：传入 ref 本身而非 .value，以便在 ref 重新赋值时自动同步）
  * @param startKey 开始字段名
  * @param endKey 结束字段名
  * @returns 日期范围字段处理结果
  */
-export function useDateRangeField(form: Record<string, unknown>, startKey: string, endKey: string) {
+export function useDateRangeField(form: Ref<Record<string, unknown>>, startKey: string, endKey: string) {
   return computed({
-    get: () => (form[startKey] && form[endKey] ? [form[startKey], form[endKey]] : null),
+    get: () => {
+      const f = form.value
+      return f[startKey] && f[endKey] ? [f[startKey], f[endKey]] : null
+    },
     set: (val) => {
-      form[startKey] = val?.[0] ?? ''
-      form[endKey] = val?.[1] ?? ''
+      const f = form.value
+      f[startKey] = val?.[0] ?? ''
+      f[endKey] = val?.[1] ?? ''
     }
   })
 }