修改ShowList同步报错问题，修改上传图片siteId错误问题

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/common/controller/UploadController.java

@@ -1,7 +0,0 @@
-package org.jeecg.modules.okki.common.controller;
-
-import org.jeecg.common.system.base.controller.JeecgController;
-
-public class UploadController extends JeecgController {
-
-}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/common/service/IUploadService.java

@@ -1,8 +1,5 @@
 package org.jeecg.modules.okki.common.service;
 
-import org.springframework.web.multipart.MultipartFile;
-
 public interface IUploadService {
-
-    String upload(MultipartFile file) throws Exception;
+    String uploadImage(String fileUrl, String siteId) throws Exception;
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/common/service/impl/UploadServiceImpl.java

@@ -2,53 +2,93 @@ package org.jeecg.modules.okki.common.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.okki.utils.HttpClientUtils;
 import org.jeecg.modules.okki.common.service.IUploadService;
+import org.jeecg.modules.okki.utils.HttpClientUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-@Slf4j
 @Service
+@Slf4j
 public class UploadServiceImpl implements IUploadService {
 
+    @Value("${OKKI.BASE_URL}")
+    private String URL;
+
     @Value("${OKKI.CLIENT_SECRET}")
     private String CLIENT_SECRET;
 
-    @Value("${OKKI.BASE_URL}")
-    private String BASE_URL;
-
     @Override
-    public String upload(MultipartFile mf) throws Exception {
+    public String uploadImage(String fileUrl, String siteId) throws Exception {
+//        URL url = new URL(fileUrl);
+//        URLConnection connection1 = url.openConnection();
+//        InputStream inputStream = connection1.getInputStream();
+//        File tempFile = File.createTempFile("temp", ".tmp");
+//        OutputStream outputStream1 = new FileOutputStream(tempFile);
+//        byte[] buffer = new byte[1024];
+//        int length;
+//        while ((length = inputStream.read(buffer)) != -1) {
+//            outputStream1.write(buffer, 0, length);
+//        }
+        int HttpResult;
+        byte[] bytes = new byte[204800];
+        URL url = new URL(fileUrl); // 创建URL
+        URLConnection urlconn = url.openConnection(); // 试图连接并取得返回状态码
+        urlconn.connect();
+        HttpURLConnection httpconn = (HttpURLConnection) urlconn;
+        HttpResult = httpconn.getResponseCode();
+        if (HttpResult != HttpURLConnection.HTTP_OK) {
+            log.error("获取文件失败，无法连接到文件资源");
+        } else {
+            int filesize = urlconn.getContentLength(); // 取数据长度
+            log.info("取数据长度:{}", filesize);
+            urlconn.getInputStream();
+            InputStream inputStream = urlconn.getInputStream();
+            //如果这里只需要返回stream，则直接返回 不需要转byte[]
+
+            ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
+            int ch;
+            while ((ch = inputStream.read()) != -1) {
+                swapStream.write(ch);
+            }
+            bytes = swapStream.toByteArray();
+        }
+
         Map<String, String> query = new HashMap<>();
         query.put("sign_method", "hmac-md5"); // 签名方式
         query.put("timestamp", String.valueOf(System.currentTimeMillis())); // 时间戳
-        query.put("site_id", "1000147"); // 小满站点id
+        query.put("site_id", siteId); // 小满站点id
         query.put("method", "upload_file"); // 上传文件
         String queryStr = HttpClientUtils.buildQueryString(query);
         query.put("signature", HttpClientUtils.generateHmacMD5(queryStr, CLIENT_SECRET)); // 签名
-        String okkiUrl = BASE_URL + "?" + HttpClientUtils.buildQueryString(query);
-//        // 第一步
-//        String encoder = URLEncoder(url, "UTF-8");
-////第二步
-//        String decoder = URLDecoder(encoder, "UTF-8");
-//
-//        URL url = new URL (decoder);
-
-//        String tmpName = mf.getName(); // 从$_FILE['file']['tmp_name']读取文件路径
-//        File file = new File(tmpName);
-        String fileName = mf.getOriginalFilename(); // 从$_FILE['file']['name']获取
-        String fileType = mf.getContentType(); // 从$_FILE['file']['type']获取
-        byte[] fileContent = mf.getBytes();
+        String okkiUrl = URL + "?" + HttpClientUtils.buildQueryString(query);
+
+//        return uploadImage2(fileUrl, okkiUrl);
+//        File tempFile = new File(url.getPath());
+//        String fileName = tempFile.getName(); // 从$_FILE['file']['name']获取
+//        System.out.println(fileName);
+//        String fileType = fileUrl.substring(fileUrl.lastIndexOf(".") + 1);; // 从$_FILE['file']['type']获取
+//        System.out.println(fileType);
+//        byte[] fileContent = HttpClientUtils.readBytesFromFile(tempFile);
+        URI uri = new URI(fileUrl);
+//        URL url1 = uri.toURL();
+
+        String path = uri.getPath(); // 获取路径部分
+        String fileName = path.substring(path.lastIndexOf('/') + 1); // 获取文件名
+        String fileType = getFileType(fileName); // 获取文件类型
+
+        System.out.println("Filename: " + fileName);
+        System.out.println("Filetype: " + fileType);
+        byte[] fileContent = bytes;
         String delimiter = "-------------" + System.currentTimeMillis();
         String boundary = delimiter;
         String crlf = "\r\n";
@@ -78,17 +118,64 @@ public class UploadServiceImpl implements IUploadService {
             response.append(line);
         }
         bufferedReader.close();
+        //{"code":0,"msg":"success","now":"2024-06-25 15:33:14","data":{"url":"https:\/\/okki-shop-dev.oss-cn-hangzhou.aliyuncs.com\/1000147\/upload\/custom\/e132e613b00d8448acf9cf18bc7e4b6affc7bd305c68f9747d529f9580647376.jpg"}}
         JSONObject jsonObject = JSONObject.parseObject(response.toString());
-        if ("0".equals(jsonObject.get("code").toString())) {
-            return JSONObject.parseObject(jsonObject.get("data").toString()).get("url").toString();
+        if ("0".equals(jsonObject.get("code"))) {
+            final JSONObject jsonObject1 = JSONObject.parseObject(jsonObject.get("data").toString());
+            return jsonObject1.get("url").toString();
         }else {
-            throw new RuntimeException(jsonObject.get("msg").toString());
+            throw new Exception(jsonObject.get("msg").toString());
         }
+    }
 
-//        System.out.println(response.toString());
-//        return response.toString();
-//        String res = HttpClientUtils.doPost(okkiUrl, body);
+    private static String getFileType(String filename) {
+        Pattern pattern = Pattern.compile("\\.(\\w+)$");
+        Matcher matcher = pattern.matcher(filename);
+        if (matcher.find()) {
+            return matcher.group(1);
+        }
+        return ""; // 如果没有匹配到文件类型，则返回空字符串
     }
 
+    public static String uploadImage2(String imageUrl, String uploadUrl) throws IOException {
+        String boundary = Long.toHexString(System.currentTimeMillis());
+        String CRLF = "\r\n"; // 换行符
+        URL url = new URL(uploadUrl);
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+        connection.setDoOutput(true);
+        connection.setRequestMethod("POST");
+        connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
 
+        try (
+                OutputStream output = connection.getOutputStream();
+                PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, "UTF-8"), true);
+        ) {
+            // 发送文件数据
+            writer.append("--" + boundary).append(CRLF);
+            writer.append("Content-Disposition: form-data; name=\"image\"; filename=\"image.jpg\"").append(CRLF);
+            writer.append("Content-Type: image/jpeg").append(CRLF);
+            writer.append(CRLF).flush();
+
+            // 写入文件内容
+            try (InputStream inputStream = new URL(imageUrl).openStream()) {
+                byte[] buffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    output.write(buffer, 0, bytesRead);
+                }
+                output.flush(); // 确保图片数据发送完毕
+            }
+
+            // 结束标志
+            writer.append(CRLF).flush();
+            writer.append("--" + boundary + "--").append(CRLF);
+        }
+
+        int responseCode = connection.getResponseCode();
+        System.out.println("Response Code: " + responseCode);
+
+        connection.disconnect();
+        return connection.getContent().toString();
+    }
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/controller/OkkiShowlistController.java

@@ -13,7 +13,6 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.okki.blog.entity.OkkiBlog;
 import org.jeecg.modules.okki.showlist.entity.*;
 import org.jeecg.modules.okki.showlist.service.*;
 import org.jeecg.modules.okki.showlist.vo.OkkiShowlistPage;
@@ -417,8 +416,12 @@ public class OkkiShowlistController {
 	  * @return
 	  */
 	 @PostMapping(value = "/status")
-	 public Result<String> changeStatus(@RequestBody OkkiShowlist okkiShowlist) throws Exception {
-		 boolean result = okkiShowlistService.changeStatus(okkiShowlist);
+	 public Result<String> changeStatus(@RequestBody OkkiShowlist okkiShowlist, HttpServletRequest request) throws Exception {
+		 String scheme = request.getScheme();             // http
+		 String serverName = request.getServerName();     // hostname.com
+		 int serverPort = request.getServerPort();
+		 String domain = scheme + "://" +serverName + ":" + serverPort;
+		 boolean result = okkiShowlistService.changeStatus(okkiShowlist, domain);
 		 if (result) {
 			 return Result.OK("操作成功");
 		 }else {

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/IOkkiShowlistService.java

@@ -72,5 +72,5 @@ public interface IOkkiShowlistService extends IService<OkkiShowlist> {
 	 */
 	public void delBatchMain (Collection<? extends Serializable> idList);
 
-	boolean changeStatus(OkkiShowlist okkiShowlist);
+	boolean changeStatus(OkkiShowlist okkiShowlist, String domain);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiShowlistServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.okki.common.service.IUploadService;
 import org.jeecg.modules.okki.showlist.entity.*;
 import org.jeecg.modules.okki.showlist.mapper.*;
 import org.jeecg.modules.okki.showlist.param.*;
@@ -55,7 +56,10 @@ public class OkkiShowlistServiceImpl extends ServiceImpl<OkkiShowlistMapper, Okk
 	private OkkiFaqMapper okkiFaqMapper;
 	@Autowired
 	private OkkiShowlistBlogMapper okkiShowlistBlogMapper;
-	
+
+	@Autowired
+	private IUploadService uploadService;
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveMain(OkkiShowlist okkiShowlist, List<OkkiOverview> okkiOverviewList,List<OkkiProductList> okkiProductListList,List<OkkiHighlight> okkiHighlightList,List<OkkiAdvantage> okkiAdvantageList,List<OkkiRecommendedProducts> okkiRecommendedProductsList,List<OkkiKeywords> okkiKeywordsList,List<OkkiKeywordsSeries> okkiKeywordsSeriesList,List<OkkiReview> okkiReviewList,List<OkkiFaq> okkiFaqList,List<OkkiShowlistBlog> okkiShowlistBlogList) {
@@ -257,7 +261,7 @@ public class OkkiShowlistServiceImpl extends ServiceImpl<OkkiShowlistMapper, Okk
 	}
 
 	@Override
-	public boolean changeStatus(OkkiShowlist param) {
+	public boolean changeStatus(OkkiShowlist param, String domain){
 		// 主表id
 		String id = param.getId();
 		OkkiShowlist okkiShowlist = okkiShowlistMapper.selectById(id);
@@ -271,15 +275,29 @@ public class OkkiShowlistServiceImpl extends ServiceImpl<OkkiShowlistMapper, Okk
 		List<OkkiReview> okkiReviews = okkiReviewMapper.selectByMainId(id);
 		List<OkkiFaq> okkiFaqs = okkiFaqMapper.selectByMainId(id);
 		List<OkkiShowlistBlog> okkiShowlistBlogs = okkiShowlistBlogMapper.selectByMainId(id);
-		// 请求okki平台接口
-		Map<String, String> query = new TreeMap<>();
-		query.put("sign_method", "hmac-md5");
-		query.put("timestamp", String.valueOf(System.currentTimeMillis()));
-		query.put("site_id", String.valueOf(okkiShowlist.getSiteId()));
-		query.put("method", "save_showlist");
-		PushShowlistParam pushShowlistParam = new PushShowlistParam();
 		// 组装传入参数
 		try {
+
+			String imageBaseUrl = domain + "/shop-api/sys/common/static/";
+			System.out.println(imageBaseUrl);
+//			 将内容图片和其他图片地址通过接口上传到小满
+			if (okkiOverviews.size()>0) {
+				for (OkkiOverview okkiOverview : okkiOverviews) {
+					if (!"".equals(okkiOverview.getPic())) {
+						String imgUrl = uploadService.uploadImage(imageBaseUrl + okkiOverview.getPic(), String.valueOf(okkiShowlist.getSiteId()));
+						System.out.println(imgUrl);
+						okkiOverview.setPic(imgUrl);
+					}
+					// 将内容中图片地址获取到
+				}
+			}
+			// 请求okki平台接口
+			Map<String, String> query = new TreeMap<>();
+			query.put("sign_method", "hmac-md5");
+			query.put("timestamp", String.valueOf(System.currentTimeMillis()));
+			query.put("site_id", String.valueOf(okkiShowlist.getSiteId()));
+			query.put("method", "save_showlist");
+			PushShowlistParam pushShowlistParam = new PushShowlistParam();
 			String queryStr = HttpClientUtils.buildQueryString(query);
 			pushShowlistParam.setShowlist_id(id);
 			pushShowlistParam.setUrl(okkiShowlist.getUrl());

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java

@@ -8,7 +8,6 @@ import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.filter.SsrfFileTypeFilter;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.okki.common.service.IUploadService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.FileCopyUtils;
@@ -21,7 +20,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -48,9 +46,6 @@ public class CommonController {
     @Value(value="${jeecg.uploadType}")
     private String uploadType;
 
-    @Resource
-    private IUploadService uploadService;
-
     /**
      * @Author 政辉
      * @return
@@ -111,12 +106,14 @@ public class CommonController {
                 savePath = this.uploadLocal(file,bizPath);
             }
             */
-        }else if (CommonConstant.UPLOAD_TYPE_THIRD.equals(uploadType)) {
-            SsrfFileTypeFilter.checkUploadFileType(file);
-            //update-end-author:liusq date:20221102 for: 过滤上传文件类型
-            //update-begin-author:lvdandan date:20200928 for:修改JEditor编辑器本地上传
-            savePath = this.uploadThird(file);
-        } else{
+        }
+//        else if (CommonConstant.UPLOAD_TYPE_THIRD.equals(uploadType)) {
+//            SsrfFileTypeFilter.checkUploadFileType(file);
+//            //update-end-author:liusq date:20221102 for: 过滤上传文件类型
+//            //update-begin-author:lvdandan date:20200928 for:修改JEditor编辑器本地上传
+//            savePath = this.uploadThird(file);
+//        }
+        else{
             //update-begin-author:taoyan date:20200814 for:文件上传改造
             savePath = CommonUtils.upload(file, bizPath, uploadType);
             //update-end-author:taoyan date:20200814 for:文件上传改造
@@ -131,14 +128,14 @@ public class CommonController {
         return result;
     }
 
-    private String uploadThird(MultipartFile mf) throws Exception{
-        try {
-            return uploadService.upload(mf);
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-        return "";
-    }
+//    private String uploadThird(MultipartFile mf) throws Exception{
+//        try {
+//            return uploadService.upload(mf);
+//        } catch (IOException e) {
+//            log.error(e.getMessage(), e);
+//        }
+//        return "";
+//    }
 
     /**
      * 本地文件上传

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -207,7 +207,7 @@ jeecg:
   #签名拦截接口
   signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
   # 本地：local、Minio：minio、阿里云：alioss 、第三方：third
-  uploadType: third
+  uploadType: local
   # 前端访问地址
   domainUrl:
     pc: http://localhost:3100

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -209,14 +209,14 @@ jeecg:
   #签名拦截接口
   signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
   # local\minio\alioss
-  uploadType: third
+  uploadType: local
   # 前端访问地址
   domainUrl:
     pc: http://localhost:3100
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: /opt/jeecg-boot/upload
+    upload: /home/centos/okki-oms/upload
     #webapp文件路径
     webapp: /opt/jeecg-boot/webapp
   shiro:

jeecgboot-vue3/src/views/okki/showlist/OkkiShowlist.api.ts

@@ -17,7 +17,6 @@ enum Api {
   okkiAdvantageList = '/showlist/okkiShowlist/queryOkkiAdvantageByMainId',
   okkiRecommendedProductsList = '/showlist/okkiShowlist/queryOkkiRecommendedProductsByMainId',
   okkiKeywordsList = '/showlist/okkiShowlist/queryOkkiKeywordsByMainId',
-  okkiKeywordsSeriesList = '/showlist/okkiShowlist/queryOkkiKeywordsSeriesByMainId',
   okkiReviewList = '/showlist/okkiShowlist/queryOkkiReviewByMainId',
   okkiFaqList = '/showlist/okkiShowlist/queryOkkiFaqByMainId',
   okkiShowlistBlogList = '/showlist/okkiShowlist/queryOkkiShowlistBlogByMainId',
@@ -66,11 +65,6 @@ export const okkiKeywordsList = Api.okkiKeywordsList;
  * 查询子表数据
  * @param params
  */
-export const okkiKeywordsSeriesList = Api.okkiKeywordsSeriesList;
-/**
- * 查询子表数据
- * @param params
- */
 export const okkiReviewList = Api.okkiReviewList;
 /**
  * 查询子表数据

jeecgboot-vue3/src/views/okki/showlist/OkkiShowlist.data.ts

@@ -3,12 +3,13 @@ import {FormSchema} from '/@/components/Table';
 import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
+import {useGlobSetting} from "@/hooks/setting";
 //列表数据
 export const columns: BasicColumn[] = [
    {
     title: '站点id',
     align:"center",
-    dataIndex: 'siteId'
+    dataIndex: 'siteId_dictText'
    },
    {
     title: '页面路径',
@@ -31,9 +32,24 @@ export const columns: BasicColumn[] = [
     dataIndex: 'reportLink'
    },
    {
+    title: 'showlist标题',
+    align:"center",
+    dataIndex: 'tdkTitle'
+   },
+   {
+    title: 'showlist描述',
+    align:"center",
+    dataIndex: 'tdkDescription'
+   },
+   {
+    title: 'showlist关键词',
+    align:"center",
+    dataIndex: 'tdkKeywords'
+   },
+   {
     title: '同步状态',
     align:"center",
-    dataIndex: 'status'
+    dataIndex: 'status_dictText'
    },
    {
     title: '创建日期',
@@ -54,7 +70,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '站点id',
     field: 'siteId',
-    component: 'InputNumber',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"okki_site,company_name,site_id"
+     },
   },
   {
     label: '页面路径',
@@ -64,7 +83,7 @@ export const formSchema: FormSchema[] = [
   {
     label: '结构化数据',
     field: 'jsonLd',
-    component: 'InputTextArea',
+    component: 'JEditor',
   },
   {
     label: '询盘的板式',
@@ -84,159 +103,128 @@ export const formSchema: FormSchema[] = [
     field: 'reportLink',
     component: 'InputNumber',
   },
-	// TODO 主键隐藏字段，目前写死为ID
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
-];
-//子表单数据
-export const okkiOverviewFormSchema: FormSchema[] = [
   {
-    label: '概览类型',
-    field: 'overviewType',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"overview_type"
-     },
+    label: '亮点标题',
+    field: 'highlightTitle',
+    component: 'Input',
   },
   {
-    label: '概览标题',
-    field: 'title',
-    component: 'Input',
+    label: '亮点简介',
+    field: 'highlightContent',
+    component: 'JEditor',
   },
   {
-    label: '概览内容',
-    field: 'content',
-    component: 'InputTextArea',
+    label: '亮点布局文字对齐方式',
+    field: 'highlightLayoutAlignment',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"layout_alignment"
+     },
   },
   {
-    label: '概览图片链接',
-    field: 'pic',
-     component: 'JImageUpload',
-     componentProps:{
-      },
+    label: '亮点布局每行列数',
+    field: 'highlightLayoutColumnsPerRow',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"layout_columns_per_row"
+     },
   },
   {
-    label: '按钮文字',
-    field: 'buttonName',
+    label: '优势标题',
+    field: 'advantageTitle',
     component: 'Input',
   },
   {
-    label: '按钮跳转链接',
-    field: 'buttonUrl',
-    component: 'Input',
+    label: '优势内容',
+    field: 'advantageContent',
+    component: 'JEditor',
   },
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
-];
-export const okkiProductListFormSchema: FormSchema[] = [
   {
-    label: '产品列表类型',
-    field: 'productListType',
+    label: '优势布局文字对齐方式',
+    field: 'advantageLayoutAlignment',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"product_list_type"
+        dictCode:"layout_alignment"
      },
   },
   {
-    label: '标题',
-    field: 'title',
-    component: 'Input',
+    label: '优势布局每行列数',
+    field: 'advantageLayoutColumnsPerRow',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"layout_columns_per_row"
+     },
   },
   {
-    label: '字幕',
-    field: 'subtitles',
+    label: '关键词标题',
+    field: 'keywordsTitle',
     component: 'Input',
   },
   {
-    label: '商品pid',
-    field: 'pidList',
+    label: '关键词系列标题',
+    field: 'keywordsSeriesTitle',
     component: 'Input',
   },
   {
-    label: '商品分类sid',
-    field: 'sid',
-    component: 'InputNumber',
+    label: '关键词系列排版结构',
+    field: 'keywordsSeriesLayoutType',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"layout_type"
+     },
   },
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
-];
-export const okkiHighlightFormSchema: FormSchema[] = [
   {
-    label: '模块标题',
-    field: 'title',
+    label: '评价标题',
+    field: 'reviewTitle',
     component: 'Input',
   },
   {
-    label: '模块简介',
-    field: 'content',
-    component: 'InputTextArea',
+    label: '评价字幕',
+    field: 'reviewSubtitles',
+    component: 'Input',
   },
   {
-    label: '文字对齐方式',
-    field: 'layoutAlignment',
+    label: '评价布局文字对齐方式',
+    field: 'reviewLayoutAlignment',
     component: 'JDictSelectTag',
     componentProps:{
         dictCode:"layout_alignment"
      },
   },
   {
-    label: '每行列数',
-    field: 'layoutColumnsPerRow',
+    label: '评价布局每行列数',
+    field: 'reviewLayoutColumnsPerRow',
     component: 'JDictSelectTag',
     componentProps:{
         dictCode:"layout_columns_per_row"
      },
   },
-  // {
-  //   label: '组件',
-  //   field: 'block',
-  //   component: 'Input',
-  // },
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
-];
-export const okkiRecommendedProductsFormSchema: FormSchema[] = [
   {
-    label: '类型',
-    field: 'productListType',
-    component: 'InputNumber',
+    label: 'faq标题',
+    field: 'faqTitle',
+    component: 'Input',
   },
   {
-    label: '标题',
-    field: 'title',
+    label: 'faq字幕',
+    field: 'faqSubtitles',
     component: 'Input',
   },
   {
-    label: '字幕',
-    field: 'subtitles',
+    label: 'showlist标题',
+    field: 'tdkTitle',
     component: 'Input',
   },
   {
-    label: '商品pid',
-    field: 'pidList',
+    label: 'showlist描述',
+    field: 'tdkDescription',
     component: 'Input',
   },
   {
-    label: '商品分类sid',
-    field: 'sid',
-    component: 'InputNumber',
+    label: 'showlist关键词',
+    field: 'tdkKeywords',
+    component: 'Input',
   },
+	// TODO 主键隐藏字段，目前写死为ID
 	{
 	  label: '',
 	  field: 'id',
@@ -244,41 +232,41 @@ export const okkiRecommendedProductsFormSchema: FormSchema[] = [
 	  show: false
 	},
 ];
-export const okkiKeywordsFormSchema: FormSchema[] = [
+//子表单数据
+export const okkiOverviewFormSchema: FormSchema[] = [
   {
-    label: '关键词标题',
+    label: '概览类型',
+    field: 'overviewType',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"overview_type"
+     },
+  },
+  {
+    label: '概览标题',
     field: 'title',
     component: 'Input',
   },
   {
-    label: '关键词列表',
-    field: 'keywordList',
-    component: 'Input',
+    label: '概览内容',
+    field: 'content',
+    component: 'InputTextArea',
   },
-	{
-	  label: '',
-	  field: 'id',
-	  component: 'Input',
-	  show: false
-	},
-];
-export const okkiKeywordsSeriesFormSchema: FormSchema[] = [
   {
-    label: '关键词系列标题',
-    field: 'title',
-    component: 'Input',
+    label: '概览图片链接',
+    field: 'pic',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
-    label: '关键词系列排版结构',
-    field: 'layoutType',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"layout_type"
-     },
+    label: '按钮文字',
+    field: 'buttonName',
+    component: 'Input',
   },
   {
-    label: '关键词',
-    field: 'keywords',
+    label: '按钮跳转链接',
+    field: 'buttonUrl',
     component: 'Input',
   },
 	{
@@ -288,37 +276,34 @@ export const okkiKeywordsSeriesFormSchema: FormSchema[] = [
 	  show: false
 	},
 ];
-export const okkiReviewFormSchema: FormSchema[] = [
+export const okkiProductListFormSchema: FormSchema[] = [
   {
-    label: '评价标题',
+    label: '产品列表类型',
+    field: 'productListType',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"product_list_type"
+     },
+  },
+  {
+    label: '标题',
     field: 'title',
     component: 'Input',
   },
   {
-    label: '评价字幕',
+    label: '字幕',
     field: 'subtitles',
     component: 'Input',
   },
   {
-    label: '文字对齐方式',
-    field: 'layoutAlignment',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"layout_alignment"
-     },
-  },
-  {
-    label: '每行列数',
-    field: 'layoutColumnsPerRow',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode:"layout_columns_per_row"
-     },
+    label: '商品pid',
+    field: 'pidList',
+    component: 'Input',
   },
   {
-    label: '评价列表',
-    field: 'reviewList',
-    component: 'Input',
+    label: '商品分类sid',
+    field: 'sid',
+    component: 'InputNumber',
   },
 	{
 	  label: '',
@@ -327,7 +312,15 @@ export const okkiReviewFormSchema: FormSchema[] = [
 	  show: false
 	},
 ];
-export const okkiFaqFormSchema: FormSchema[] = [
+export const okkiRecommendedProductsFormSchema: FormSchema[] = [
+  {
+    label: '类型',
+    field: 'productListType',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"product_list_type"
+     },
+  },
   {
     label: '标题',
     field: 'title',
@@ -339,10 +332,15 @@ export const okkiFaqFormSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '常见问题列表',
-    field: 'faqList',
+    label: '商品pid',
+    field: 'pidList',
     component: 'Input',
   },
+  {
+    label: '商品分类sid',
+    field: 'sid',
+    component: 'InputNumber',
+  },
 	{
 	  label: '',
 	  field: 'id',
@@ -375,7 +373,7 @@ export const okkiShowlistBlogFormSchema: FormSchema[] = [
   {
     label: '博客列表',
     field: 'blogList',
-    component: 'Input',
+    component: 'InputTextArea',
   },
 	{
 	  label: '',
@@ -385,59 +383,173 @@ export const okkiShowlistBlogFormSchema: FormSchema[] = [
 	},
 ];
 //子表表格配置
+export const okkiHighlightColumns: JVxeColumn[] = [
+    {
+      title: '组件标题',
+      key: 'blockTitle',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '组件内容',
+      key: 'blockContent',
+      type: JVxeTypes.textarea,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '组件图片',
+      key: 'blockPic',
+      type: JVxeTypes.image,
+      token:true,
+      responseName:"message",
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '按钮文字',
+      key: 'buttonName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '按钮跳转链接',
+      key: 'buttonUrl',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
 export const okkiAdvantageColumns: JVxeColumn[] = [
     {
-      title: '标题',
-      key: 'title',
+      title: '组件标题',
+      key: 'blockTitle',
       type: JVxeTypes.input,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
     },
     {
-      title: '内容',
-      key: 'content',
+      title: '组件内容',
+      key: 'blockContent',
+      type: JVxeTypes.textarea,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '组件图片',
+      key: 'blockPic',
+      type: JVxeTypes.image,
+      token:true,
+      responseName:"message",
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '按钮文字',
+      key: 'buttonName',
       type: JVxeTypes.input,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
     },
     {
-      title: '文字对齐方式',
-      key: 'layoutAlignment',
-      type: JVxeTypes.inputNumber,
+      title: '按钮跳转链接',
+      key: 'buttonUrl',
+      type: JVxeTypes.input,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
     },
+  ]
+export const okkiKeywordsColumns: JVxeColumn[] = [
     {
-      title: '每行列数',
-      key: 'layoutColumnsPerRow',
-      type: JVxeTypes.inputNumber,
+      title: '关键词名',
+      key: 'keywordListName',
+      type: JVxeTypes.textarea,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
     },
     {
-      title: '组件',
-      key: 'block',
+      title: '关键词链接',
+      key: 'keywordListLinkUrl',
       type: JVxeTypes.input,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
     },
   ]
+export const okkiReviewColumns: JVxeColumn[] = [
+    {
+      title: '评价内容',
+      key: 'reviewListContent',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '头像',
+      key: 'reviewListAvatarUrl',
+      type: JVxeTypes.image,
+      token:true,
+      responseName:"message",
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '评价人',
+      key: 'reviewListName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+export const okkiFaqColumns: JVxeColumn[] = [
+    {
+      title: '问题',
+      key: 'question',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '答案',
+      key: 'answer',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+
 
 // 高级查询数据
 export const superQuerySchema = {
-  siteId: {title: '站点id',order: 0,view: 'number', type: 'number',},
+  siteId: {title: '站点id',order: 0,view: 'number', type: 'number',dictTable: "okki_site", dictCode: 'site_id', dictText: 'company_name',},
   url: {title: '页面路径',order: 1,view: 'text', type: 'string',},
   inquiryType: {title: '询盘的板式',order: 3,view: 'number', type: 'number',},
   reportScore: {title: 'ai检测分数',order: 4,view: 'number', type: 'number',},
   reportLink: {title: 'ai检测报告地址',order: 5,view: 'number', type: 'number',},
-  status: {title: '同步状态',order: 6,view: 'number', type: 'number',},
-  createTime: {title: '创建日期',order: 7,view: 'datetime', type: 'string',},
-  updateTime: {title: '更新日期',order: 8,view: 'datetime', type: 'string',},
+  tdkTitle: {title: 'showlist标题',order: 23,view: 'text', type: 'string',},
+  tdkDescription: {title: 'showlist描述',order: 24,view: 'text', type: 'string',},
+  tdkKeywords: {title: 'showlist关键词',order: 25,view: 'text', type: 'string',},
+  status: {title: '同步状态',order: 26,view: 'number', type: 'number',},
+  createTime: {title: '创建日期',order: 27,view: 'datetime', type: 'string',},
+  updateTime: {title: '更新日期',order: 28,view: 'datetime', type: 'string',},
   //子表高级查询
   okkiOverview: {
     title: '概览',
@@ -466,22 +578,22 @@ export const superQuerySchema = {
     title: '亮点',
     view: 'table',
     fields: {
-        title: {title: '模块标题',order: 0,view: 'text', type: 'string',},
-        content: {title: '模块简介',order: 1,view: 'textarea', type: 'string',},
-        layoutAlignment: {title: '文字对齐方式',order: 2,view: 'number', type: 'number',},
-        layoutColumnsPerRow: {title: '每行列数',order: 3,view: 'number', type: 'number',},
-        // block: {title: '组件',order: 4,view: 'text', type: 'string',},
+        blockTitle: {title: '组件标题',order: 0,view: 'text', type: 'string',},
+        blockContent: {title: '组件内容',order: 1,view: 'textarea', type: 'string',},
+        blockPic: {title: '组件图片',order: 2,view: 'image', type: 'string',},
+        buttonName: {title: '按钮文字',order: 3,view: 'text', type: 'string',},
+        buttonUrl: {title: '按钮跳转链接',order: 4,view: 'text', type: 'string',},
     }
   },
   okkiAdvantage: {
     title: '优势',
     view: 'table',
     fields: {
-        title: {title: '标题',order: 0,view: 'text', type: 'string',},
-        content: {title: '内容',order: 1,view: 'text', type: 'string',},
-        layoutAlignment: {title: '文字对齐方式',order: 2,view: 'number', type: 'number',},
-        layoutColumnsPerRow: {title: '每行列数',order: 3,view: 'number', type: 'number',},
-        block: {title: '组件',order: 4,view: 'text', type: 'string',},
+        blockTitle: {title: '组件标题',order: 0,view: 'text', type: 'string',},
+        blockContent: {title: '组件内容',order: 1,view: 'textarea', type: 'string',},
+        blockPic: {title: '组件图片',order: 2,view: 'image', type: 'string',},
+        buttonName: {title: '按钮文字',order: 3,view: 'text', type: 'string',},
+        buttonUrl: {title: '按钮跳转链接',order: 4,view: 'text', type: 'string',},
     }
   },
   okkiRecommendedProducts: {
@@ -499,36 +611,24 @@ export const superQuerySchema = {
     title: '关键词',
     view: 'table',
     fields: {
-        title: {title: '关键词标题',order: 0,view: 'text', type: 'string',},
-        keywordList: {title: '关键词列表',order: 1,view: 'text', type: 'string',},
-    }
-  },
-  okkiKeywordsSeries: {
-    title: '关键词系列',
-    view: 'table',
-    fields: {
-        title: {title: '关键词系列标题',order: 0,view: 'text', type: 'string',},
-        layoutType: {title: '关键词系列排版结构',order: 1,view: 'number', type: 'number',},
-        keywords: {title: '关键词',order: 2,view: 'text', type: 'string',},
+        keywordListName: {title: '关键词名',order: 0,view: 'textarea', type: 'string',},
+        keywordListLinkUrl: {title: '关键词链接',order: 1,view: 'text', type: 'string',},
     }
   },
   okkiReview: {
     title: '评价',
     view: 'table',
     fields: {
-        title: {title: '评价标题',order: 0,view: 'text', type: 'string',},
-        subtitles: {title: '评价字幕',order: 1,view: 'text', type: 'string',},
-        layoutAlignment: {title: '文字对齐方式',order: 2,view: 'number', type: 'number',},
-        layoutColumnsPerRow: {title: '每行列数',order: 3,view: 'number', type: 'number',},
+        reviewListAvatarUrl: {title: '头像',order: 1,view: 'image', type: 'string',},
+        reviewListName: {title: '评价人',order: 2,view: 'text', type: 'string',},
     }
   },
   okkiFaq: {
     title: '常见问题',
     view: 'table',
     fields: {
-        title: {title: '标题',order: 0,view: 'text', type: 'string',},
-        subtitles: {title: '字幕',order: 1,view: 'text', type: 'string',},
-        faqList: {title: '常见问题列表',order: 2,view: 'text', type: 'string',},
+        question: {title: '问题',order: 0,view: 'text', type: 'string',},
+        answer: {title: '答案',order: 1,view: 'text', type: 'string',},
     }
   },
   okkiShowlistBlog: {
@@ -538,7 +638,16 @@ export const superQuerySchema = {
         title: {title: '标题',order: 0,view: 'text', type: 'string',},
         layoutAlignment: {title: '文字对齐方式',order: 1,view: 'number', type: 'number',},
         layoutColumnsPerRow: {title: '每行列数',order: 2,view: 'number', type: 'number',},
-        blogList: {title: '博客列表',order: 3,view: 'text', type: 'string',},
+        blogList: {title: '博客列表',order: 3,view: 'textarea', type: 'string',},
     }
   },
 };
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[]{
+// 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}

jeecgboot-vue3/src/views/okki/showlist/OkkiShowlistList.vue

@@ -29,6 +29,18 @@
       </template>
       <!--字段回显插槽-->
       <template v-slot:bodyCell="{ column, record, index, text }">
+        <template v-if="column.dataIndex==='jsonLd'">
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+        </template>
+        <template v-if="column.dataIndex==='highlightContent'">
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+        </template>
+        <template v-if="column.dataIndex==='advantageContent'">
+          <!--富文本件字段回显插槽-->
+          <div v-html="text"></div>
+        </template>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
@@ -47,8 +59,8 @@
   import {downloadFile} from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
   const queryParam = reactive<any>({});
-  const userStore = useUserStore();
   const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
   //注册model
   const [registerModal, {openModal}] = useModal();
    //注册table数据
@@ -101,6 +113,7 @@
     });
     reload();
   }
+
    /**
     * 新增事件
     */
@@ -140,7 +153,7 @@
     * 批量删除事件
     */
   async function batchHandleDelete() {
-     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
    }
    /**
     * 成功回调
@@ -184,4 +197,4 @@
 
 <style scoped>
 
-</style>
+</style>

jeecgboot-vue3/src/views/okki/showlist/components/OkkiOverviewForm.vue

@@ -42,9 +42,9 @@
             function getFormData(){
                let formData = getFieldsValue();
                Object.keys(formData).map(k=>{
-                   if(formData[k] instanceof Array){
-                       formData[k] = formData[k].join(',')
-                   }
+                    if(formData[k] instanceof Array){
+                        formData[k] = formData[k].join(',')
+                    }
                });
                return [formData];
             }

jeecgboot-vue3/src/views/okki/showlist/components/OkkiProductListForm.vue

@@ -42,9 +42,9 @@
             function getFormData(){
                let formData = getFieldsValue();
                Object.keys(formData).map(k=>{
-                   if(formData[k] instanceof Array){
-                       formData[k] = formData[k].join(',')
-                   }
+                    if(formData[k] instanceof Array){
+                        formData[k] = formData[k].join(',')
+                    }
                });
                return [formData];
             }

jeecgboot-vue3/src/views/okki/showlist/components/OkkiRecommendedProductsForm.vue

@@ -42,9 +42,9 @@
             function getFormData(){
                let formData = getFieldsValue();
                Object.keys(formData).map(k=>{
-                   if(formData[k] instanceof Array){
-                       formData[k] = formData[k].join(',')
-                   }
+                    if(formData[k] instanceof Array){
+                        formData[k] = formData[k].join(',')
+                    }
                });
                return [formData];
             }

jeecgboot-vue3/src/views/okki/showlist/components/OkkiShowlistBlogForm.vue

@@ -42,9 +42,9 @@
             function getFormData(){
                let formData = getFieldsValue();
                Object.keys(formData).map(k=>{
-                   if(formData[k] instanceof Array){
-                       formData[k] = formData[k].join(',')
-                   }
+                    if(formData[k] instanceof Array){
+                        formData[k] = formData[k].join(',')
+                    }
                });
                return [formData];
             }

jeecgboot-vue3/src/views/okki/showlist/components/OkkiShowlistForm.vue

@@ -1,277 +1,294 @@
 <template>
   <div>
-  <!-- 子表单区域 -->
-    <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
-     <!--主表区域 -->
-     <a-tab-pane tab="showlist" :key="refKeys[0]" :forceRender="true" :style="tabsStyle">
-       <BasicForm @register="registerForm" ref="formRef"/>
-     </a-tab-pane>
-  <!--子表单区域 -->
-      <a-tab-pane tab="概览" key="okkiOverview" :forceRender="true" :style="tabsStyle">
-        <OkkiOverviewForm ref="okkiOverviewForm" :disabled="formDisabled"></OkkiOverviewForm>
-      </a-tab-pane>
+    <BasicForm @register="registerForm" ref="formRef"/>
+    <!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated  @change="handleChangeTabs">
+          <a-tab-pane tab="概览" key="okkiOverview" :forceRender="true">
+            <OkkiOverviewForm ref="okkiOverviewForm" :disabled="formDisabled"></OkkiOverviewForm>
+          </a-tab-pane>
 
-      <a-tab-pane tab="产品" key="okkiProductList" :forceRender="true" :style="tabsStyle">
-        <OkkiProductListForm ref="okkiProductListForm" :disabled="formDisabled"></OkkiProductListForm>
-      </a-tab-pane>
+          <a-tab-pane tab="产品" key="okkiProductList" :forceRender="true">
+            <OkkiProductListForm ref="okkiProductListForm" :disabled="formDisabled"></OkkiProductListForm>
+          </a-tab-pane>
 
-      <a-tab-pane tab="亮点" key="okkiHighlight" :forceRender="true" :style="tabsStyle">
-        <OkkiHighlightForm ref="okkiHighlightForm" :disabled="formDisabled"></OkkiHighlightForm>
-      </a-tab-pane>
+          <a-tab-pane tab="亮点" key="okkiHighlight" :forceRender="true">
+            <JVxeTable
+              keep-source
+              resizable
+              ref="okkiHighlight"
+              v-if="okkiHighlightTable.show"
+              :loading="okkiHighlightTable.loading"
+              :columns="okkiHighlightTable.columns"
+              :dataSource="okkiHighlightTable.dataSource"
+              :height="340"
+              :rowNumber="true"
+              :rowSelection="true"
+              :disabled="formDisabled"
+              :toolbar="true"
+            />
+          </a-tab-pane>
+          <a-tab-pane tab="优势" key="okkiAdvantage" :forceRender="true">
+            <JVxeTable
+              keep-source
+              resizable
+              ref="okkiAdvantage"
+              v-if="okkiAdvantageTable.show"
+              :loading="okkiAdvantageTable.loading"
+              :columns="okkiAdvantageTable.columns"
+              :dataSource="okkiAdvantageTable.dataSource"
+              :height="340"
+              :rowNumber="true"
+              :rowSelection="true"
+              :disabled="formDisabled"
+              :toolbar="true"
+            />
+          </a-tab-pane>
+          <a-tab-pane tab="推荐商品列表" key="okkiRecommendedProducts" :forceRender="true">
+            <OkkiRecommendedProductsForm ref="okkiRecommendedProductsForm" :disabled="formDisabled"></OkkiRecommendedProductsForm>
+          </a-tab-pane>
 
-      <a-tab-pane tab="优势" key="okkiAdvantage" :forceRender="true" :style="tabsStyle">
-        <JVxeTable
-          keep-source
-          resizable
-          ref="okkiAdvantage"
-          v-if="okkiAdvantageTable.show"
-          :loading="okkiAdvantageTable.loading"
-          :columns="okkiAdvantageTable.columns"
-          :dataSource="okkiAdvantageTable.dataSource"
-          :height="340"
-          :disabled="formDisabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          :toolbar="true"
-          />
-      </a-tab-pane>
-      <a-tab-pane tab="推荐商品列表" key="okkiRecommendedProducts" :forceRender="true" :style="tabsStyle">
-        <OkkiRecommendedProductsForm ref="okkiRecommendedProductsForm" :disabled="formDisabled"></OkkiRecommendedProductsForm>
-      </a-tab-pane>
-
-      <a-tab-pane tab="关键词" key="okkiKeywords" :forceRender="true" :style="tabsStyle">
-        <OkkiKeywordsForm ref="okkiKeywordsForm" :disabled="formDisabled"></OkkiKeywordsForm>
-      </a-tab-pane>
-
-      <a-tab-pane tab="关键词系列" key="okkiKeywordsSeries" :forceRender="true" :style="tabsStyle">
-        <OkkiKeywordsSeriesForm ref="okkiKeywordsSeriesForm" :disabled="formDisabled"></OkkiKeywordsSeriesForm>
-      </a-tab-pane>
-
-      <a-tab-pane tab="评价" key="okkiReview" :forceRender="true" :style="tabsStyle">
-        <OkkiReviewForm ref="okkiReviewForm" :disabled="formDisabled"></OkkiReviewForm>
-      </a-tab-pane>
-
-      <a-tab-pane tab="常见问题" key="okkiFaq" :forceRender="true" :style="tabsStyle">
-        <OkkiFaqForm ref="okkiFaqForm" :disabled="formDisabled"></OkkiFaqForm>
-      </a-tab-pane>
-
-      <a-tab-pane tab="博客" key="okkiShowlistBlog" :forceRender="true" :style="tabsStyle">
-        <OkkiShowlistBlogForm ref="okkiShowlistBlogForm" :disabled="formDisabled"></OkkiShowlistBlogForm>
-      </a-tab-pane>
+          <a-tab-pane tab="关键词" key="okkiKeywords" :forceRender="true">
+            <JVxeTable
+              keep-source
+              resizable
+              ref="okkiKeywords"
+              v-if="okkiKeywordsTable.show"
+              :loading="okkiKeywordsTable.loading"
+              :columns="okkiKeywordsTable.columns"
+              :dataSource="okkiKeywordsTable.dataSource"
+              :height="340"
+              :rowNumber="true"
+              :rowSelection="true"
+              :disabled="formDisabled"
+              :toolbar="true"
+            />
+          </a-tab-pane>
+          <a-tab-pane tab="评价" key="okkiReview" :forceRender="true">
+            <JVxeTable
+              keep-source
+              resizable
+              ref="okkiReview"
+              v-if="okkiReviewTable.show"
+              :loading="okkiReviewTable.loading"
+              :columns="okkiReviewTable.columns"
+              :dataSource="okkiReviewTable.dataSource"
+              :height="340"
+              :rowNumber="true"
+              :rowSelection="true"
+              :disabled="formDisabled"
+              :toolbar="true"
+            />
+          </a-tab-pane>
+          <a-tab-pane tab="常见问题" key="okkiFaq" :forceRender="true">
+            <JVxeTable
+              keep-source
+              resizable
+              ref="okkiFaq"
+              v-if="okkiFaqTable.show"
+              :loading="okkiFaqTable.loading"
+              :columns="okkiFaqTable.columns"
+              :dataSource="okkiFaqTable.dataSource"
+              :height="340"
+              :rowNumber="true"
+              :rowSelection="true"
+              :disabled="formDisabled"
+              :toolbar="true"
+            />
+          </a-tab-pane>
+          <a-tab-pane tab="博客" key="okkiShowlistBlog" :forceRender="true">
+            <OkkiShowlistBlogForm ref="okkiShowlistBlogForm" :disabled="formDisabled"></OkkiShowlistBlogForm>
+          </a-tab-pane>
 
     </a-tabs>
 
-    <div style="width: 100%;text-align: center;margin-top: 10px;" v-if="showFlowSubmitButton">
-      <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="handleSubmit">提 交</a-button>
+    <div style="width: 100%;text-align: center" v-if="!formDisabled">
+      <a-button @click="handleSubmit" pre-icon="ant-design:check" type="primary">提 交</a-button>
     </div>
   </div>
 </template>
 
-<script lang="ts" setup>
-    import { defHttp } from '/@/utils/http/axios';
-    import {ref, computed, unref,reactive, onMounted, defineProps } from 'vue';
-    import {BasicForm, useForm} from '/@/components/Form/index';
-    import { JVxeTable } from '/@/components/jeecg/JVxeTable'
-    import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
-    import OkkiOverviewForm from './OkkiOverviewForm.vue'
-    import OkkiProductListForm from './OkkiProductListForm.vue'
-    import OkkiHighlightForm from './OkkiHighlightForm.vue'
-    import OkkiRecommendedProductsForm from './OkkiRecommendedProductsForm.vue'
-    import OkkiKeywordsForm from './OkkiKeywordsForm.vue'
-    import OkkiKeywordsSeriesForm from './OkkiKeywordsSeriesForm.vue'
-    import OkkiReviewForm from './OkkiReviewForm.vue'
-    import OkkiFaqForm from './OkkiFaqForm.vue'
-    import OkkiShowlistBlogForm from './OkkiShowlistBlogForm.vue'
-    import {formSchema,okkiAdvantageColumns} from '../OkkiShowlist.data';
-    import {saveOrUpdate,okkiOverviewList,okkiProductListList,okkiHighlightList,okkiAdvantageList,okkiRecommendedProductsList,okkiKeywordsList,okkiKeywordsSeriesList,okkiReviewList,okkiFaqList,okkiShowlistBlogList} from '../OkkiShowlist.api';
-    import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
-    const refKeys = ref(['okkiShowlist','okkiOverview', 'okkiProductList', 'okkiHighlight', 'okkiAdvantage', 'okkiRecommendedProducts', 'okkiKeywords', 'okkiKeywordsSeries', 'okkiReview', 'okkiFaq', 'okkiShowlistBlog', ]);
-    const activeKey = ref('okkiShowlist');
-    const okkiOverviewForm = ref();
-    const okkiProductListForm = ref();
-    const okkiHighlightForm = ref();
-    const okkiAdvantage = ref();
-    const okkiRecommendedProductsForm = ref();
-    const okkiKeywordsForm = ref();
-    const okkiKeywordsSeriesForm = ref();
-    const okkiReviewForm = ref();
-    const okkiFaqForm = ref();
-    const okkiShowlistBlogForm = ref();
-    const tableRefs = {okkiAdvantage, };
-    const okkiAdvantageTable = reactive({
-          loading: false,
-          dataSource: [],
-          columns:okkiAdvantageColumns,
-          show: false
-    })
+<script lang="ts">
+
+  import {BasicForm, useForm} from '/@/components/Form/index';
+  import { computed, defineComponent, reactive, ref, unref } from 'vue';
+  import {defHttp} from '/@/utils/http/axios';
+  import { propTypes } from '/@/utils/propTypes';
+  import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods';
+  import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils';
+  import OkkiOverviewForm from './OkkiOverviewForm.vue'
+  import OkkiProductListForm from './OkkiProductListForm.vue'
+  import OkkiRecommendedProductsForm from './OkkiRecommendedProductsForm.vue'
+  import OkkiShowlistBlogForm from './OkkiShowlistBlogForm.vue'
+  import {getBpmFormSchema,okkiHighlightColumns,okkiAdvantageColumns,okkiKeywordsColumns,okkiReviewColumns,okkiFaqColumns} from '../OkkiShowlist.data';
+  import {saveOrUpdate,okkiOverviewList,okkiProductListList,okkiHighlightList,okkiAdvantageList,okkiRecommendedProductsList,okkiKeywordsList,okkiReviewList,okkiFaqList,okkiShowlistBlogList} from '../OkkiShowlist.api';
+
+  export default defineComponent({
+    name: "OkkiShowlistForm",
+    components:{
+      BasicForm,
+      OkkiOverviewForm,
+      OkkiProductListForm,
+      OkkiRecommendedProductsForm,
+      OkkiShowlistBlogForm,
+    },
+    props:{
+      formData: propTypes.object.def({}),
+      formBpm: propTypes.bool.def(true),
+    },
+    setup(props){
+      const [registerForm, { setFieldsValue, setProps }] = useForm({
+        labelWidth: 150,
+        schemas: getBpmFormSchema(props.formData),
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+      });
 
-    const props = defineProps({
-      formData: { type: Object, default: ()=>{} },
-      formBpm: { type: Boolean, default: true }
-    });
-    const formDisabled = computed(()=>{
-      if(props.formBpm === true){
+      const formDisabled = computed(()=>{
         if(props.formData.disabled === false){
           return false;
         }
-      }
-      return true;
-    });
-    // 是否显示提交按钮
-    const showFlowSubmitButton = computed(()=>{
-      if(props.formBpm === true){
-        if(props.formData.disabled === false){
-          return true
+        return true;
+      });
+
+      const refKeys = ref(['okkiOverview', 'okkiProductList', 'okkiHighlight', 'okkiAdvantage', 'okkiRecommendedProducts', 'okkiKeywords', 'okkiReview', 'okkiFaq', 'okkiShowlistBlog', ]);
+      const activeKey = ref('okkiOverview');
+      const okkiOverviewForm = ref();
+      const okkiProductListForm = ref();
+      const okkiHighlight = ref();
+      const okkiAdvantage = ref();
+      const okkiRecommendedProductsForm = ref();
+      const okkiKeywords = ref();
+      const okkiReview = ref();
+      const okkiFaq = ref();
+      const okkiShowlistBlogForm = ref();
+      const tableRefs = {okkiHighlight, okkiAdvantage, okkiKeywords, okkiReview, okkiFaq, };
+      const okkiHighlightTable = reactive({
+        loading: false,
+        dataSource: [],
+        columns:okkiHighlightColumns,
+        show: false
+      })
+      const okkiAdvantageTable = reactive({
+        loading: false,
+        dataSource: [],
+        columns:okkiAdvantageColumns,
+        show: false
+      })
+      const okkiKeywordsTable = reactive({
+        loading: false,
+        dataSource: [],
+        columns:okkiKeywordsColumns,
+        show: false
+      })
+      const okkiReviewTable = reactive({
+        loading: false,
+        dataSource: [],
+        columns:okkiReviewColumns,
+        show: false
+      })
+      const okkiFaqTable = reactive({
+        loading: false,
+        dataSource: [],
+        columns:okkiFaqColumns,
+        show: false
+      })
+
+      const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys,validateSubForm);
+
+      function classifyIntoFormData(allValues) {
+        let main = Object.assign({}, allValues.formValue)
+        return {
+          ...main, // 展开
+          okkiOverviewList: okkiOverviewForm.value.getFormData(),
+          okkiProductListList: okkiProductListForm.value.getFormData(),
+          okkiHighlightList: allValues.tablesValue[0].tableData,
+          okkiAdvantageList: allValues.tablesValue[1].tableData,
+          okkiRecommendedProductsList: okkiRecommendedProductsForm.value.getFormData(),
+          okkiKeywordsList: allValues.tablesValue[2].tableData,
+          okkiReviewList: allValues.tablesValue[3].tableData,
+          okkiFaqList: allValues.tablesValue[4].tableData,
+          okkiShowlistBlogList: okkiShowlistBlogForm.value.getFormData(),
         }
       }
-      return false
-    });
-    
-    //表单配置
-    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
-        labelWidth: 150,
-        schemas: formSchema,
-        showActionButtonGroup: false,
-        baseColProps: {span: 24}
-    });
+      //校验所有一对一子表表单
+      function validateSubForm(allValues){
+        return new Promise((resolve, _reject)=>{
+          Promise.all([
+            okkiOverviewForm.value.validateForm(0),
+            okkiProductListForm.value.validateForm(1),
+            okkiRecommendedProductsForm.value.validateForm(4),
+            okkiShowlistBlogForm.value.validateForm(8),
+          ]).then(() => {
+            resolve(allValues)
+          }).catch(e => {
+            if (e.error === VALIDATE_FAILED) {
+              // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+              activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index]
+            } else {
+              console.error(e)
+            }
+          })
+        })
+      }
 
-    onMounted(()=>{
-      initFormData();
-    });
-    //渲染流程表单数据
-    const queryByIdUrl = '/showlist/okkiShowlist/queryById';
-    async function initFormData(){
-      if(props.formBpm === true){
-        await reset();
+      //表单提交事件
+      async function requestAddOrEdit(values) {
+        await saveOrUpdate(values, true);
+      }
+
+      const queryByIdUrl = '/showlist/okkiShowlist/queryById';
+      async function initFormData(){
         let params = {id: props.formData.dataId};
         const data = await defHttp.get({url: queryByIdUrl, params});
-        //表单赋值
-        await setFieldsValue({
-          ...data
+        //设置表单的值
+        await setFieldsValue({...data});
+        okkiOverviewForm.value.initFormData(okkiOverviewList, data.id);
+        okkiProductListForm.value.initFormData(okkiProductListList, data.id);
+        requestSubTableData(okkiHighlightList, {id: data.id}, okkiHighlightTable, ()=>{
+          okkiHighlightTable.show = true;
         });
-        okkiOverviewForm.value.initFormData(okkiOverviewList, data.id)
-        okkiProductListForm.value.initFormData(okkiProductListList, data.id)
-        okkiHighlightForm.value.initFormData(okkiHighlightList, data.id)
-        okkiRecommendedProductsForm.value.initFormData(okkiRecommendedProductsList, data.id)
-        okkiKeywordsForm.value.initFormData(okkiKeywordsList, data.id)
-        okkiKeywordsSeriesForm.value.initFormData(okkiKeywordsSeriesList, data.id)
-        okkiReviewForm.value.initFormData(okkiReviewList, data.id)
-        okkiFaqForm.value.initFormData(okkiFaqList, data.id)
-        okkiShowlistBlogForm.value.initFormData(okkiShowlistBlogList, data.id)
         requestSubTableData(okkiAdvantageList, {id: data.id}, okkiAdvantageTable, ()=>{
           okkiAdvantageTable.show = true;
-        })
-        // 隐藏底部时禁用整个表单
-        setProps({ disabled: formDisabled.value })
+        });
+        okkiRecommendedProductsForm.value.initFormData(okkiRecommendedProductsList, data.id);
+        requestSubTableData(okkiKeywordsList, {id: data.id}, okkiKeywordsTable, ()=>{
+          okkiKeywordsTable.show = true;
+        });
+        requestSubTableData(okkiReviewList, {id: data.id}, okkiReviewTable, ()=>{
+          okkiReviewTable.show = true;
+        });
+        requestSubTableData(okkiFaqList, {id: data.id}, okkiFaqTable, ()=>{
+          okkiFaqTable.show = true;
+        });
+        okkiShowlistBlogForm.value.initFormData(okkiShowlistBlogList, data.id);
+        //默认是禁用
+        await setProps({disabled: formDisabled.value})
       }
-    }
-
-    //方法配置
-    const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys,validateSubForm);
-    // 弹窗tabs滚动区域的高度
-    const tabsStyle = computed(() => {
-      let height: Nullable<string> = null
-      let minHeight = '100px'
-      // 弹窗wrapper
-      let overflow = 'auto';
-      return {height, minHeight, overflow};
-    })
 
-    async function reset(){
-      await resetFields();
-      activeKey.value = 'okkiShowlist';
-      okkiOverviewForm.value.resetFields();
-      okkiProductListForm.value.resetFields();
-      okkiHighlightForm.value.resetFields();
-      okkiAdvantageTable.dataSource = [];
-      okkiRecommendedProductsForm.value.resetFields();
-      okkiKeywordsForm.value.resetFields();
-      okkiKeywordsSeriesForm.value.resetFields();
-      okkiReviewForm.value.resetFields();
-      okkiFaqForm.value.resetFields();
-      okkiShowlistBlogForm.value.resetFields();
-    }
-    function classifyIntoFormData(allValues) {
-         let main = Object.assign({}, allValues.formValue)
-         return {
-           ...main, // 展开
-           okkiOverviewList: okkiOverviewForm.value.getFormData(),
-           okkiProductListList: okkiProductListForm.value.getFormData(),
-           okkiHighlightList: okkiHighlightForm.value.getFormData(),
-           okkiAdvantageList: allValues.tablesValue[0].tableData,
-           okkiRecommendedProductsList: okkiRecommendedProductsForm.value.getFormData(),
-           okkiKeywordsList: okkiKeywordsForm.value.getFormData(),
-           okkiKeywordsSeriesList: okkiKeywordsSeriesForm.value.getFormData(),
-           okkiReviewList: okkiReviewForm.value.getFormData(),
-           okkiFaqList: okkiFaqForm.value.getFormData(),
-           okkiShowlistBlogList: okkiShowlistBlogForm.value.getFormData(),
-         }
-       }
-     //校验所有一对一子表表单
-     function validateSubForm(allValues){
-         return new Promise((resolve,reject)=>{
-             Promise.all([
-                  okkiOverviewForm.value.validateForm(1),
-                  okkiProductListForm.value.validateForm(2),
-                  okkiHighlightForm.value.validateForm(3),
-                  okkiRecommendedProductsForm.value.validateForm(5),
-                  okkiKeywordsForm.value.validateForm(6),
-                  okkiKeywordsSeriesForm.value.validateForm(7),
-                  okkiReviewForm.value.validateForm(8),
-                  okkiFaqForm.value.validateForm(9),
-                  okkiShowlistBlogForm.value.validateForm(10),
-             ]).then(() => {
-                 resolve(allValues)
-             }).catch(e => {
-                 if (e.error === VALIDATE_FAILED) {
-                     // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
-                     activeKey.value = e.index == null ? unref(activeKey) : refKeys.value[e.index]
-                 } else {
-                     console.error(e)
-                 }
-             })
-         })
-     }
-    //表单提交事件
-    async function requestAddOrEdit(values) {
-      //提交表单
-      await saveOrUpdate(values, true);
-    }
-</script>
-
-<style lang="less" scoped>
-/** 时间和数字输入框样式 */
-    :deep(.ant-input-number){
-        width: 100%
-    }
+      initFormData();
 
-    :deep(.ant-calendar-picker){
-        width: 100%
+      return {
+        registerForm,
+        formDisabled,
+        formRef,
+        handleSubmit,
+        activeKey,
+        handleChangeTabs,
+        okkiOverviewForm,
+        okkiProductListForm,
+        okkiHighlight,
+        okkiAdvantage,
+        okkiRecommendedProductsForm,
+        okkiKeywords,
+        okkiReview,
+        okkiFaq,
+        okkiShowlistBlogForm,
+        okkiHighlightTable,
+        okkiAdvantageTable,
+        okkiKeywordsTable,
+        okkiReviewTable,
+        okkiFaqTable,
+      }
     }
-</style>
-
-<style lang="less">
-// Online表单Tab风格专属样式
-.j-cgform-tab-modal {
-  .ant-modal-header {
-    padding-top: 8px;
-    padding-bottom: 8px;
-    border-bottom: none !important;
-  }
-
-  .ant-modal .ant-modal-body > .scrollbar,
-  .ant-tabs-nav .ant-tabs-tab {
-    padding-top: 0;
-  }
-
-  .ant-tabs-top-bar {
-    width: calc(100% - 55px);
-    position: relative;
-    left: -14px;
-  }
-
-  .ant-tabs .ant-tabs-top-content > .ant-tabs-tabpane {
-    overflow: hidden auto;
-  }
-}
-</style>
+  });
+</script>

jeecgboot-vue3/src/views/okki/showlist/components/OkkiShowlistModal.vue

@@ -1,25 +1,32 @@
 <template>
-  <BasicModal ref="modalRef" destroyOnClose wrapClassName="j-cgform-tab-modal" v-bind="$attrs" @register="registerModal" :width="800" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm" ref="formRef"/>
   <!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
-     <!--主表区域 -->
-     <a-tab-pane tab="showlist" :key="refKeys[0]" :forceRender="true" :style="tabsStyle">
-       <BasicForm @register="registerForm" ref="formRef"/>
-     </a-tab-pane>
-  <!--子表单区域 -->
-      <a-tab-pane tab="概览" key="okkiOverview" :forceRender="true" :style="tabsStyle">
+      <a-tab-pane tab="概览" key="okkiOverview" :forceRender="true">
         <OkkiOverviewForm ref="okkiOverviewForm" :disabled="formDisabled"></OkkiOverviewForm>
       </a-tab-pane>
 
-      <a-tab-pane tab="产品" key="okkiProductList" :forceRender="true" :style="tabsStyle">
+      <a-tab-pane tab="产品" key="okkiProductList" :forceRender="true">
         <OkkiProductListForm ref="okkiProductListForm" :disabled="formDisabled"></OkkiProductListForm>
       </a-tab-pane>
 
-      <a-tab-pane tab="亮点" key="okkiHighlight" :forceRender="true" :style="tabsStyle">
-        <OkkiHighlightForm ref="okkiHighlightForm" :disabled="formDisabled"></OkkiHighlightForm>
+      <a-tab-pane tab="亮点" key="okkiHighlight" :forceRender="true">
+        <JVxeTable
+          keep-source
+          resizable
+          ref="okkiHighlight"
+          :loading="okkiHighlightTable.loading"
+          :columns="okkiHighlightTable.columns"
+          :dataSource="okkiHighlightTable.dataSource"
+          :height="340"
+          :rowNumber="true"
+          :rowSelection="true"
+          :disabled="formDisabled"
+          :toolbar="true"
+          />
       </a-tab-pane>
-
-      <a-tab-pane tab="优势" key="okkiAdvantage" :forceRender="true" :style="tabsStyle">
+      <a-tab-pane tab="优势" key="okkiAdvantage" :forceRender="true">
         <JVxeTable
           keep-source
           resizable
@@ -28,33 +35,62 @@
           :columns="okkiAdvantageTable.columns"
           :dataSource="okkiAdvantageTable.dataSource"
           :height="340"
-          :disabled="formDisabled"
           :rowNumber="true"
           :rowSelection="true"
+          :disabled="formDisabled"
           :toolbar="true"
           />
       </a-tab-pane>
-      <a-tab-pane tab="推荐商品列表" key="okkiRecommendedProducts" :forceRender="true" :style="tabsStyle">
+      <a-tab-pane tab="推荐商品列表" key="okkiRecommendedProducts" :forceRender="true">
         <OkkiRecommendedProductsForm ref="okkiRecommendedProductsForm" :disabled="formDisabled"></OkkiRecommendedProductsForm>
       </a-tab-pane>
 
-      <a-tab-pane tab="关键词" key="okkiKeywords" :forceRender="true" :style="tabsStyle">
-        <OkkiKeywordsForm ref="okkiKeywordsForm" :disabled="formDisabled"></OkkiKeywordsForm>
-      </a-tab-pane>
-
-      <a-tab-pane tab="关键词系列" key="okkiKeywordsSeries" :forceRender="true" :style="tabsStyle">
-        <OkkiKeywordsSeriesForm ref="okkiKeywordsSeriesForm" :disabled="formDisabled"></OkkiKeywordsSeriesForm>
+      <a-tab-pane tab="关键词" key="okkiKeywords" :forceRender="true">
+        <JVxeTable
+          keep-source
+          resizable
+          ref="okkiKeywords"
+          :loading="okkiKeywordsTable.loading"
+          :columns="okkiKeywordsTable.columns"
+          :dataSource="okkiKeywordsTable.dataSource"
+          :height="340"
+          :rowNumber="true"
+          :rowSelection="true"
+          :disabled="formDisabled"
+          :toolbar="true"
+          />
       </a-tab-pane>
-
-      <a-tab-pane tab="评价" key="okkiReview" :forceRender="true" :style="tabsStyle">
-        <OkkiReviewForm ref="okkiReviewForm" :disabled="formDisabled"></OkkiReviewForm>
+      <a-tab-pane tab="评价" key="okkiReview" :forceRender="true">
+        <JVxeTable
+          keep-source
+          resizable
+          ref="okkiReview"
+          :loading="okkiReviewTable.loading"
+          :columns="okkiReviewTable.columns"
+          :dataSource="okkiReviewTable.dataSource"
+          :height="340"
+          :rowNumber="true"
+          :rowSelection="true"
+          :disabled="formDisabled"
+          :toolbar="true"
+          />
       </a-tab-pane>
-
-      <a-tab-pane tab="常见问题" key="okkiFaq" :forceRender="true" :style="tabsStyle">
-        <OkkiFaqForm ref="okkiFaqForm" :disabled="formDisabled"></OkkiFaqForm>
+      <a-tab-pane tab="常见问题" key="okkiFaq" :forceRender="true">
+        <JVxeTable
+          keep-source
+          resizable
+          ref="okkiFaq"
+          :loading="okkiFaqTable.loading"
+          :columns="okkiFaqTable.columns"
+          :dataSource="okkiFaqTable.dataSource"
+          :height="340"
+          :rowNumber="true"
+          :rowSelection="true"
+          :disabled="formDisabled"
+          :toolbar="true"
+          />
       </a-tab-pane>
-
-      <a-tab-pane tab="博客" key="okkiShowlistBlog" :forceRender="true" :style="tabsStyle">
+      <a-tab-pane tab="博客" key="okkiShowlistBlog" :forceRender="true">
         <OkkiShowlistBlogForm ref="okkiShowlistBlogForm" :disabled="formDisabled"></OkkiShowlistBlogForm>
       </a-tab-pane>
 
@@ -70,39 +106,52 @@
     import { useJvxeMethod } from '/@/hooks/system/useJvxeMethods.ts'
     import OkkiOverviewForm from './OkkiOverviewForm.vue'
     import OkkiProductListForm from './OkkiProductListForm.vue'
-    import OkkiHighlightForm from './OkkiHighlightForm.vue'
     import OkkiRecommendedProductsForm from './OkkiRecommendedProductsForm.vue'
-    import OkkiKeywordsForm from './OkkiKeywordsForm.vue'
-    import OkkiKeywordsSeriesForm from './OkkiKeywordsSeriesForm.vue'
-    import OkkiReviewForm from './OkkiReviewForm.vue'
-    import OkkiFaqForm from './OkkiFaqForm.vue'
     import OkkiShowlistBlogForm from './OkkiShowlistBlogForm.vue'
-    import {formSchema,okkiAdvantageColumns} from '../OkkiShowlist.data';
-    import {saveOrUpdate,okkiOverviewList,okkiProductListList,okkiHighlightList,okkiAdvantageList,okkiRecommendedProductsList,okkiKeywordsList,okkiKeywordsSeriesList,okkiReviewList,okkiFaqList,okkiShowlistBlogList} from '../OkkiShowlist.api';
+    import {formSchema,okkiHighlightColumns,okkiAdvantageColumns,okkiKeywordsColumns,okkiReviewColumns,okkiFaqColumns} from '../OkkiShowlist.data';
+    import {saveOrUpdate,okkiOverviewList,okkiProductListList,okkiHighlightList,okkiAdvantageList,okkiRecommendedProductsList,okkiKeywordsList,okkiReviewList,okkiFaqList,okkiShowlistBlogList} from '../OkkiShowlist.api';
     import { VALIDATE_FAILED } from '/@/utils/common/vxeUtils'
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);
     const formDisabled = ref(false);
-    const modalRef = ref();
-    const refKeys = ref(['okkiShowlist','okkiOverview', 'okkiProductList', 'okkiHighlight', 'okkiAdvantage', 'okkiRecommendedProducts', 'okkiKeywords', 'okkiKeywordsSeries', 'okkiReview', 'okkiFaq', 'okkiShowlistBlog', ]);
-    const activeKey = ref('okkiShowlist');
+    const refKeys = ref(['okkiOverview', 'okkiProductList', 'okkiHighlight', 'okkiAdvantage', 'okkiRecommendedProducts', 'okkiKeywords', 'okkiReview', 'okkiFaq', 'okkiShowlistBlog', ]);
+    const activeKey = ref('okkiOverview');
     const okkiOverviewForm = ref();
     const okkiProductListForm = ref();
-    const okkiHighlightForm = ref();
+    const okkiHighlight = ref();
     const okkiAdvantage = ref();
     const okkiRecommendedProductsForm = ref();
-    const okkiKeywordsForm = ref();
-    const okkiKeywordsSeriesForm = ref();
-    const okkiReviewForm = ref();
-    const okkiFaqForm = ref();
+    const okkiKeywords = ref();
+    const okkiReview = ref();
+    const okkiFaq = ref();
     const okkiShowlistBlogForm = ref();
-    const tableRefs = {okkiAdvantage, };
+    const tableRefs = {okkiHighlight, okkiAdvantage, okkiKeywords, okkiReview, okkiFaq, };
+    const okkiHighlightTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:okkiHighlightColumns
+    })
     const okkiAdvantageTable = reactive({
           loading: false,
           dataSource: [],
           columns:okkiAdvantageColumns
     })
+    const okkiKeywordsTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:okkiKeywordsColumns
+    })
+    const okkiReviewTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:okkiReviewColumns
+    })
+    const okkiFaqTable = reactive({
+          loading: false,
+          dataSource: [],
+          columns:okkiFaqColumns
+    })
     //表单配置
     const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
         //labelWidth: 150,
@@ -124,49 +173,34 @@
             });
              okkiOverviewForm.value.initFormData(okkiOverviewList,data?.record?.id)
              okkiProductListForm.value.initFormData(okkiProductListList,data?.record?.id)
-             okkiHighlightForm.value.initFormData(okkiHighlightList,data?.record?.id)
              okkiRecommendedProductsForm.value.initFormData(okkiRecommendedProductsList,data?.record?.id)
-             okkiKeywordsForm.value.initFormData(okkiKeywordsList,data?.record?.id)
-             okkiKeywordsSeriesForm.value.initFormData(okkiKeywordsSeriesList,data?.record?.id)
-             okkiReviewForm.value.initFormData(okkiReviewList,data?.record?.id)
-             okkiFaqForm.value.initFormData(okkiFaqList,data?.record?.id)
              okkiShowlistBlogForm.value.initFormData(okkiShowlistBlogList,data?.record?.id)
+             requestSubTableData(okkiHighlightList, {id:data?.record?.id}, okkiHighlightTable)
              requestSubTableData(okkiAdvantageList, {id:data?.record?.id}, okkiAdvantageTable)
+             requestSubTableData(okkiKeywordsList, {id:data?.record?.id}, okkiKeywordsTable)
+             requestSubTableData(okkiReviewList, {id:data?.record?.id}, okkiReviewTable)
+             requestSubTableData(okkiFaqList, {id:data?.record?.id}, okkiFaqTable)
         }
         // 隐藏底部时禁用整个表单
        setProps({ disabled: !data?.showFooter })
     });
     //方法配置
     const [handleChangeTabs,handleSubmit,requestSubTableData,formRef] = useJvxeMethod(requestAddOrEdit,classifyIntoFormData,tableRefs,activeKey,refKeys,validateSubForm);
-    // 弹窗tabs滚动区域的高度
-    const tabsStyle = computed(() => {
-      let height: Nullable<string> = null
-      let minHeight = '100px'
-      let maxHeight: Nullable<string> = '500px'
-      // 弹窗wrapper
-      let modalWrapperRef = modalRef.value?.modalWrapperRef
-      if (modalWrapperRef) {
-        if (modalWrapperRef.fullScreen) {
-          height = 'calc(' + modalWrapperRef.spinStyle.height + ' - 50px)';
-          maxHeight = null
-        }
-      }
-      let overflow = 'auto';
-      return {height, minHeight, maxHeight, overflow};
-    })
+
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
 
     async function reset(){
       await resetFields();
-      activeKey.value = 'okkiShowlist';
+      activeKey.value = 'okkiOverview';
       okkiOverviewForm.value.resetFields();
       okkiProductListForm.value.resetFields();
-      okkiHighlightForm.value.resetFields();
+      okkiHighlightTable.dataSource = [];
       okkiAdvantageTable.dataSource = [];
       okkiRecommendedProductsForm.value.resetFields();
-      okkiKeywordsForm.value.resetFields();
-      okkiKeywordsSeriesForm.value.resetFields();
-      okkiReviewForm.value.resetFields();
-      okkiFaqForm.value.resetFields();
+      okkiKeywordsTable.dataSource = [];
+      okkiReviewTable.dataSource = [];
+      okkiFaqTable.dataSource = [];
       okkiShowlistBlogForm.value.resetFields();
     }
     function classifyIntoFormData(allValues) {
@@ -175,13 +209,12 @@
            ...main, // 展开
            okkiOverviewList: okkiOverviewForm.value.getFormData(),
            okkiProductListList: okkiProductListForm.value.getFormData(),
-           okkiHighlightList: okkiHighlightForm.value.getFormData(),
-           okkiAdvantageList: allValues.tablesValue[0].tableData,
+           okkiHighlightList: allValues.tablesValue[0].tableData,
+           okkiAdvantageList: allValues.tablesValue[1].tableData,
            okkiRecommendedProductsList: okkiRecommendedProductsForm.value.getFormData(),
-           okkiKeywordsList: okkiKeywordsForm.value.getFormData(),
-           okkiKeywordsSeriesList: okkiKeywordsSeriesForm.value.getFormData(),
-           okkiReviewList: okkiReviewForm.value.getFormData(),
-           okkiFaqList: okkiFaqForm.value.getFormData(),
+           okkiKeywordsList: allValues.tablesValue[2].tableData,
+           okkiReviewList: allValues.tablesValue[3].tableData,
+           okkiFaqList: allValues.tablesValue[4].tableData,
            okkiShowlistBlogList: okkiShowlistBlogForm.value.getFormData(),
          }
        }
@@ -189,15 +222,10 @@
      function validateSubForm(allValues){
          return new Promise((resolve,reject)=>{
              Promise.all([
-                  okkiOverviewForm.value.validateForm(1),
-                  okkiProductListForm.value.validateForm(2),
-                  okkiHighlightForm.value.validateForm(3),
-                  okkiRecommendedProductsForm.value.validateForm(5),
-                  okkiKeywordsForm.value.validateForm(6),
-                  okkiKeywordsSeriesForm.value.validateForm(7),
-                  okkiReviewForm.value.validateForm(8),
-                  okkiFaqForm.value.validateForm(9),
-                  okkiShowlistBlogForm.value.validateForm(10),
+                  okkiOverviewForm.value.validateForm(0),
+                  okkiProductListForm.value.validateForm(1),
+                  okkiRecommendedProductsForm.value.validateForm(4),
+                  okkiShowlistBlogForm.value.validateForm(8),
              ]).then(() => {
                  resolve(allValues)
              }).catch(e => {
@@ -227,38 +255,12 @@
 </script>
 
 <style lang="less" scoped>
-/** 时间和数字输入框样式 */
+	/** 时间和数字输入框样式 */
     :deep(.ant-input-number){
-        width: 100%
-    }
-
-    :deep(.ant-calendar-picker){
-        width: 100%
-    }
-</style>
-
-<style lang="less">
-// Online表单Tab风格专属样式
-.j-cgform-tab-modal {
-  .ant-modal-header {
-    padding-top: 8px;
-    padding-bottom: 8px;
-    border-bottom: none !important;
-  }
-
-  .ant-modal .ant-modal-body > .scrollbar,
-  .ant-tabs-nav .ant-tabs-tab {
-    padding-top: 0;
-  }
-
-  .ant-tabs-top-bar {
-    width: calc(100% - 55px);
-    position: relative;
-    left: -14px;
-  }
+		width: 100%
+	}
 
-  .ant-tabs .ant-tabs-top-content > .ant-tabs-tabpane {
-    overflow: hidden auto;
-  }
-}
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
 </style>