ci-plus 1.7.8 → 1.8.0

package/README.md

@@ -1,6 +1,10 @@
 ## 历史更新
 
 ```js
+1.8.0
+  1、移除原来标识卡模板组件
+1.7.9
+  1、导入组件3(uploadV3.vue)中增加中英文切换
 1.7.8
   1、导入组件3中优化单选文件的时候覆盖文件逻辑
 1.7.7

package/package.json

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

package/src/components.d.ts

@@ -4,22 +4,22 @@
  * @Author: 导出类型定义
  * @LastEditTime: 2023-05-22 16:12:52
  */
-import * as components from './index';
+import * as components from './index'
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    EaButton: typeof components.Button;
-    EaIcon: typeof components.Icon;
-    EaButtons: typeof components.Buttons;
-    CiDialog: typeof components.Dialog;
-    CiApp: typeof components.Ccapp;
+    EaButton: typeof components.Button
+    EaIcon: typeof components.Icon
+    EaButtons: typeof components.Buttons
+    CiDialog: typeof components.Dialog
+    CiApp: typeof components.Ccapp
     CiSvgicon: typeof components.Svgicon
-    CiSuffix: typeof components.Suffix;
-    CiTable: typeof components.SorTables;
+    CiSuffix: typeof components.Suffix
+    CiTable: typeof components.SorTables
     CiHeadbtns: typeof components.Headbtns
     CiHeaderInput: typeof components.HeaderInput
     CiSdialog: typeof components.Sdialog
     CiColumncell: typeof components.Columncell
-    CiIdentificationCard: typeof components.IdentificationCard
+    // CiIdentificationCard: typeof components.IdentificationCard
     CiQrcode: typeof components.CiQrcode
 
     CiSeeFile: typeof components.SeeFile
@@ -34,4 +34,4 @@ declare module '@vue/runtime-core' {
 // 定义全局的类型
 declare module 'lodash'
 declare module 'jsbarcode'
-export { };
+export {}

package/src/fileRelated/uploadV3.vue

@@ -21,7 +21,7 @@
       v-model:file-list="fileList"
     >
       <template #trigger>
-        <el-button size="small" type="primary" style="width: 100%" plain> 选择文件 </el-button>
+        <el-button size="small" type="primary" style="width: 100%" plain> {{ t('fileRelated.selectFile')}} </el-button>
       </template>
       <el-button
         size="small"
@@ -29,7 +29,7 @@
         style="float: left; margin: 0 12px 0 0; width: 95px"
         v-if="url"
       >
-        下载模板
+        {{t('fileRelated.downloadTemplate')}}
       </el-button>
     </el-upload>
 
@@ -39,13 +39,13 @@
         v-model="affiliationAll"
         filterable
         :options="affiliationOptions"
-        placeholder="选择归属公司"
+        :placeholder="t('fileRelated.selectCompany')"
         style="width: 180px; margin-right: 5px"
         clearable
         @change="changeAll"
       />
       <el-button size="small" type="primary" @click="submitUpload" style="flex: 2">
-        上传
+        {{t('fileRelated.upload')}}
       </el-button>
     </div>
     <template #reference>
@@ -54,7 +54,7 @@
         @click="visible = !visible"
         :size="props.otherConfig?.size || 'small'"
       >
-        {{ props.title || '附件上传' }}
+        {{ props.title || t('fileRelated.attachmentUpload') }}
       </el-button>
     </template>
   </el-popover>
@@ -99,20 +99,29 @@ const fileArr = (url: string, pathArr: string[]) => {
     }
   }
 }
-
-import type { AxiosRequestConfig } from 'axios';
-import axios from 'axios';
+import t from '../utils/lang/index'
+import type { AxiosRequestConfig } from 'axios'
+import axios from 'axios'
 import type {
   UploadFile,
   UploadFiles,
   UploadInstance,
   UploadProps,
   UploadUserFile
-} from 'element-plus';
-import { ElButton, ElLoading, ElMessage, ElPopover, ElSelectV2, ElUpload, genFileId, UploadRawFile } from 'element-plus';
-import { onMounted, ref } from 'vue';
-import ajaxBox from '../utils/ajaxBox';
-import getAffiliationOptions from '../utils/getAffiliationOptions.ts';
+} from 'element-plus'
+import {
+  ElButton,
+  ElLoading,
+  ElMessage,
+  ElPopover,
+  ElSelectV2,
+  ElUpload,
+  genFileId,
+  UploadRawFile
+} from 'element-plus'
+import { onMounted, ref } from 'vue'
+import ajaxBox from '../utils/ajaxBox'
+import getAffiliationOptions from '../utils/getAffiliationOptions.ts'
 const upload = ref<UploadInstance>()
 const exporLoading = ref()
 const visible = ref(false)
@@ -154,7 +163,7 @@ const emits = defineEmits<{
 console.log('附件props: ', props)
 const datas: any = ref(props.data)
 const mymultiple = ref<boolean>(props.multiple)
-const mylimit = ref<number>(props.limit as number ||1)
+const mylimit = ref<number>((props.limit as number) || 1)
 const myfilePath = ref<any>(props.filePath || [])
 console.log('myfilePath: ', props.filePath)
 
@@ -174,17 +183,17 @@ console.log('fileList: ', fileList.value)
 
 //当超出限制时，执行的钩子函数
 const handleExceed: UploadProps['onExceed'] = (files) => {
-  console.log("%c Line:177 🥝 files", "color:#e41a6a", files);
+  console.log('%c Line:177 🥝 files', 'color:#e41a6a', files)
 
-  if(mylimit?.value === 1){
+  if (mylimit?.value === 1) {
     upload.value!.clearFiles()
     const file = files[0] as UploadRawFile
     file.uid = genFileId()
     upload.value!.handleStart(file)
   }
-  if( mylimit?.value > 1){
+  if (mylimit?.value > 1) {
     console.log('超出限制: ', files)
-    ElMessage.warning(`超出最大文件数:${mylimit?.value}个文件,请重新选择`)
+    ElMessage.warning(`${t('fileRelated.exceedFiles')} ${mylimit?.value} ${t('fileRelated.reselect')}`)
   }
 }
 
@@ -208,8 +217,8 @@ const handleRemove: UploadProps['onRemove'] = (file, fileList) => {
 //上传文件
 const submitUpload = () => {
   console.log(fileList.value.length)
-  if (!fileList.value.length) return ElMessage.warning('请选择文件后在上传12！')
-  exporLoading.value = ElLoading.service({ text: '导入中...' })
+  if (!fileList.value.length) return ElMessage.warning(t('fileRelated.pleaseFile'))
+  exporLoading.value = ElLoading.service({ text: t('fileRelated.importing') })
   console.log('upload.value', upload.value)
   upload.value!.submit()
   visible.value = false
@@ -259,7 +268,7 @@ const onSuccess = async (res: any, file: any, fileList: any) => {
 //文件上传失败回调
 const onError = (response: any, file: any, fileList: any) => {
   console.log('上传失败回调: ', response)
-  ElMessage.error(file.name + '上传失败')
+  ElMessage.error(file.name + t('fileRelated.uploadFailed'))
   // fileList.value.length = 0 // 清空文件列表
   upload.value!.clearFiles() // 清空文件列表
   visible.value = false // 关闭上传面板
@@ -307,13 +316,17 @@ const formwork = () => {
   const params = props.parameter
   ajaxBox.downFileFetchV2(url, params, {
     method: 'GET',
-    fileName: props.templateName || '模板.xlsx'
+    fileName: props.templateName || t('fileRelated.template')
   })
 }
 
 //选择框
 onMounted(async () => {
-  affiliationOptions.value = await getAffiliationOptions()
+  if (props.url) {
+    affiliationOptions.value = await getAffiliationOptions()
+  } else {
+    affiliationOptions.value = []
+  }
 })
 
 // const getAffiliationOptions = async (

package/src/identificationCard/barCode.vue

@@ -14,7 +14,7 @@
 
 <script setup lang="ts">
 import { onMounted, nextTick, watch } from 'vue'
-import JsBarcode from './jsbarcode.js' //'./jsbarcode.js' //'https://cdn.jsdelivr.net/npm/jsbarcode@3.11.6/+esm'
+import JsBarcode from 'jsbarcode' //'./jsbarcode.js' //'https://cdn.jsdelivr.net/npm/jsbarcode@3.11.6/+esm'
 interface Props {
   value: String // 条码文本
   type?: String // 类型

package/src/index.ts

@@ -11,7 +11,7 @@ export * from './sortableTable/index/sortableTable' // 导出排序表格
 export * from './sortableTable/index/sortableTableDialog' // 导出表排序组件
 export * from './sortableTable/index/sortableTableColumnCell' // 导出表列组件
 
-export * from './identificationCard' // 导出标识卡条形码模板组件
+// export * from './identificationCard' // 导出标识卡条形码模板组件
 export * from './identificationCard/qrcode' // 导出标识卡二维码模板组件
 
 export * from './fileRelated/index/ciseeFile' // 导出附件查看组件

package/src/utils/lang/en.js

@@ -21,6 +21,18 @@ const en = {
       last3Month: 'Last 3 Month' // 最近3个月
     }
   },
+  fileRelated:{
+    selectFile:'SELECT FILE',
+    downloadTemplate:'Download Template',
+    selectCompany:'Choose a company to belong to',
+    upload:'Upload',
+    attachmentUpload:'Attachment upload',
+    exceedFiles:'Exceeded the maximum file count of  ',
+    reselect:'  files, please select again',
+    pleaseFile:'Please select the file before uploading!',
+    importing:'Importing in progress ···',
+    uploadFailed:'Upload failed',
+  },
   public: {
     placeholders: 'Please choose', // 请选择
     placeholderi: 'Please fill in', // 请填写

package/src/utils/lang/zh.js

@@ -21,6 +21,19 @@ const zh = {
       last3Month: '最近3个月'
     }
   },
+  fileRelated:{
+    selectFile:'选择文件',
+    downloadTemplate:'下载模板',
+    selectCompany:'选择归属公司',
+    upload:'上传',
+    attachmentUpload:'附件上传',
+    exceedFiles:'超出最大文件数 ',
+    reselect:' 个文件,请重新选择',
+    pleaseFile:'请选择文件后在上传！',
+    importing:'导入中···',
+    uploadFailed:'上传失败',
+    template:'模板.xlsx'
+  },
   public: {
     placeholders: '请选择',
     placeholderi: '请填写',