From 8c1ce3d69d540a11477dac15102eae358feb389a Mon Sep 17 00:00:00 2001 From: lihui_ocr Date: Fri, 17 May 2024 16:24:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches/naive-ui+2.38.1.patch | 7 +- src/layout/components/Header/ConfrimModal.vue | 13 +-- src/layout/components/Header/index.vue | 81 +++++++++++++++++-- src/views/final/comp/CustomTabelModal.vue | 15 +++- src/views/final/comp/FilterModal.vue | 6 +- src/views/final/content/ListContent.vue | 10 ++- src/views/home/aside/comp/AdvanceFilter.vue | 8 +- src/views/home/aside/comp/modals/TiShi.vue | 4 +- src/views/login/components/Login.vue | 13 ++- src/views/task/aside/Aside.vue | 1 + src/views/task/content/Content.vue | 2 +- src/views/task/modal/CustomFieldModal.vue | 4 +- src/views/worksheet/content/Content.vue | 20 ++--- .../worksheet/modal/CustomFieldModal.vue | 30 ++++++- 14 files changed, 172 insertions(+), 42 deletions(-) diff --git a/patches/naive-ui+2.38.1.patch b/patches/naive-ui+2.38.1.patch index def1206..015be74 100644 --- a/patches/naive-ui+2.38.1.patch +++ b/patches/naive-ui+2.38.1.patch @@ -20,10 +20,7 @@ index 3aacec9..a63ab54 100644 - class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error` - }, feedbackNodes) : mergedValidationStatus === 'success' ? h("div", { + class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex` -+ }, [h('img', { -+ style: { width: '1rem', height: '1rem' }, -+ src: 'notice.svg' -+ }), feedbackNodes]) : mergedValidationStatus === 'success' ? h("div", { ++ }, ) : mergedValidationStatus === 'success' ? h("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes) : h("div", { @@ -179,7 +176,7 @@ index 4f47aad..6dae078 100644 const feedbackNodes = children || feedback ? ((0, vue_1.h)("div", { key: "__feedback__", class: `${mergedClsPrefix}-form-item-feedback__line` }, children || feedback)) : this.renderExplains.length ? ((_a = this.renderExplains) === null || _a === void 0 ? void 0 : _a.map(({ key, render }) => ((0, vue_1.h)("div", { key: key, class: `${mergedClsPrefix}-form-item-feedback__line` }, render())))) : null; - return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error` }, feedbackNodes)) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null; + return feedbackNodes ? (mergedValidationStatus === 'warning' ? ((0, vue_1.h)("div", { key: "controlled-warning", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--warning` }, feedbackNodes)) : mergedValidationStatus === 'error' ? ((0, vue_1.h)("div", { key: "controlled-error", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--error flex` }, [h('img', { -+ style: { width: '1rem', height: '1rem' },src: 'notice.svg' ++ style: { width: '1rem', height: '1rem' },src: src + }), feedbackNodes])) : mergedValidationStatus === 'success' ? ((0, vue_1.h)("div", { key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes)) : ((0, vue_1.h)("div", { key: "controlled-default", class: `${mergedClsPrefix}-form-item-feedback` }, feedbackNodes))) : null; }); } diff --git a/src/layout/components/Header/ConfrimModal.vue b/src/layout/components/Header/ConfrimModal.vue index 6138e5d..ffe858d 100644 --- a/src/layout/components/Header/ConfrimModal.vue +++ b/src/layout/components/Header/ConfrimModal.vue @@ -13,7 +13,8 @@ const props = defineProps({ const show = ref(false) const cardStyle = { - 'width': '450px', + 'width': '424px', + 'height': '192px', '--n-padding-top': '20px', '--n-padding-bottom': '20px', '--n-padding-left': '20px', @@ -46,7 +47,7 @@ onBeforeMount(async () => { })
- + 确认提示
@@ -55,10 +56,12 @@ onBeforeMount(async () => { })
diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue index a8908f5..6505e9b 100644 --- a/src/views/final/comp/CustomTabelModal.vue +++ b/src/views/final/comp/CustomTabelModal.vue @@ -226,7 +226,20 @@ watch( } }, ) +function zhidingfun(item){ +let obj = item; +let newarr= onList.value +// 先检查并移除对象是否已经存在于数组中 +let index = newarr.indexOf(obj); +if (index !== -1) { + newarr.splice(index, 1); +} + +// 使用 unshift 方法将对象放到数组的第一位 +newarr.unshift(obj); + onList.value=newarr +} watch( () => showIds.value.length, (newVal, oldVal) => { @@ -404,7 +417,7 @@ const indeterminate = computed(() => { > {{ item.name }} -
+
diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue index 94894d7..2183cb7 100644 --- a/src/views/worksheet/modal/CustomFieldModal.vue +++ b/src/views/worksheet/modal/CustomFieldModal.vue @@ -42,9 +42,11 @@ const showOffList = computed(() => { }) }) const showFixList = computed(() => { + return fixList.value.filter(i => i.name.includes(searchFixVal.value)) }) const showOnList = computed(() => { + console.log(searchFixVal.value) return onList.value.filter(i => i.name.includes(searchFixVal.value)) }) const selectCount = computed(() => { @@ -126,7 +128,20 @@ function onCheckChange(checked: any, item: any) { selectIds.value.push(item.id) else selectIds.value.splice(index, 1) } +function zhidingfun(item){ +let obj = item; +let newarr= onList.value +// 先检查并移除对象是否已经存在于数组中 +let index = newarr.indexOf(obj); +if (index !== -1) { + newarr.splice(index, 1); +} + +// 使用 unshift 方法将对象放到数组的第一位 +newarr.unshift(obj); + onList.value=newarr +} const showIds = computed(() => { return onList.value.map((item) => { return item.id @@ -178,6 +193,14 @@ watch( }, ) +watch( + () => showOnList.value, + (newVal, oldVal) => { + console.log(showOnList.value) + // alert(1) + }, +) + watch( () => showIds.value.length, (newVal, oldVal) => { @@ -382,6 +405,7 @@ const indeterminate = computed(() => {
系统默认
+
{ :class="{ fix: item.fix }" class="cursor-move draggable-item" > + {{ item.name }}
@@ -408,7 +433,7 @@ const indeterminate = computed(() => { {{ item.name }} -
+