From 7ad159fbf6f0d1e8fb4650f640bfc0c07cf0fd26 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十二月 2024 14:24:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/assets/css/main.scss | 26 +++++++++----
src/tabviews/zshare/actionList/printbutton/index.jsx | 81 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 97 insertions(+), 10 deletions(-)
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index a4891e0..b7610c8 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -168,28 +168,38 @@
background: rgba(0, 0, 0, 0);
}
.ant-calendar-header .ant-calendar-prev-century-btn::before, .ant-calendar-header .ant-calendar-prev-decade-btn::before, .ant-calendar-header .ant-calendar-prev-year-btn::before, .ant-calendar-header .ant-calendar-prev-century-btn::after, .ant-calendar-header .ant-calendar-prev-decade-btn::after, .ant-calendar-header .ant-calendar-prev-year-btn::after {
- border-color: rgba(0, 0, 0, 0.65)!important;
+ border-color: rgba(0, 0, 0, 0.85)!important;
+ border-width: 2px 0 0 2px!important;
}
.ant-calendar-header .ant-calendar-next-century-btn::before, .ant-calendar-header .ant-calendar-next-decade-btn::before, .ant-calendar-header .ant-calendar-next-year-btn::before, .ant-calendar-header .ant-calendar-next-century-btn::after, .ant-calendar-header .ant-calendar-next-decade-btn::after, .ant-calendar-header .ant-calendar-next-year-btn::after {
- border-color: rgba(0, 0, 0, 0.65)!important;
+ border-color: rgba(0, 0, 0, 0.85)!important;
+ border-width: 2px 0 0 2px!important;
}
.ant-calendar-header .ant-calendar-next-century-btn:hover::before, .ant-calendar-header .ant-calendar-next-decade-btn:hover::before, .ant-calendar-header .ant-calendar-next-year-btn:hover::before, .ant-calendar-header .ant-calendar-next-century-btn:hover::after, .ant-calendar-header .ant-calendar-next-decade-btn:hover::after, .ant-calendar-header .ant-calendar-next-year-btn:hover::after {
- border-color: rgba(0, 0, 0, 0.85)!important;
+ border-color: rgba(0, 0, 0, 1)!important;
}
.ant-calendar-header .ant-calendar-prev-century-btn:hover::before, .ant-calendar-header .ant-calendar-prev-decade-btn:hover::before, .ant-calendar-header .ant-calendar-prev-year-btn:hover::before, .ant-calendar-header .ant-calendar-prev-century-btn:hover::after, .ant-calendar-header .ant-calendar-prev-decade-btn:hover::after, .ant-calendar-header .ant-calendar-prev-year-btn:hover::after {
- border-color: rgba(0, 0, 0, 0.85)!important;
+ border-color: rgba(0, 0, 0, 1)!important;
+}
+.ant-calendar-header .ant-calendar-prev-month-btn {
+ left: 35px!important;
+}
+.ant-calendar-header .ant-calendar-next-month-btn {
+ right: 35px!important;
}
.ant-calendar-header .ant-calendar-prev-month-btn::before, .ant-calendar-header .ant-calendar-prev-month-btn::after {
- border-color: rgba(0, 0, 0, 0.65)!important;
+ border-color: rgba(0, 0, 0, 0.85)!important;
+ border-width: 2px 0 0 2px!important;
}
.ant-calendar-header .ant-calendar-next-month-btn::before, .ant-calendar-header .ant-calendar-next-month-btn::after {
- border-color: rgba(0, 0, 0, 0.65)!important;
+ border-color: rgba(0, 0, 0, 0.85)!important;
+ border-width: 2px 0 0 2px!important;
}
.ant-calendar-header .ant-calendar-prev-month-btn:hover::before, .ant-calendar-header .ant-calendar-prev-month-btn:hover::after {
- border-color: rgba(0, 0, 0, 0.85)!important;
+ border-color: rgba(0, 0, 0, 1)!important;
}
.ant-calendar-header .ant-calendar-next-month-btn:hover::before, .ant-calendar-header .ant-calendar-next-month-btn:hover::after {
- border-color: rgba(0, 0, 0, 0.85)!important;
+ border-color: rgba(0, 0, 0, 1)!important;
}
// 閲嶇疆妯℃�佹婊氬姩鏉�
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index e204a75..b0e6202 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -558,9 +558,47 @@
const { btn } = this.props
let callback = null
+ let printReject = null
+ let skip = false
+ let send = false
+
+ let data = fromJS({
+ data: printlist,
+ form: formdata
+ }).toJS()
+
+ if (!window.GLOB.errorLog) {
+ printReject = (msg) => {
+ if (send) return
+
+ send = true
+ data.message = msg
+
+ window.mkInfo(JSON.stringify(data))
+ }
+ } else {
+ printReject = (msg) => {
+ if (send) return
+
+ send = true
+ data.message = msg
+
+ let param = {
+ func: 's_special_error_note_log',
+ api_url: btn.logLabel,
+ error_code: 507,
+ error_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+ api_param: JSON.stringify(data)
+ }
+ Api.genericInterface(param)
+ }
+ }
if (/callback\(\)/.test(btn.verify.printFunc)) {
callback = () => {
+ if (skip) return
+ skip = true
+
this.execSuccess({
ErrCode: '-1',
message: '',
@@ -577,8 +615,8 @@
try {
// eslint-disable-next-line
- let func = new Function('data', 'form', 'printer', 'notification', 'Api', 'systemType', 'callback', btn.verify.printFunc)
- func(printlist, formdata, btn.verify, notification, Api, window.GLOB.systemType, callback)
+ let func = new Function('data', 'form', 'printer', 'notification', 'Api', 'systemType', 'callback', 'printReject', btn.verify.printFunc)
+ func(printlist, formdata, btn.verify, notification, Api, window.GLOB.systemType, callback, printReject)
// 鑷畾涔夋墦鍗扮ず渚�
// let defaultPrinter = printer.defaultPrinter || 'lackprinter'
@@ -779,6 +817,8 @@
message: window.GLOB.dict['func_error'] || '鑷畾涔夊嚱鏁版墽琛岄敊璇紒',
duration: 5
})
+
+ printReject(window.GLOB.dict['func_error'] || '鑷畾涔夊嚱鏁版墽琛岄敊璇紒')
}
}
@@ -1694,6 +1734,41 @@
const { btn } = this.props
const { dict } = this.state
+ let printReject = null
+ let send = false
+
+ let data = fromJS({
+ data: list,
+ template: template
+ }).toJS()
+
+ if (!window.GLOB.errorLog) {
+ printReject = (msg) => {
+ if (send) return
+
+ send = true
+ data.message = msg
+
+ window.mkInfo(JSON.stringify(data))
+ }
+ } else {
+ printReject = (msg) => {
+ if (send) return
+
+ send = true
+ data.message = msg
+
+ let param = {
+ func: 's_special_error_note_log',
+ api_url: btn.logLabel,
+ error_code: 507,
+ error_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+ api_param: JSON.stringify(data)
+ }
+ Api.genericInterface(param)
+ }
+ }
+
let _errors = []
let defaultPrinter = btn.verify.defaultPrinter || 'lackprinter'
@@ -1906,6 +1981,8 @@
message: data.message,
status: false
})
+
+ printReject(data.message)
}
}
--
Gitblit v1.8.0