Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/fixbug_hufangzhou_15647' into 'master'

Browse Source 
* Fix bug #15647.

See merge request easycorp/zentaopms!2779
This commit is contained in:
王怡栋
2022-04-07 08:14:15 +00:00
parent ada2189c25 996c0c6edb
commit 262cdf3eef
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/api/js/common.js
+3 -3
View File
@@ -243,9 +243,9 @@ try {
<input type="text" :placeholder="langDesc" autocomplete="off" class="form-control" v-model="value.desc">
</td>
<td>
<button class="btn btn-link" type="button" @click="addSub" v-if="value.structType != 'formData' && ['object', 'array'].indexOf(value.paramsType) != -1">${addSubField}</button>
<button class="btn btn-link" type="button" @click="add">${structAdd}</button>
<button class="btn btn-link" type="button" @click="del">${structDelete}</button>
<button class="btn btn-link btn-icon" type="button" @click="addSub" v-if="value.structType != 'formData' && ['object', 'array'].indexOf(value.paramsType) != -1"><i class="icon icon-split"></i></button>
<button class="btn btn-link btn-icon" type="button" @click="add"><i class="icon icon-plus"></i></button>
<button class="btn btn-link btn-icon" type="button" @click="del"><i class="icon icon-close"></i></button>
</td>
</tr>
`
module/api/view/create.html.php
+4 -4
View File
@@ -139,8 +139,8 @@ js::set('struct_paramsType', $lang->struct->paramsType);
<input type="text" placeholder="<?php echo $lang->struct->desc;?>" autocomplete="off" class="form-control" v-model="item.desc">
</td>
<td>
<button class="btn btn-link" type="button" @click="add(header, key, 'header')"><?php echo $lang->struct->add;?></button>
<button class="btn btn-link" type="button" @click="del(header, key)"><?php echo $lang->delete;?></button>
<button class="btn btn-link btn-icon btn-add" type="button" @click="add(header, key, 'header')"><i class="icon icon-plus"></i></button>
<button class="btn btn-link btn-icon btn-delete" type="button" @click="del(header, key)"><i class="icon icon-close"></i></button>
</td>
</tbody>
</table>
@@ -173,8 +173,8 @@ js::set('struct_paramsType', $lang->struct->paramsType);
<input type="text" placeholder="<?php echo $lang->struct->desc;?>" autocomplete="off" class="form-control" v-model="item.desc">
</td>
<td>
<button class="btn btn-link" type="button" @click="add(queryP, key, 'query')"><?php echo $lang->struct->add;?></button>
<button class="btn btn-link" type="button" @click="del(queryP, key)"><?php echo $lang->delete;?></button>
<button class="btn btn-link btn-icon btn-add" type="button" @click="add(queryP, key, 'query')"><i class="icon icon-plus"></i></button>
<button class="btn btn-link btn-icon btn-delete" type="button" @click="del(queryP, key)"><i class="icon icon-close"></i></button>
</td>
</tbody>
</table>
module/api/view/edit.html.php
+4 -4
View File
@@ -134,8 +134,8 @@ js::set('api', $api);
<input type="text" placeholder="<?php echo $lang->struct->desc;?>" autocomplete="off" class="form-control" v-model="item.desc">
</td>
<td>
<button class="btn btn-link" type="button" @click="add(header, key, 'header')"><?php echo $lang->struct->add;?></button>
<button class="btn btn-link" type="button" @click="del(header, key)"><?php echo $lang->delete;?></button>
<button class="btn btn-link btn-icon btn-add" type="button" @click="add(header, key, 'header')"><i class="icon icon-plus"></i></button>
<button class="btn btn-link btn-icon btn-delete" type="button" @click="del(header, key)"><i class="icon icon-close"></i></button>
</td>
</tbody>
</table>
@@ -168,8 +168,8 @@ js::set('api', $api);
<input type="text" placeholder="<?php echo $lang->struct->desc;?>" autocomplete="off" class="form-control" v-model="item.desc">
</td>
<td>
<button class="btn btn-link" type="button" @click="add(queryP, key, 'query')"><?php echo $lang->struct->add;?></button>
<button class="btn btn-link" type="button" @click="del(queryP, key)"><?php echo $lang->delete;?></button>
<button class="btn btn-link btn-icon btn-add" type="button" @click="add(queryP, key, 'query')"><i class="icon icon-plus"></i></button>
<button class="btn btn-link btn-icon btn-delete" type="button" @click="del(queryP, key)"><i class="icon icon-close"></i></button>
</td>
</tbody>
</table>