修改资源

public/version.json

@@ -1 +1 @@
-{"version":1709549872819}
+{"version":1709552479880}

src/views/natural-resources/components/my-resources/index.tsx

@@ -55,7 +55,6 @@ export default defineComponent({
       editStatus: false, // 是否编辑
       editList: [] as any, // TOD
       editIds: [] as any, // 编辑的
-      deleteIds: [] as any, // 删除编号
       editOverIds: [] as any, // 确认修改的数据
       removeVisiable: false,
       removeContent: '是否删除该资源？',
@@ -186,17 +185,12 @@ export default defineComponent({
           }}
           onEditOver={async (status: boolean) => {
             state.editStatus = status;
-            // 删除
             try {
-              if (state.deleteIds.length > 0) {
-                await onDelete();
-              }
-
               // 修改
-              if (state.editIds.length > 0) {
+              if (state.editOverIds.length > 0) {
                 const body = [] as any;
                 state.tableList.forEach((item: any) => {
-                  if (state.editIds.includes(item.id)) {
+                  if (state.editOverIds.includes(item.id)) {
                     body.push({
                       subjectIds: item.subjectId,
                       openFlag: item.openFlag,
@@ -205,7 +199,8 @@ export default defineComponent({
                       type: item.type,
                       enableFlag: 1,
                       content: item.content,
-                      id: item.id || null
+                      id: item.id || null,
+                      delFlag: item.delFlag
                     });
                   }
                 });
@@ -214,12 +209,10 @@ export default defineComponent({
                   await materialUpdateAll(body);
                 }
               }
-              console.log('1111');
               message.success('修改成功');
               state.pagination.page = 1;
               getList();
               state.editIds = [];
-              state.deleteIds = [];
               state.editOverIds = [];
             } catch {
               //
@@ -229,7 +222,6 @@ export default defineComponent({
             state.editStatus = status;
             state.pagination.page = 1;
             state.editIds = [];
-            state.deleteIds = [];
             state.editOverIds = [];
             getList();
           }}
@@ -239,7 +231,6 @@ export default defineComponent({
 
             if (!state.editStatus) {
               state.editIds = [];
-              state.deleteIds = [];
               state.editOverIds = [];
             }
           }}
@@ -268,57 +259,60 @@ export default defineComponent({
 
         <NSpin v-model:show={state.loading} style={{ 'min-height': '50vh' }}>
           <div class={styles.list}>
-            {state.tableList.map((item: any) => (
-              <div class={styles.itemWrap}>
-                <div class={styles.itemWrapBox}>
-                  <CardType
-                    item={item}
-                    isDownload
-                    disabledMouseHover={false}
-                    offShelf={item.enableFlag ? false : true}
-                    onOffShelf={() => {
-                      state.type = 'remove';
-                      state.removeContent = '该资源已下架，是否删除？';
-                      state.removeVisiable = true;
-                      state.removeItem = item;
-                    }} // 下架
-                    onClick={(val: any) => {
-                      if (val.type === 'IMG' || !item.enableFlag) return;
-                      state.show = true;
-                      state.item = val;
-                    }}
-                    onCollect={(item: any) => onCollect(item)}
-                  />
-                  {/* 编辑模式 */}
-                  {state.editStatus && (
-                    <div
-                      class={[
-                        styles.itemBg,
-                        state.editIds.includes(item.id)
-                          ? styles.itemBgChecked
-                          : ''
-                      ]}
-                      onClick={() => {
-                        const index = state.editIds.indexOf(item.id);
-                        if (index > -1) {
-                          state.editIds.splice(index, 1);
-                        } else {
-                          state.editIds.push(item.id);
-                        }
-                      }}>
-                      <img
-                        src={
-                          state.editIds.includes(item.id)
-                            ? resourceChecked
-                            : resourceDefault
-                        }
-                        class={styles.resourceDefault}
+            {state.tableList.map(
+              (item: any) =>
+                item.delFlag !== 1 && (
+                  <div class={styles.itemWrap}>
+                    <div class={styles.itemWrapBox}>
+                      <CardType
+                        item={item}
+                        isDownload
+                        disabledMouseHover={false}
+                        offShelf={item.enableFlag ? false : true}
+                        onOffShelf={() => {
+                          state.type = 'remove';
+                          state.removeContent = '该资源已下架，是否删除？';
+                          state.removeVisiable = true;
+                          state.removeItem = item;
+                        }} // 下架
+                        onClick={(val: any) => {
+                          if (val.type === 'IMG' || !item.enableFlag) return;
+                          state.show = true;
+                          state.item = val;
+                        }}
+                        onCollect={(item: any) => onCollect(item)}
                       />
+                      {/* 编辑模式 */}
+                      {state.editStatus && (
+                        <div
+                          class={[
+                            styles.itemBg,
+                            state.editIds.includes(item.id)
+                              ? styles.itemBgChecked
+                              : ''
+                          ]}
+                          onClick={() => {
+                            const index = state.editIds.indexOf(item.id);
+                            if (index > -1) {
+                              state.editIds.splice(index, 1);
+                            } else {
+                              state.editIds.push(item.id);
+                            }
+                          }}>
+                          <img
+                            src={
+                              state.editIds.includes(item.id)
+                                ? resourceChecked
+                                : resourceDefault
+                            }
+                            class={styles.resourceDefault}
+                          />
+                        </div>
+                      )}
                     </div>
-                  )}
-                </div>
-              </div>
-            ))}
+                  </div>
+                )
+            )}
 
             {!state.loading && state.tableList.length <= 0 && (
               <TheEmpty style={{ minHeight: '50vh' }} description="暂无资源" />
@@ -352,6 +346,7 @@ export default defineComponent({
             onConfirm={() => {
               state.editIds = [];
               state.editList = [];
+              state.editOverIds = [];
               state.saveStatus = false;
               searchGroupResourcesRef.value?.resetStatus();
               onSearch(state.searchGroup);
@@ -427,13 +422,15 @@ export default defineComponent({
                   if (state.type === 'remove') {
                     onRemove();
                   } else {
-                    state.editIds.forEach((id: any) => {
-                      const index = state.tableList.findIndex(
-                        (item: any) => item.id === id
-                      );
-                      state.tableList.splice(index, 1);
+                    state.tableList.forEach((item: any) => {
+                      if (state.editIds.includes(item.id)) {
+                        item.delFlag = 1;
+
+                        if (!state.editOverIds.includes(item.id)) {
+                          state.editOverIds.push(item.id);
+                        }
+                      }
                     });
-                    state.deleteIds = deepClone(state.editIds);
                   }
                   state.removeVisiable = false;
                 }}>