ci-plus 1.8.5 → 1.8.6

package/README.md

@@ -1,6 +1,8 @@
 ## 历史更新
 
 ```js
+1.8.6
+  1、修改 ciuploadV4 组件中的一个bug
 1.8.5
   1、新增 ciuploadV4 组件
   2、一些导出小优化

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {

package/src/fileRelated/uploadV4.vue

@@ -167,7 +167,7 @@ interface Props {
   url?: string // 上传和下载模板的接口(当需要将附件传递回父组件时不需要传递此属性)
   uploadUrl?: string // 上传附件的接口
   parameter?: Object // 模板下载的时候请求需要携带的参数：{state: 1}
-  data?: Object //上传携带的其他数据对象:{userId: 1, userName: '张三'}
+  data?: any //上传携带的其他数据对象:{userId: 1, userName: '张三'}
   title?: string // 上传按钮的名称
   multiple?: boolean // 是否支持多文件
   limit?: number // 最大文件数量
@@ -409,7 +409,11 @@ const formwork = () => {
 onMounted(async () => {
   if (props.url) {
     affiliationOptions.value = await getAffiliationOptions()
-    warehouseOptions.value = await getWarehouseList()
+    if (props.data) {
+      warehouseOptions.value = await getWarehouseList({
+        storage_type: props.data?.storage_type || 'CAILIAO'
+      })
+    }
   } else {
     affiliationOptions.value = []
     warehouseOptions.value = []

package/src/utils/getAffiliationOptions.ts

@@ -2,7 +2,6 @@ import apis from './baseApi'
 import axios from 'axios'
 const { produceModule } = apis
 
-
 export interface User {
   user_code: string // 登录名:'148128'
   user_name: string // 用户名:'方卿'
@@ -20,12 +19,12 @@ let users = {
   user_code: UserData.loginName,
   user_name: UserData.name,
   dept_id: UserData.deptId,
-  dept_name: UserData.deptName,
+  dept_name: UserData.deptName
 }
 let user = JSON.parse(JSON.stringify(users))
 
 const cardPrintAxios = axios.create({
-  withCredentials: true,
+  withCredentials: true
 })
 
 cardPrintAxios.interceptors.request.use(
@@ -44,7 +43,7 @@ cardPrintAxios.interceptors.request.use(
     }
     return config
   },
-  (error) => Promise.reject(error),
+  (error) => Promise.reject(error)
 )
 
 interface AffiliationRES {
@@ -75,7 +74,7 @@ interface AffiliationRES {
 const getAffiliationOptions = async (
   list?: any[],
   keys: string[] = ['label', 'value'],
-  val: string[] = ['name', 'id'],
+  val: string[] = ['name', 'id']
 ) => {
   let url = produceModule + 'company_optional_scope_get/'
   let options: { [key: string]: any }[] = []
@@ -83,8 +82,8 @@ const getAffiliationOptions = async (
     const res = await cardPrintAxios.get(url, {
       params: {
         page: 1,
-        pageSize: 100000,
-      },
+        pageSize: 100000
+      }
     })
     console.log('%c Line:360 🍊🍤 res666', 'color:#7f2b82', res)
 
@@ -116,13 +115,21 @@ const getAffiliationOptions = async (
 }
 
 // 获取仓库列表数据 warehouse_get
-const getWarehouseList = async (
-  list?: any[],
-  keys: string[] = ['label', 'value'],
-  val: string[] = ['name', 'id'],
-  storage_type: string = 'CAILIAO', // 仓库类型
-  search?: string, // 搜索条件,
-) => {
+const getWarehouseList = async (par: {
+  list?: any[]
+  keys?: string[]
+  val?: string[]
+  storage_type?: string // 仓库类型
+  search?: string // 搜索条件,
+}) => {
+  let {
+    list = [], // 存储接口返回的源数据
+    keys = ['label', 'value'],
+    val = ['name', 'id'],
+    storage_type = 'CAILIAO',
+    search // 搜索参数
+  } = par
+
   let url = produceModule + 'warehouse_get/'
   let options: { [key: string]: any }[] = []
   try {
@@ -131,8 +138,8 @@ const getWarehouseList = async (
         page: 1,
         pageSize: 100000,
         warehouse_type_codes: storage_type,
-        name: search,
-      },
+        name: search
+      }
     })
     console.log('%c Line:360 🍊 res', 'color:#7f2b82', res)
     if (
@@ -141,6 +148,7 @@ const getWarehouseList = async (
       Array.isArray(res.data?.data) &&
       res.data.data.length > 0
     ) {
+      list = res.data.data
       res.data.data.forEach((item: AffiliationRES) => {
         const obj: { [key: string]: any } = {}
         keys.forEach((key, index) => {
@@ -151,14 +159,15 @@ const getWarehouseList = async (
       })
     } else {
       console.error('请求失败:', res.data.msg)
+      list = []
       options = []
     }
   } catch (error) {
     console.error('请求失败:', error)
+    list = []
     options = []
   }
   console.log('%c Line:1338 🥝 result', 'color:#ea7e5c', options)
-  list = options
   return options
 }