vue2-client 1.8.75 → 1.8.77

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/CHANGELOG.md +6 -0
  2. package/package.json +1 -1
  3. package/src/base-client/components/common/Upload/Upload.vue +4 -2
  4. package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue +3 -0
  5. package/src/base-client/components/common/XAddNativeFormOA/XAddNativeFormOA.vue +4 -1
package/CHANGELOG.md CHANGED
@@ -1,6 +1,12 @@
1
1
  # Change Log
2
2
  > 所有关于本项目的变化都在该文档里。
3
3
 
4
+ **1.8.77 -2024-3-6 @张振宇**
5
+ - 兼容upload 在oa里使用得效果
6
+
7
+ **1.8.76 -2024-3-6 @江超**
8
+ - `XaddNativeForm`静默新增字段增加`operatorId`，即操作人id
9
+
4
10
  **1.8.66 - 1.8.74 -2024-3-5 @江超**
5
11
  - 完善`XTable`在开发环境下的查询效果
6
12
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue2-client",
3
- "version": "1.8.75",
3
+ "version": "1.8.77",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
package/src/base-client/components/common/Upload/Upload.vue CHANGED
@@ -118,10 +118,12 @@ export default {
118
118
 
119
119
  upload(formData, this.serviceName, { headers, timeout: 600 * 1000 }).then(res => {
120
120
  // 根据服务端返回的结果判断成功与否，设置文件条目的状态
121
- if (res.success) {
121
+ if (res.success || res.id) {
122
122
  fileInfo.status = 'done'
123
123
  let dataObj
124
- if (typeof res.data === 'string') {
124
+ if (res.id) {
125
+ dataObj = res
126
+ } else if (typeof res.data === 'string') {
125
127
  dataObj = JSON.parse(res.data)
126
128
  } else {
127
129
  dataObj = res.data
package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue CHANGED
@@ -315,6 +315,9 @@ export default {
315
315
  case 'operator':
316
316
  requestForm[item.model] = this.currUser.name
317
317
  break
318
+ case 'operatorId':
319
+ requestForm[item.model] = this.currUser.id
320
+ break
318
321
  case 'orgId':
319
322
  requestForm[item.model] = this.currUser.orgid
320
323
  break
package/src/base-client/components/common/XAddNativeFormOA/XAddNativeFormOA.vue CHANGED
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div class="table-page-search-wrapper">
2
+ <div>
3
3
  <a-form-model
4
4
  v-if="loaded"
5
5
  ref="selectForm"
@@ -235,6 +235,9 @@ export default {
235
235
  case 'operator':
236
236
  requestForm[item.model] = this.currUser.name
237
237
  break
238
+ case 'operatorId':
239
+ requestForm[item.model] = this.currUser.id
240
+ break
238
241
  case 'orgId':
239
242
  requestForm[item.model] = this.currUser.orgid
240
243
  break