ci-plus 1.8.5 → 1.8.7

package/README.md

@@ -1,6 +1,11 @@
 ## 历史更新
 
 ```js
+1.8.7
+  1、删除旧标识卡用到的两个函数导出
+  2、添加表头设置表单的翻译
+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.7",
   "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/sortableTable/sortableTableDialog.vue

@@ -2,24 +2,22 @@
   <el-dialog v-model="state" v-bind="config" draggable>
     <div class="container">
       <b>
-        按住
+        {{t('sortableTable.sortableTableDialog.holdDown')}}
         <el-icon><Rank /></el-icon>
-        进行移动，点击表头名字进行隐藏, 点击确定进行保存，点击
-        <!-- <Star style="width: 1em; height: 1em; margin-right: 8px" /> -->
+        {{t('sortableTable.sortableTableDialog.clickName')}}
         <svg-icon name="regular-center" size="14"></svg-icon>
-        固定，点击
-        <!-- <StarFilled style="width: 1em; height: 1em; margin-right: 8px" /> -->
+        {{t('sortableTable.sortableTableDialog.fixed')}}
         <svg-icon name="regular-left" size="14" color="#2C93FF"></svg-icon>
-        或
+        {{t('sortableTable.sortableTableDialog.or')}}
         <svg-icon name="regular-right" size="14" color="#2C93FF"></svg-icon>
-        取消固定
+        {{t('sortableTable.sortableTableDialog.cancelTheFixation')}}
 
         <el-popover
           placement="bottom-start"
-          title="提示"
+          :title="t('sortableTable.sortableTableDialog.prompt')"
           :width="200"
           trigger="hover"
-          content="点击保存会将本表头的配置存储到数据库，下次登录还是你保存的配置,不保存的话，只在本次配置有效"
+          :content="t('sortableTable.sortableTableDialog.promptVal')"
         >
           <template #reference>
             <el-icon style="font-size: 14px"><QuestionFilled /></el-icon>
@@ -33,13 +31,13 @@
         show-pin
       />
 
-      <el-tooltip content="将表头配置保存到数据库" placement="top-end">
+      <el-tooltip :content="t('sortableTable.sortableTableDialog.saveDatabase')" placement="top-end">
         <el-button
           type="primary"
           style="width: 100%; margin-top: 10px"
           @click="$emit('submit', modelValue)"
         >
-          保存
+          {{t('public.save')}}
         </el-button>
       </el-tooltip>
     </div>
@@ -53,7 +51,7 @@ import sortableTableDragItem from './utils/sortableTableDragItem.vue'
 import { Rank } from '@element-plus/icons-vue'
 import SvgIcon from '../svgIcon/svgicon.vue'
 import { ElDialog,ElButton,ElTooltip,ElIcon,ElPopover } from 'element-plus'
-
+import t from '../utils/lang/index'
 const emits = defineEmits(['update:modelValue', 'update:data', 'submit'])
 const state = ref(false)
 const props = defineProps<SortableTableDialog>()

package/src/sortableTable/utils/sortableTableDragItem.vue

@@ -33,11 +33,11 @@
       </div>
       <div class="ifshow">
         <el-button :type="element.hide ? 'primary' : ''" @click="handleShow(element)" size="small">
-          {{ element.hide ? '显示' : '隐藏' }}
+          {{ element.hide ? t('sortableTable.sortableTableDialog.show') : t('sortableTable.sortableTableDialog.hide') }}
         </el-button>
       </div>
       <div class="widths">
-        宽度：
+        {{t('sortableTable.sortableTableDialog.width')}}：
         <el-input class="w-50 m-2" v-model="element.col.width" size="small" width="50"></el-input>
       </div>
       <sortable-table-drag-item v-if="element.children" v-model="element.children" />
@@ -48,7 +48,7 @@
 import SvgIcon from '../../svgIcon/index'
 import { computed } from 'vue'
 import { ElInput, ElButton , ElIcon} from 'element-plus'
-// import draggable from 'vuedraggable'
+import t from '../utils/lang/index'
 import { VueDraggable } from 'vue-draggable-plus'
 import { SortColumn, SortableTableIns } from './interface'
 import { Rank } from '@element-plus/icons-vue'

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
 }
 

package/src/utils/index.ts

@@ -3,7 +3,7 @@ export { default as withInstall } from './withinstall/index'
 // export { default as setCardList } from './cardPrint'; // 导入默认的导出
 // export * from './cardPrint'; // 导入所有导出(不包含默认导出)
 import withInstall from './withinstall/index'
-import { cardPrint, setCardList } from './cardPrint'
+// import { cardPrint, setCardList } from './cardPrint'
 import apis from './baseApi'
 import { dayjs, setDate, setDateTime } from './Dayjs'
 import ajaxBox from './ajaxBox' // 处理文件下载方法
@@ -17,8 +17,8 @@ import cardPrintAxios, {
 import { setId, getSend, sort } from '../sortableTable/utils/dataOpt'
 
 let func = {
-  cardPrint,
-  setCardList,
+  // cardPrint,
+  // setCardList,
   withInstall,
   setDate,
   setDateTime,

package/src/utils/lang/en.js

@@ -19,6 +19,19 @@ const en = {
       aweekAgo: 'A week ago', // 前一周
       lastMonth: 'Last Month', // 前一月,
       last3Month: 'Last 3 Month' // 最近3个月
+    },
+    sortableTableDialog:{
+      holdDown:'hold down',
+      clickName:'Move, click on the header name to hide, click OK to save, click',
+      fixed:'Fixed, click',
+      or:' Or ',
+      cancelTheFixation:'cancel the fixation',
+      prompt:'Prompt：',
+      promptVal:'Clicking "Save" will save the configuration of this header to the database. The configuration you saved will remain the same for the next login. If not saved, it will only be valid for this configuration',
+      saveDatabase:'Save header configuration to database',
+      show:'Show',
+      hide:'Hide',
+      width:'Width'
     }
   },
   fileRelated:{

package/src/utils/lang/zh.js

@@ -19,6 +19,19 @@ const zh = {
       aweekAgo: '一周前',
       lastMonth: '前一月',
       last3Month: '最近3个月'
+    },
+    sortableTableDialog:{
+      holdDown:'按住',
+      clickName:'进行移动，点击表头名字进行隐藏, 点击确定进行保存，点击',
+      fixed:'固定，点击',
+      or:' 或 ',
+      cancelTheFixation:'取消固定',
+      prompt:'提示：',
+      promptVal:'点击保存会将本表头的配置存储到数据库，下次登录还是你保存的配置,不保存的话，只在本次配置有效',
+      saveDatabase:'将表头配置保存到数据库',
+      show:'显示',
+      hide:'隐藏',
+      width:'宽度'
     }
   },
   fileRelated:{