diff --git a/src/resources/assets/css/common.less b/src/resources/assets/css/common.less index d47402d4449866a5d0892772f275bbccf8dc3bab..d5b4b66aaad2e65ab1634da6eaeef6ea1ceca5e2 100644 --- a/src/resources/assets/css/common.less +++ b/src/resources/assets/css/common.less @@ -1238,7 +1238,7 @@ span { .block-item { display: inline-block; position: relative; - padding: 0 10px; + padding: 0 8px; } //常用顶部的高度100%的操作栏 diff --git a/src/resources/plugins/TsSheet/form-edit.vue b/src/resources/plugins/TsSheet/form-edit.vue index 727796c7e48061b64680af1777e574726551cd3b..ee7d2b6f9f909af213d840f6685193d2df0261d2 100644 --- a/src/resources/plugins/TsSheet/form-edit.vue +++ b/src/resources/plugins/TsSheet/form-edit.vue @@ -59,7 +59,7 @@
- + {{ $t('term.framework.globalreadonly') }} - + - + >
@@ -635,6 +634,7 @@ export default { previewForm() { const sheet = this.$refs['sheet']; const data = sheet.getFormConfig(); + this.$set(data, 'readOnly', this.readOnly); this.previewFormData = data; this.isPreviewShow = true; }, @@ -1039,12 +1039,12 @@ export default { }); } }, - changeReadOnly(val) { + changeReadOnly(readOnly) { this.defaultSceneUuid = this.selectSceneUuid; this.$api.framework.form.saveFormSceneReadonly({ versionUuid: this.currentVersion.uuid, sceneUuid: this.sceneUuid, - readOnly: val + readOnly: readOnly }).then(res => { if (res.Status == 'OK') { this.$Message.success(this.$t('message.savesuccess')); diff --git a/src/resources/plugins/TsSheet/form-scene-edit.vue b/src/resources/plugins/TsSheet/form-scene-edit.vue index 6f7d00a15d20cf7441d0e03a1e497407ce9ebfc1..5352813505da95ccf962fd831adb9d56d883619a 100644 --- a/src/resources/plugins/TsSheet/form-scene-edit.vue +++ b/src/resources/plugins/TsSheet/form-scene-edit.vue @@ -22,7 +22,7 @@
- + {{ $t('term.framework.globalreadonly') }} - + - + >
@@ -415,6 +414,7 @@ export default { openPreview() { const data = this.$refs.sheet.getFormConfig(); this.$set(data, 'formWidth', this.initFormConfig.formWidth); + this.$set(data, 'readOnly', this.readOnly); this.previewFormData = data; this.isPreviewShow = true; }, @@ -594,17 +594,17 @@ export default { this.readOnly = readOnly; } }, - changeReadOnly(val) { + changeReadOnly(readOnly) { this.defaultSceneUuid = this.selectSceneUuid; this.$api.framework.form.saveFormSceneReadonly({ versionUuid: this.currentVersionUuid, sceneUuid: this.sceneUuid, - readOnly: val + readOnly: readOnly }).then(res => { if (res.Status == 'OK') { this.$Message.success(this.$t('message.savesuccess')); this.initFormConfig.sceneList.forEach(item => { - if (item.uuid === sceneUuid) { + if (item.uuid === this.sceneUuid) { this.$set(item, 'readOnly', readOnly); } }); diff --git a/src/views/pages/rdm/project/attr-handler/worker-attr.vue b/src/views/pages/rdm/project/attr-handler/worker-attr.vue index c6d83463e9984e566b9b6f79ce1c2ebdcdd6fe75..c5e286975d5c29fc76043ac76eae8cdcf6c7d2c1 100644 --- a/src/views/pages/rdm/project/attr-handler/worker-attr.vue +++ b/src/views/pages/rdm/project/attr-handler/worker-attr.vue @@ -9,6 +9,7 @@ :transfer="true" :extendCondition="{ projectId: projectId }" :groupList="groupList" + :border="border" :includeList="['common#loginuser']" :excludeList="['common#alluser']" @change="