简柏林 / thingskit-front · Commits

Commit ef7e13c84e7c68c3a41284faf87dbafae355c886

Authored by xp.Huang
2 parents 886c794c ae5625ee

Merge branch 'ft' into 'main_dev' 

pref:优化测试get请求无任何参数，控制台报错问题，优化Header头部，设为一个默认值等

See merge request yunteng/thingskit-front!530
Inline Side-by-side
Showing 5 changed files with 61 additions and 11 deletions
... ... @@ -50,8 +50,8 @@
50 50 const labelLine = {
51 51 normal: {
52 52 show: true,
53   - length: 20,
54   - length2: 20,
  53 + length: 30,
  54 + length2: 0,
55 55 lineStyle: {
56 56 color: '#808080',
57 57 },
... ... @@ -93,7 +93,7 @@
93 93 formatter: `${legendKey}${((value! / total!) * 100).toFixed(2)}%`,
94 94 borderWidth: 5,
95 95 borderRadius: 0,
96   - padding: [90, -60],
  96 + padding: [90, -30],
97 97 },
98 98 },
99 99 labelLine,
... ...
... ... @@ -54,8 +54,8 @@
54 54 }>({
55 55 content: [
56 56 {
57   - key: '',
58   - value: '',
  57 + key: 'ContentType',
  58 + value: 'none',
59 59 required: false,
60 60 },
61 61 ],
... ... @@ -64,8 +64,8 @@
64 64 // 新增
65 65 const add = (_, index: number) => {
66 66 tableArray.content.splice(index + 1, 0, {
67   - key: '',
68   - value: '',
  67 + key: 'ContentType',
  68 + value: 'none',
69 69 required: false,
70 70 });
71 71 };
... ... @@ -92,8 +92,8 @@
92 92 const resetValue = () => {
93 93 tableArray.content = [];
94 94 tableArray.content.push({
95   - key: '',
96   - value: '',
  95 + key: 'ContentType',
  96 + value: 'none',
97 97 required: false,
98 98 });
99 99 };
... ...
... ... @@ -12,6 +12,11 @@
12 12 <tr v-for="(item, index) in tableTestArray.content" :key="index">
13 13 <td style="width: 7.5vw">
14 14 <Select
  15 + :getPopupContainer="
  16 + (triggerNode) => {
  17 + return triggerNode.parentNode;
  18 + }
  19 + "
15 20 :disabled="true"
16 21 v-model:value="item.key"
17 22 placeholder="请选择"
... ... @@ -21,6 +26,11 @@
21 26 <td style="width: 6.5vw">
22 27 <a-input v-if="item.key === 'scope'" placeholder="请输入" v-model:value="item.value" />
23 28 <a-tree-select
  29 + :getPopupContainer="
  30 + (triggerNode) => {
  31 + return triggerNode.parentNode;
  32 + }
  33 + "
24 34 v-else-if="item.key === 'organizationId'"
25 35 v-model:value="item.value"
26 36 show-search
... ... @@ -32,6 +42,11 @@
32 42 @change="handleOrgnationChange(item)"
33 43 />
34 44 <Select
  45 + :getPopupContainer="
  46 + (triggerNode) => {
  47 + return triggerNode.parentNode;
  48 + }
  49 + "
35 50 v-else-if="item.key === 'entityId'"
36 51 v-model:value="item.value"
37 52 placeholder="请选择"
... ... @@ -40,6 +55,11 @@
40 55 allowClear
41 56 />
42 57 <Select
  58 + :getPopupContainer="
  59 + (triggerNode) => {
  60 + return triggerNode.parentNode;
  61 + }
  62 + "
43 63 v-else-if="item.key === 'keys'"
44 64 v-model:value="item.value"
45 65 placeholder="请选择"
... ... @@ -57,6 +77,11 @@
57 77 <a-button disabled type="primary">{{ item.value }}</a-button>
58 78 </div>
59 79 <Select
  80 + :getPopupContainer="
  81 + (triggerNode) => {
  82 + return triggerNode.parentNode;
  83 + }
  84 + "
60 85 v-else
61 86 v-model:value="item.value"
62 87 placeholder="请选择"
... ...
... ... @@ -52,10 +52,10 @@
52 52 await nextTick(() => {
53 53 //拆分"xx,xx,xx"多个
54 54 const getSingleKey = props.data?.list;
55   - const getMuteKey = props.data?.list?.filter((it: any) => it.key.split(',').length > 1);
  55 + const getMuteKey = props.data?.list?.filter((it: any) => it.key?.split(',').length > 1);
56 56 const getMuteKeys = getMultipleKeys(getMuteKey);
57 57 const mergeKeys = [...getSingleKey, ...getMuteKeys]?.filter(
58   - (it: any) => it.key.split(',').length === 1
  58 + (it: any) => it.key?.split(',').length === 1
59 59 );
60 60 testEditCellTableRef.value?.setTableArray(mergeKeys);
61 61 });
... ...
... ... @@ -12,6 +12,11 @@
12 12 <tr v-for="(item, index) in tableTestArray.content" :key="index">
13 13 <td style="width: 7.5vw">
14 14 <Select
  15 + :getPopupContainer="
  16 + (triggerNode) => {
  17 + return triggerNode.parentNode;
  18 + }
  19 + "
15 20 :disabled="true"
16 21 v-model:value="item.key"
17 22 placeholder="请选择"
... ... @@ -21,6 +26,11 @@
21 26 <td style="width: 6.5vw">
22 27 <a-input v-if="item.key === 'scope'" placeholder="请输入" v-model:value="item.value" />
23 28 <a-tree-select
  29 + :getPopupContainer="
  30 + (triggerNode) => {
  31 + return triggerNode.parentNode;
  32 + }
  33 + "
24 34 v-else-if="item.key === 'organizationId'"
25 35 v-model:value="item.value"
26 36 show-search
... ... @@ -32,6 +42,11 @@
32 42 @change="handleOrgnationChange(item)"
33 43 />
34 44 <Select
  45 + :getPopupContainer="
  46 + (triggerNode) => {
  47 + return triggerNode.parentNode;
  48 + }
  49 + "
35 50 v-else-if="item.key === 'entityId'"
36 51 v-model:value="item.value"
37 52 placeholder="请选择"
... ... @@ -40,6 +55,11 @@
40 55 allowClear
41 56 />
42 57 <Select
  58 + :getPopupContainer="
  59 + (triggerNode) => {
  60 + return triggerNode.parentNode;
  61 + }
  62 + "
43 63 v-else-if="item.key === 'keys'"
44 64 v-model:value="item.value"
45 65 placeholder="请选择"
... ... @@ -57,6 +77,11 @@
57 77 <a-button disabled type="primary">{{ item.value }}</a-button>
58 78 </div>
59 79 <Select
  80 + :getPopupContainer="
  81 + (triggerNode) => {
  82 + return triggerNode.parentNode;
  83 + }
  84 + "
60 85 v-else
61 86 v-model:value="item.value"
62 87 placeholder="请选择"
... ...