From 5f00696dfb25bc90034448ceb634ed1ef256681a Mon Sep 17 00:00:00 2001
From: qiyunfeng-create <1940665526@qq.com>
Date: 星期四, 21 八月 2025 21:13:35 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/xiehe_website

---
 src/assets/js/toolClass.js |  208 ++++++++++++++++++++++++----------------------------
 1 files changed, 96 insertions(+), 112 deletions(-)

diff --git a/src/assets/js/toolClass.js b/src/assets/js/toolClass.js
index 3f993b3..b56f586 100644
--- a/src/assets/js/toolClass.js
+++ b/src/assets/js/toolClass.js
@@ -1,12 +1,7 @@
 import SparkMD5 from 'spark-md5'
-import {
-  getPublicImage
-} from '@/assets/js/middleGround/tool.js'
+import { getPublicImage } from '@/assets/js/middleGround/tool.js'
 import config from './config'
-import moment from "moment";
-
-
-
+import moment from 'moment'
 
 var tool = {
   secondToTime(second) {
@@ -74,9 +69,8 @@
       .replace(/\.[\d]{3}Z/, '')
     var time = new Date(newDate)
     return time.getTime()
-  }
+  },
 }
-
 
 //澶勭悊琛ㄥ崟鎻愪氦鏁版嵁
 export function worksData(res) {
@@ -101,8 +95,8 @@
       nrr.push({
         linkProtectType: e.linkProtectType,
         linkType: e.linkType,
-        md5: e.md5
-      })
+        md5: e.md5,
+      }),
     )
   }
   res.forEach((item) => {
@@ -111,7 +105,7 @@
       order: 0,
       typeFieldId: item.typeField.id,
       sequenceNum: item.config ? JSON.parse(item.config).uuid : '',
-      newDataAndFileLinkListRequest: []
+      newDataAndFileLinkListRequest: [],
     }
     for (let k in value) {
       if (item.typeField.refCode === k) {
@@ -165,7 +159,7 @@
         id: updateOldData.id,
         typeFieldId: citem.typeField.id,
         sequenceNum: citem.sequenceNum,
-        setDataAndFileLinkListRequest: []
+        setDataAndFileLinkListRequest: [],
       }
       for (let k in value) {
         if (citem.typeField.refCode === k) {
@@ -174,9 +168,11 @@
             obj.setDataAndFileLinkListRequest = linkList
           } else if (typeof value[k] == 'object' && k == 'region') {
             obj.strValue = value[k]?.join('/')
-            obj.setDataAndFileLinkListRequest = [{
-              area: value[k]
-            }]
+            obj.setDataAndFileLinkListRequest = [
+              {
+                area: value[k],
+              },
+            ]
           } else {
             obj.strValue = value[k].toString()
           }
@@ -191,7 +187,7 @@
         order: 0,
         typeFieldId: citem.typeField.id,
         sequenceNum: citem.sequenceNum,
-        setDataAndFileLinkListRequest: []
+        setDataAndFileLinkListRequest: [],
       }
       for (let k in value) {
         if (citem.typeField.refCode === k) {
@@ -210,7 +206,7 @@
   })
   return {
     updateData: arr,
-    newData: newArr
+    newData: newArr,
   }
 }
 
@@ -298,10 +294,7 @@
 
 // 鑾峰彇鏂囦欢
 export function getPublicFile(md5, isToken) {
-  const {
-    tokenKey,
-    requestCtx
-  } = config
+  const { tokenKey, requestCtx } = config
   let src = null
   let token = localStorage.getItem(tokenKey)
   if (md5) {
@@ -316,33 +309,28 @@
   return src
 }
 
-
-
-
-
-
 export const handleCmsItemListRequestData = (datas, fields, path, storeId, repositoryId) => {
-  const dataList = [];
+  const dataList = []
   for (let i = 0; i < datas.length; i++) {
-    const item = datas[i];
-    const _fields = {};
-    const _datas = [];
+    const item = datas[i]
+    const _fields = {}
+    const _datas = []
     if (fields != null) {
       for (let fieldKey in fields) {
         // 鍏煎绛涢�夋潯浠剁殑瀛楁鍊艰幏鍙栵紝鍥犱负鍚庡彴绛涢�夊拰鍙栧�煎彧鑳戒紶涓�涓紝閮戒細杩斿洖鍊�
-        fieldKey = fieldKey.replace(/[!=<>*]/g, '');
+        fieldKey = fieldKey.replace(/[!=<>*]/g, '')
         if (item.datas[fieldKey]) {
-          let values = [];
+          let values = []
           if (typeof item.datas[fieldKey] == 'string') {
-            values = JSON.parse(item.datas[fieldKey]);
+            values = JSON.parse(item.datas[fieldKey])
           } else {
-            values = item.datas[fieldKey];
+            values = item.datas[fieldKey]
           }
-          if (values ?.length > 0) {
+          if (values?.length > 0) {
             // 鐢ㄥ瓧娈靛悕澶勭悊杩斿洖鐨勫瓧娈靛��
             if (values[0].Value) {
-              _fields[fieldKey] = values[0].Value;
-              values[0].sequenceNum = values[0].SequenceNum;
+              _fields[fieldKey] = values[0].Value
+              values[0].sequenceNum = values[0].SequenceNum
             }
             // 鍏煎澶勭悊鏁版嵁杩斿洖鐨刱ey鏄疌msItemData
             // if (values[0].CmsItemData) {
@@ -350,24 +338,24 @@
             //   values[0].sequenceNum = values[0].CmsItemData.SequenceNum;
             // }
 
-            item.datas[fieldKey] = values[0];
-            if (values ?.length > 1) {
-              const isFile = values.find((citem) => citem.FileList ?.length > 0);
-              const dataItems = deduplicateArray(values, 'FieldId');
+            item.datas[fieldKey] = values[0]
+            if (values?.length > 1) {
+              const isFile = values.find((citem) => citem.FileList?.length > 0)
+              const dataItems = deduplicateArray(values, 'FieldId')
               if (!isFile) {
-                _datas.push(dataItems[0]);
+                _datas.push(dataItems[0])
               } else {
                 const customFile = {
                   customFileList: values,
                   name: fieldKey,
                   md5: _fields[fieldKey],
                   FieldId: values[0].FieldId,
-                  SequenceNum: values[0].SequenceNum
-                };
-                _datas.push(customFile);
+                  SequenceNum: values[0].SequenceNum,
+                }
+                _datas.push(customFile)
               }
             } else {
-              _datas.push(values[0]);
+              _datas.push(values[0])
             }
           }
         }
@@ -375,14 +363,14 @@
     }
 
     if (item.datas.LogQuery) {
-      item.datas.LogQuery = JSON.parse(item.datas.LogQuery);
+      item.datas.LogQuery = JSON.parse(item.datas.LogQuery)
     }
 
-    const subDatas = {};
+    const subDatas = {}
     if (item.subDatas) {
       for (let subData of item.subDatas) {
-        const tag = subData.queryTag.replace('Query', '');
-        subDatas[tag] = subData.datas;
+        const tag = subData.queryTag.replace('Query', '')
+        subDatas[tag] = subData.datas
       }
     }
     dataList.push({
@@ -414,47 +402,48 @@
       linkInfo: item.datas.LinkInfo ? JSON.parse(item.datas.LinkInfo) : [],
       linkPath: item.datas.LinkPath ?? null,
       linkOrg: item.datas.LinkOrg ? JSON.parse(item.datas.LinkOrg) : [],
-      linkDepartment: item.datas.LinkDepartment? JSON.parse(item.datas.LinkDepartment) : [],
+      linkDepartment: item.datas.LinkDepartment ? JSON.parse(item.datas.LinkDepartment) : [],
       ..._fields,
       datas: item.datas,
       fieldList: _datas,
-      subDatas
-    });
+      subDatas,
+    })
   }
-  return dataList;
-};
+  return dataList
+}
 
 // type缁撴瀯澶勭悊
 export const handleTypeList = (list) => {
   for (let i = 0; i < list.length; i++) {
-    const type = list[i];
+    const type = list[i]
     try {
-      type.cfg = JSON.parse(type.config);
+      type.cfg = JSON.parse(type.config)
     } catch (error) {
-      type.cfg = null;
+      type.cfg = null
     }
-    const fieldRefcodeMap = {};
-    const tableHeaderFieldList = [];
-    const isSearchFieldList = [];
-    const isAdvSearchFieldList = [];
-    const isFilterFieldList = [];
+    const fieldRefcodeMap = {}
+    const tableHeaderFieldList = []
+    const isSearchFieldList = []
+    const isAdvSearchFieldList = []
+    const isFilterFieldList = []
+    console.log(type, 'type')
     handleType({
-      typeFieldList: type.typeLinkList,
+      typeFieldList: type.cmsTypeLinks,
       fieldRefcodeMap,
       tableHeaderFieldList,
       isSearchFieldList,
       isAdvSearchFieldList,
-      isFilterFieldList
-    });
-    type.fieldRefcodeMap = fieldRefcodeMap;
-    type.tableHeaderFieldList = tableHeaderFieldList;
-    type.isSearchFieldList = isSearchFieldList;
-    type.isAdvSearchFieldList = isAdvSearchFieldList;
-    type.isFilterFieldList = isFilterFieldList;
+      isFilterFieldList,
+    })
+    type.fieldRefcodeMap = fieldRefcodeMap
+    type.tableHeaderFieldList = tableHeaderFieldList
+    type.isSearchFieldList = isSearchFieldList
+    type.isAdvSearchFieldList = isAdvSearchFieldList
+    type.isFilterFieldList = isFilterFieldList
   }
 
-  return list;
-};
+  return list
+}
 
 const handleType = ({
   typeFieldList,
@@ -462,34 +451,34 @@
   tableHeaderFieldList,
   isSearchFieldList,
   isAdvSearchFieldList,
-  isFilterFieldList
+  isFilterFieldList,
 }) => {
   for (let i = 0; i < typeFieldList.length; i++) {
-    const item = typeFieldList[i];
+    const item = typeFieldList[i]
     try {
-      item.cfg = JSON.parse(item.config);
+      item.cfg = JSON.parse(item.config)
     } catch (error) {
-      item.cfg = null;
+      item.cfg = null
     }
     if (item.typeField) {
       try {
-        item.typeField.cfg = JSON.parse(item.typeField.config);
+        item.typeField.cfg = JSON.parse(item.typeField.config)
       } catch (error) {
-        item.typeField.cfg = null;
+        item.typeField.cfg = null
       }
-      fieldRefcodeMap[item.typeField.refCode] = item;
+      fieldRefcodeMap[item.typeField.refCode] = item
     }
     if (item.cfg && item.cfg.isColHeader) {
-      tableHeaderFieldList.push(item);
+      tableHeaderFieldList.push(item)
     }
     if (item.cfg && item.cfg.isSearch) {
-      isSearchFieldList.push(item);
+      isSearchFieldList.push(item)
     }
     if (item.cfg && item.cfg.isAdvSearch) {
-      isAdvSearchFieldList.push(item);
+      isAdvSearchFieldList.push(item)
     }
     if (item.cfg && item.cfg.isFilter) {
-      isFilterFieldList.push(item);
+      isFilterFieldList.push(item)
     }
     if (item.children && item.children.length) {
       handleType({
@@ -498,59 +487,54 @@
         tableHeaderFieldList,
         isSearchFieldList,
         isAdvSearchFieldList,
-        isFilterFieldList
-      });
+        isFilterFieldList,
+      })
     }
   }
-};
-
+}
 
 //澶勭悊鏍戝舰缁撴瀯
 const handleTreeData = (datas, parent, noTriggerSelect = false) => {
-  let parentData = {};
+  let parentData = {}
   if (parent) {
-    parentData = { ...parent, parent: null };
+    parentData = { ...parent, parent: null }
   } else {
-    parentData = null;
+    parentData = null
   }
-  const list = [];
+  const list = []
   for (let i = 0; i < datas.length; i++) {
-    const data = datas[i];
+    const data = datas[i]
     const obj = {
       label: data.name,
-      key: parentData ? parentData.key + "_" + i : i + "",
-      namePath: parentData ? parentData.namePath + "\\" + data.name : data.name,
+      key: parentData ? parentData.key + '_' + i : i + '',
+      namePath: parentData ? parentData.namePath + '\\' + data.name : data.name,
       icon: data.icon,
       data: data,
       parent: parentData,
       leaf: false,
       children: [],
-    };
-    if (data["children"] && data["children"].length) {
-      obj.leaf = false;
+    }
+    if (data['children'] && data['children'].length) {
+      obj.leaf = false
       obj.children = handleTreeData(
-        data["children"],
+        data['children'],
         {
           ...data,
           key: obj.key,
           namePath: obj.namePath,
         },
-        i == 0 ? false : true // 濡傛灉鏈夊瓙鏁版嵁澶勭悊锛屽彧鏈夌涓�鏉℃暟鎹渶瑕佸睍寮�鍜屽洖璋�
-      );
+        i == 0 ? false : true, // 濡傛灉鏈夊瓙鏁版嵁澶勭悊锛屽彧鏈夌涓�鏉℃暟鎹渶瑕佸睍寮�鍜屽洖璋�
+      )
     } else {
-      obj.leaf =
-        !data["childrenChannelCount"] || data["childrenChannelCount"] == 0;
+      obj.leaf = !data['childrenChannelCount'] || data['childrenChannelCount'] == 0
     }
-    list.push(obj);
+    list.push(obj)
   }
-  console.log(list, "list");
-  return list;
-};
-
+  console.log(list, 'list')
+  return list
+}
 
 //鑾峰彇璧勬簮
-
-
 
 export default {
   ...tool,
@@ -564,4 +548,4 @@
   handleTypeList,
   handleTreeData,
   // parseHtml,
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1