From 8c25390c6ec3fd2b2778dca2426e23eb7f4125dc Mon Sep 17 00:00:00 2001 From: dengbf Date: Mon, 27 Nov 2023 14:19:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91=E8=AE=BE=E7=BD=AE=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=8F=AA=E8=AF=BB=E6=97=B6=EF=BC=8C=E9=A2=84=E8=A7=88=E6=97=B6?= =?UTF-8?q?=E4=B8=8E=E8=AE=BE=E7=BD=AE=E5=80=BC=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/assets/css/common.less | 2 +- src/resources/plugins/TsSheet/form-edit.vue | 14 +++++++------- src/resources/plugins/TsSheet/form-scene-edit.vue | 12 ++++++------ .../pages/rdm/project/attr-handler/worker-attr.vue | 1 + 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/resources/assets/css/common.less b/src/resources/assets/css/common.less index d47402d4..d5b4b66a 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 727796c7..ee7d2b6f 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 6f7d00a1..03574d23 100644 --- a/src/resources/plugins/TsSheet/form-scene-edit.vue +++ b/src/resources/plugins/TsSheet/form-scene-edit.vue @@ -22,7 +22,7 @@
- + - + >
@@ -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,12 +594,12 @@ 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')); 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 c6d83463..c5e28697 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=" -- Gitee From 13cb8ba4d5129b0243323bad6149c59cbe388cda Mon Sep 17 00:00:00 2001 From: dengbf Date: Mon, 27 Nov 2023 14:23:44 +0800 Subject: [PATCH 2/3] commit --- src/resources/plugins/TsSheet/form-scene-edit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/plugins/TsSheet/form-scene-edit.vue b/src/resources/plugins/TsSheet/form-scene-edit.vue index 03574d23..56c6c1e1 100644 --- a/src/resources/plugins/TsSheet/form-scene-edit.vue +++ b/src/resources/plugins/TsSheet/form-scene-edit.vue @@ -604,7 +604,7 @@ export default { 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); } }); -- Gitee From 7941332c5c5c4b93fa60b58c1f70bacd66e48772 Mon Sep 17 00:00:00 2001 From: dengbf Date: Mon, 27 Nov 2023 14:26:02 +0800 Subject: [PATCH 3/3] commit --- src/resources/plugins/TsSheet/form-scene-edit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/plugins/TsSheet/form-scene-edit.vue b/src/resources/plugins/TsSheet/form-scene-edit.vue index 56c6c1e1..53528135 100644 --- a/src/resources/plugins/TsSheet/form-scene-edit.vue +++ b/src/resources/plugins/TsSheet/form-scene-edit.vue @@ -30,7 +30,7 @@ :content="$t('term.framework.globalreadonlytip')" > {{ $t('term.framework.globalreadonly') }} - +