ci-plus 1.2.3 → 1.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.ts +1 -4
- package/package.json +1 -1
- package/src/dailog/style/index.less +2 -2
- package/src/fileRelated/seeFile.vue +13 -9
- package/src/identificationCard/barCode.vue +3 -3
- package/src/identificationCard/identificationCard.vue +1 -1
- package/src/sortableTable/utils/interface.ts +2 -1
- package/src/utils/Dayjs.ts +1 -1
- package/src/utils/baseApi.ts +1 -2
- package/src/utils/cardPrint.ts +4 -3
- package/src/utils/index.ts +3 -1
package/index.ts
CHANGED
|
@@ -1,14 +1,11 @@
|
|
|
1
1
|
import * as components from './src/index';
|
|
2
2
|
export * from './src/index';
|
|
3
3
|
import { App } from 'vue';
|
|
4
|
-
|
|
5
4
|
import { default as Fn } from './src/utils';
|
|
6
|
-
console.log('Fn123: ', Fn,);
|
|
7
|
-
|
|
8
5
|
export default {
|
|
9
6
|
install: (app: App) => {
|
|
10
7
|
// 注册所有组件
|
|
11
|
-
console.log('注册所有ci-plus组件1.2.
|
|
8
|
+
console.log('注册所有ci-plus组件1.2.4: ');
|
|
12
9
|
for (const c in components) {
|
|
13
10
|
app.use(components[c]);
|
|
14
11
|
}
|
package/package.json
CHANGED
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
|
|
42
42
|
// 内容区域
|
|
43
43
|
.el-dialog__body {
|
|
44
|
-
height: calc(100% -
|
|
44
|
+
height: calc(100% - 45px);
|
|
45
45
|
padding-bottom: 0px !important;
|
|
46
46
|
overflow: auto;
|
|
47
47
|
.my-body {
|
|
@@ -113,7 +113,7 @@
|
|
|
113
113
|
|
|
114
114
|
// 内容区域
|
|
115
115
|
.el-dialog__body {
|
|
116
|
-
height: calc(100% -
|
|
116
|
+
height: calc(100% - 45px);
|
|
117
117
|
padding-bottom: 0px !important;
|
|
118
118
|
overflow: auto;
|
|
119
119
|
.my-body {
|
|
@@ -33,12 +33,16 @@ import axios from 'axios'
|
|
|
33
33
|
import apis from '../utils/baseApi'
|
|
34
34
|
import { ElMessage } from 'element-plus'
|
|
35
35
|
|
|
36
|
-
|
|
37
|
-
url:
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
36
|
+
const props = defineProps({
|
|
37
|
+
url: {
|
|
38
|
+
type: Array,
|
|
39
|
+
default: () => []
|
|
40
|
+
}, // 传入要显示的附件地址数组
|
|
41
|
+
baseUrl: {
|
|
42
|
+
type: String,
|
|
43
|
+
default: () => ''
|
|
44
|
+
} // 图片展示的基础路径
|
|
45
|
+
})
|
|
42
46
|
|
|
43
47
|
// 定义一个函数,用于处理字符串
|
|
44
48
|
const setFilePath = (arr: string[], url?: string) => {
|
|
@@ -78,12 +82,12 @@ const fileArr = (url: string, pathArr: string[]) => {
|
|
|
78
82
|
}
|
|
79
83
|
}
|
|
80
84
|
const { storageModule } = apis
|
|
81
|
-
let fileURL = new URL(storageModule).origin + '/' // 附件的地址前缀
|
|
85
|
+
let fileURL = ref(storageModule) //new URL(storageModule).origin + '/' // 附件的地址前缀
|
|
82
86
|
const emits = defineEmits(['onClick'])
|
|
83
87
|
const pathArr = ref<any[]>([])
|
|
84
88
|
// 对数组中的每个字符串应用处理函数
|
|
85
89
|
// @ts-ignore
|
|
86
|
-
pathArr.value = setFilePath(props.url, props.baseUrl || fileURL)
|
|
90
|
+
pathArr.value = setFilePath(props.url, props.baseUrl || fileURL.value)
|
|
87
91
|
|
|
88
92
|
// 监听props.url的变化
|
|
89
93
|
watch(
|
|
@@ -91,7 +95,7 @@ watch(
|
|
|
91
95
|
(newVal) => {
|
|
92
96
|
// 对新值进行处理
|
|
93
97
|
// @ts-ignore
|
|
94
|
-
pathArr.value = setFilePath(newVal, props.baseUrl || fileURL)
|
|
98
|
+
pathArr.value = setFilePath(newVal, props.baseUrl || fileURL.value)
|
|
95
99
|
},
|
|
96
100
|
{
|
|
97
101
|
immediate: true, // 是否立即执行
|
|
@@ -17,9 +17,9 @@ import { ref, onMounted, nextTick, watch } from 'vue'
|
|
|
17
17
|
import JsBarcode from 'jsbarcode'
|
|
18
18
|
interface Props {
|
|
19
19
|
value: String // 条码文本
|
|
20
|
-
type
|
|
21
|
-
maxWidth
|
|
22
|
-
newClass
|
|
20
|
+
type?: String // 类型
|
|
21
|
+
maxWidth?: String // 最大宽度
|
|
22
|
+
newClass?: String | Number // 自定义class
|
|
23
23
|
}
|
|
24
24
|
const props = defineProps<Props>()
|
|
25
25
|
// console.log('条码props', props)
|
|
@@ -42,7 +42,8 @@ export interface SortableTableIns
|
|
|
42
42
|
Props<TableInstance> | /* @vue-ignore */ Ref<Props<TableInstance>>['value']
|
|
43
43
|
modelValue: SortColumn[] | Ref<SortColumn[]>['value']
|
|
44
44
|
data: anyObj[] | Ref<anyObj[]>['value']
|
|
45
|
-
noMove?: boolean
|
|
45
|
+
noMove?: boolean // 是否禁用表头拖拽(false)
|
|
46
|
+
noSearch?: boolean //是否禁用配置项的header函数(false)
|
|
46
47
|
}
|
|
47
48
|
export interface SortableTableDialog {
|
|
48
49
|
config?: /* @vue-ignore */
|
package/src/utils/Dayjs.ts
CHANGED
package/src/utils/baseApi.ts
CHANGED
|
@@ -5,9 +5,8 @@
|
|
|
5
5
|
* @版本 : 1.0.0
|
|
6
6
|
* @创建时间 : 创建时间 2024-01-05 13:17:56
|
|
7
7
|
*/
|
|
8
|
-
import { store } from '@ice/stark-data'
|
|
8
|
+
import { store } from '@ice/stark-data' // 导入飞冰微服务主应用的函数
|
|
9
9
|
const apis = store.get('APIs')['1.1.1']
|
|
10
|
-
console.log('apis???: ', apis);
|
|
11
10
|
export default apis
|
|
12
11
|
|
|
13
12
|
|
package/src/utils/cardPrint.ts
CHANGED
|
@@ -11,8 +11,9 @@ import { setDate } from '@/utils/Dayjs'
|
|
|
11
11
|
import apis from '@/utils/baseApi'
|
|
12
12
|
import axios from 'axios'
|
|
13
13
|
const { storageModule } = apis
|
|
14
|
-
|
|
15
|
-
let
|
|
14
|
+
|
|
15
|
+
let baseUrls = storageModule //new URL(storageModule).origin + '/' // 图片的地址前缀
|
|
16
|
+
let apiurl = storageModule + 'scan_card_code_get/'
|
|
16
17
|
|
|
17
18
|
export const cardPrint = (
|
|
18
19
|
cParams: any,
|
|
@@ -20,7 +21,7 @@ export const cardPrint = (
|
|
|
20
21
|
baseUrl?: string,
|
|
21
22
|
): any => {
|
|
22
23
|
// 通过表示卡号获取打印信息
|
|
23
|
-
let _URL = baseUrl ? baseUrl :
|
|
24
|
+
let _URL = baseUrl ? baseUrl : apiurl
|
|
24
25
|
axios
|
|
25
26
|
.get(_URL, {
|
|
26
27
|
params: {
|
package/src/utils/index.ts
CHANGED
|
@@ -5,6 +5,8 @@ export { default as withInstall } from './withinstall/index';
|
|
|
5
5
|
import withInstall from './withinstall/index';
|
|
6
6
|
import { cardPrint, setCardList } from "./cardPrint";
|
|
7
7
|
import apis from "./baseApi";
|
|
8
|
+
import { setDate, setDateTime } from "./Dayjs";
|
|
9
|
+
import dayjs from "./Dayjs";
|
|
8
10
|
|
|
9
11
|
// 导出 cardPrint 和 apis
|
|
10
|
-
export default { apis, cardPrint, setCardList, withInstall };
|
|
12
|
+
export default { apis, cardPrint, setCardList, withInstall, dayjs, setDate, setDateTime };
|