ci-plus 1.8.1 → 1.8.3

package/README.md

@@ -1,6 +1,8 @@
 ## 历史更新
 
 ```js
+1.8.3
+  1、优化ci-select组件中使用名组件称问题
 1.8.0
   1、移除原来标识卡模板组件
 1.7.9
@@ -45,7 +47,6 @@
 "sortablejs": "^1.15.1", # 拖拽库
 "vite-plugin-svg-icons": "^2.0.1", # svg图标库
 "jsbarcode": "^3.11.6", # 条形码库
-"dayjs": "^1.11.9", # 日期处理库
 "vue-draggable-plus": "^0.4.0", # 拖拽库
 "qrcode": "^1.5.3", #二维码库
 

package/index.ts

@@ -5,7 +5,7 @@ import { default as Fn } from './src/utils'
 export default {
   install: (app: App) => {
     // 注册所有组件
-    console.log('注册所有ci-plus组件1.7.7: ', components)
+    console.log('注册所有ci-plus组件1.8.2: ', components)
     for (const c in components) {
       app.use(components[c])
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {
@@ -22,7 +22,6 @@
   "dependencies": {
     "vue-i18n": ">=11.0.0",
     "less": ">=4.0.0",
-    "dayjs": ">=1.0.0",
     "element-plus": ">=2.7.0",
     "vite-plugin-svg-icons": ">=2.0.0",
     "sortablejs": ">=1.0.0",

package/src/select/select.vue

@@ -1,6 +1,6 @@
 <template>
   <component
-    :is="!useVirtual ? 'el-select' : 'el-select-v2'"
+    :is="!useVirtual ? ElSelect : ElSelectV2"
     popper-class="t_select"
     v-model="childSelectedValue"
     :options="!useVirtual ? null : optionSource"
@@ -43,7 +43,7 @@
           :pager-count="paginationOption.pagerCount"
           :total="paginationOption.total"
           v-bind="{
-            small: true,
+            size: 'small',
             background: true,
             ...$attrs,
             ...paginationOption.bind
@@ -60,7 +60,11 @@ import { computed, useSlots } from 'vue'
 import {
   ElPagination,
   ElCheckbox,
-  ElOption
+  ElOption,
+  ElSelect,
+  ElSelectV2,
+  ElInput,
+  ElIcon
 } from 'element-plus'
 const props: any = defineProps({
   modelValue: {
@@ -92,7 +96,7 @@ const props: any = defineProps({
   // 下拉框组件数据源
   optionSource: {
     type: Array as unknown as any[],
-    default: () => []
+    default: (): any[] => []
   },
   // 是否显示分页
   isShowPagination: {
@@ -170,9 +174,9 @@ const selectAll = (val: any) => {
 const customLabelHandler = (item) => {
   console.log('customLabelHandler', item)
   // return eval(props.customLabel)
-  const expression = props.customLabel.replace(/item/g, 'item.value');
-  const safeEval = new Function('item', `return ${expression};`);
-  return safeEval({ value: item });
+  const expression = props.customLabel.replace(/item/g, 'item.value')
+  const safeEval = new Function('item', `return ${expression};`)
+  return safeEval({ value: item })
 }
 </script>
 <style lang="scss" scoped>

package/src/utils/Dayjs.ts

@@ -6,26 +6,18 @@
  * @param date 传入日期或者字符串
  * @param geshi? 想要输出的格式
  */
-// import dayjs from 'dayjs'
+import dayjs from 'dayjs'
 
-// // 格式化日期
-// export const setDate = (date?: string | Date, geshi: string = 'YYYY-MM-DD') => {
-//   if (date == '' || date == null || date == undefined) {
-//     return ''
-//   } else {
-//     return dayjs(date).format(geshi)
-//   }
-// }
-// // 格式化日期时间
-// export const setDateTime = (
-//   date: string | Date,
-//   geshi: string = 'YYYY-MM-DD hh:mm:ss',
-// ): string => {
-//   return dayjs(date).format(geshi)
-// }
-let dayjs = 2
-export const setDate = () => { }
+// 格式化日期
+export const setDate = (date?: string | Date, geshi: string = 'YYYY-MM-DD') => {
+  if (date == '' || date == null || date == undefined) {
+    return ''
+  } else {
+    return dayjs(date).format(geshi)
+  }
+}
 // 格式化日期时间
-export const setDateTime = () => { }
-
-export default dayjs
+export const setDateTime = (date: string | Date, geshi: string = 'YYYY-MM-DD hh:mm:ss'): string => {
+  return dayjs(date).format(geshi)
+}
+export { dayjs }

package/src/utils/index.ts

@@ -5,8 +5,7 @@ export { default as withInstall } from './withinstall/index'
 import withInstall from './withinstall/index'
 import { cardPrint, setCardList } from './cardPrint'
 import apis from './baseApi'
-import { setDate, setDateTime } from './Dayjs'
-import dayjs from './Dayjs'
+import { dayjs, setDate, setDateTime } from './Dayjs'
 import ajaxBox from './ajaxBox' // 处理文件下载方法
 import getAffiliationOptions from './getAffiliationOptions' // 处理文件下载方法
 
@@ -18,8 +17,8 @@ let func = {
   setDateTime,
   getAffiliationOptions,
   apis,
-  dayjs,
-  ajaxBox
+  ajaxBox,
+  dayjs
 }
 // 导出 所有方法
 export default func