imatrix-ui 2.9.66-dw → 2.9.68-dw

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.
Files changed (5) hide show
  1. package/lib/super-ui.umd.min.js +4 -4
  2. package/package.json +1 -1
  3. package/packages/department-user-tree-inline/src/search-result.vue +2 -2
  4. package/src/i18n/langs/en.js +2 -2
  5. package/src/utils/request.js +12 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "imatrix-ui",
3
- "version": "2.9.66-dw",
3
+ "version": "2.9.68-dw",
4
4
  "description": "前端组件库：表格、表单、组织结构树等",
5
5
  "main": "lib/super-ui.umd.min.js",
6
6
  "private": false,
package/packages/department-user-tree-inline/src/search-result.vue CHANGED
@@ -44,7 +44,7 @@
44
44
  <template slot-scope="scope">
45
45
  <div v-if="scope.row.enName && scope.row.enName.trim() !== ''">
46
46
  <div :title="scope.row.name +'('+scope.row.enName+')' +'['+scope.row.loginName+']'">
47
- <span>{{ scope.row.name+'('+scope.row.enName+')' }}[{{ scope.row.loginName }}]</span>
47
+ <span style="white-space: pre;">{{ scope.row.name+'('+scope.row.enName+')' }}[{{ scope.row.loginName }}]</span>
48
48
  </div>
49
49
  <div style="color:#ccc" :title="getDeptName(scope.row)">
50
50
  {{ getDeptName(scope.row) }}
@@ -52,7 +52,7 @@
52
52
  </div>
53
53
  <div v-else>
54
54
  <div :title="scope.row.name +'['+scope.row.loginName+']'">
55
- <span>{{ scope.row.name }}[{{ scope.row.loginName }}]</span>
55
+ <span style="white-space: pre;">{{ scope.row.name }}[{{ scope.row.loginName }}]</span>
56
56
  </div>
57
57
  <div style="color:#ccc" :title="getDeptName(scope.row)">
58
58
  {{ getDeptName(scope.row) }}
package/src/i18n/langs/en.js CHANGED
@@ -173,8 +173,8 @@ const en = {
173
173
  kiken: 'Abstention',
174
174
  get_back_button: 'Retrieve',
175
175
  copy: 'Copy',
176
- draw: 'Draw',
177
- abandon_draw: 'Give Up Draw',
176
+ draw: 'Receive',
177
+ abandon_draw: 'Give Up Receive',
178
178
  add_sign: 'Additional Signature',
179
179
  remove_sign: 'Reduction Of Signature',
180
180
  signoff: 'Sign For',
package/src/utils/request.js CHANGED
@@ -89,13 +89,23 @@ service.interceptors.response.use(
89
89
  if (Vue.prototype.forbiddenUser || Vue.prototype.forbiddenLinkUrl) {
90
90
  vnode = '<p><span>' + message + '</span>'
91
91
  // 请点击进行权限申请
92
- const forbiddenExceptionLinkUrlMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUrl')
92
+ let forbiddenExceptionLinkUrlMsg
93
93
  if (Vue.prototype.forbiddenLinkUrl) {
94
+ forbiddenExceptionLinkUrlMsg = Vue.prototype.forbiddenLinkMsg
95
+ if (!forbiddenExceptionLinkUrlMsg) {
96
+ forbiddenExceptionLinkUrlMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUrl')
97
+ }
94
98
  vnode += ',<a href="#" style="color: #1800ff;font-weight: bold;text-decoration:underline" onclick="window.open(\'' + Vue.prototype.forbiddenLinkUrl + '\')">' + forbiddenExceptionLinkUrlMsg + '</a>'
99
+ } else if (Vue.prototype.forbiddenLinkMsg) {
100
+ forbiddenExceptionLinkUrlMsg = Vue.prototype.forbiddenLinkMsg
101
+ vnode += ',<a href="#" style="font-weight: bold;">' + forbiddenExceptionLinkUrlMsg + '</a>'
95
102
  }
96
103
  if (Vue.prototype.forbiddenUser) {
97
104
  // 如有疑问请联系
98
- const forbiddenExceptionLinkUserMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUser')
105
+ let forbiddenExceptionLinkUserMsg = Vue.prototype.forbiddenUserMsg
106
+ if (!forbiddenExceptionLinkUserMsg) {
107
+ forbiddenExceptionLinkUserMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUser')
108
+ }
99
109
  vnode += '<span>'
100
110
  const forbiddenUserHtml = ',' + forbiddenExceptionLinkUserMsg + '<span style="color: #1800ff;"> ' + Vue.prototype.forbiddenUser + '</span>'
101
111
  let contactUrlHtml