cloud-web-corejs 1.0.54-dev.339 → 1.0.54-dev.340

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/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "cloud-web-corejs",
3
3
  "private": false,
4
- "version": "1.0.54-dev.339",
4
+ "version": "1.0.54-dev.340",
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
7
7
  "lint": "eslint --ext .js,.vue src",
@@ -336,7 +336,8 @@ modules = {
336
336
  method: 'post',
337
337
  data: {
338
338
  parent: id,
339
- enabled: true
339
+ enabled: true,
340
+ dataType: 3
340
341
  },
341
342
  success: res => {
342
343
  let rows = res.objx || [];
@@ -590,6 +590,7 @@ modules = {
590
590
  data: {
591
591
  parent: id,
592
592
  enabled: true,
593
+ dataType: 2
593
594
  },
594
595
  success: (res) => {
595
596
  let rows = res.objx || [];
@@ -314,7 +314,8 @@ modules = {
314
314
  method: 'post',
315
315
  data: {
316
316
  parent: id,
317
- enabled: true
317
+ enabled: true,
318
+ dataType: 1
318
319
  },
319
320
  success: res => {
320
321
  let rows = res.objx || [];
@@ -35,16 +35,18 @@ export default {
35
35
  data() {
36
36
  return {
37
37
  showWfDialog2: false,
38
- wfUrl2: '',
38
+ wfUrl2: "",
39
39
  showWfContent: true,
40
40
  wfContent: null,
41
- wfDataId: '',
41
+ wfDataId: "",
42
42
  param: {},
43
43
  };
44
44
  },
45
45
  methods: {
46
46
  getUrlParam(url) {
47
- var reg = /([^?&=]+)=([^?&=]+)/g, obj = {}, str = url;
47
+ var reg = /([^?&=]+)=([^?&=]+)/g,
48
+ obj = {},
49
+ str = url;
48
50
  url.replace(reg, function () {
49
51
  obj[arguments[1]] = arguments[2];
50
52
  });
@@ -58,9 +60,9 @@ export default {
58
60
  data: [row.id],
59
61
  isLoading: true,
60
62
  loadingTarget: document.body,
61
- success: res => {
63
+ success: (res) => {
62
64
  callback && callback();
63
- }
65
+ },
64
66
  });
65
67
  } else {
66
68
  callback && callback();
@@ -72,38 +74,42 @@ export default {
72
74
  let wfUrl = turl.split("?")[0];
73
75
  let param = this.getUrlParam(turl);
74
76
  let wfDataId = param.dataId;
77
+ debugger;
78
+ if (!wfDataId) {
79
+ wfDataId = 0;
80
+ } else if (!isNaN(wfDataId)) {
81
+ wfDataId = Number(wfDataId);
82
+ }
75
83
 
76
- if (wfUrl == 'form') {
84
+ if (wfUrl == "form") {
77
85
  this.param = Object.assign(param, {
78
86
  formCode: param.objTypeCode.substr(9),
79
- dataId: wfDataId
87
+ dataId: wfDataId,
80
88
  });
81
- let url = '/user/form/vform/render.vue';
82
- this.wfContent = require('@base/views' + url).default;
89
+ let url = "/user/form/vform/render.vue";
90
+ this.wfContent = require("@base/views" + url).default;
83
91
  } else {
84
92
  this.param = Object.assign(param, {
85
- _dataId: wfDataId
93
+ _dataId: wfDataId,
86
94
  });
87
- let url = wfUrl + '.vue';
95
+ let url = wfUrl + ".vue";
88
96
  let id = wfDataId;
89
- this.wfDataId = !id || typeof id == 'object' ? 0 : id;
97
+ this.wfDataId = !id || typeof id == "object" ? 0 : id;
90
98
  // this.showWfDialog = true;
91
99
  this.showWfContent = true;
92
- this.wfContent = require('@/views' + url).default;
93
-
94
-
100
+ this.wfContent = require("@/views" + url).default;
95
101
  }
96
102
  this.showWfDialog2 = true;
97
103
 
98
104
  callback && callback();
99
- })
100
- }
101
- }
105
+ });
106
+ },
107
+ },
102
108
  };
103
109
  </script>
104
110
 
105
111
  <style scoped>
106
112
  .designer-dialog.indexUse #containt .detail-wrap .d-cont {
107
- height: calc(100vh - 82px)
113
+ height: calc(100vh - 82px);
108
114
  }
109
115
  </style>