Merge branch 'dev_20241202_xukangle' into develop

@@ -239,9 +239,8 @@ const toSearch = (val: any, clear: boolean = false) => {
       pageIndex: 1,
       pageIndex: 1,
       pageSize: 50,
       pageSize: 50,
       execGuid: execGuidInfo.value.execGuid,
       execGuid: execGuidInfo.value.execGuid,
-      database: selectedA.value || '',
-      tableName: selectedB.value || '',
-      fieldName: selectedC.value || '',
+      tableGuid: selectedB.value || '',
+      databaseGuid: selectedA.value || '',
       classifyDetailGuid: val.classifyName,
       classifyDetailGuid: val.classifyName,
       gradeDetailGuid: val.levelName,
       gradeDetailGuid: val.levelName,
       labelGuid: val.labelName,
       labelGuid: val.labelName,
@@ -252,8 +251,9 @@ const toSearch = (val: any, clear: boolean = false) => {
       pageIndex: 1,
       pageIndex: 1,
       pageSize: 50,
       pageSize: 50,
       execGuid: execGuidInfo.value.execGuid,
       execGuid: execGuidInfo.value.execGuid,
-      database: selectedA.value || '',
-      fieldName: selectedB.value || '',
+      tableGuid: selectedB.value || '',
+      databaseGuid: selectedA.value || '',
+      fieldGuid: selectedC.value || '',
       classifyDetailGuid: val.classifyName,
       classifyDetailGuid: val.classifyName,
       gradeDetailGuid: val.levelName,
       gradeDetailGuid: val.levelName,
       labelGuid: val.labelName,
       labelGuid: val.labelName,
@@ -893,13 +893,11 @@ const getDataBaseTableData = async (params = {}) => {
   const dataBaseParams = {
   const dataBaseParams = {
     pageIndex: dataBasePage.value.curr,
     pageIndex: dataBasePage.value.curr,
     pageSize: dataBasePage.value.limit,
     pageSize: dataBasePage.value.limit,
-    tableGuid: tableGuid.value,
-    databaseGuid: dataBaseGuid.value,
     isDataAsset: '',
     isDataAsset: '',
     execGuid: execGuidInfo.value.execGuid,
     execGuid: execGuidInfo.value.execGuid,
-    tableName: "",
-    database: "",
-    fieldName: "",
+    tableGuid: tableGuid.value,
+    databaseGuid: dataBaseGuid.value,
+    fieldGuid: "",
     labelGuid: "",
     labelGuid: "",
     classifyDetailGuid: "",
     classifyDetailGuid: "",
     gradeDetailGuid: ""
     gradeDetailGuid: ""
@@ -946,12 +944,10 @@ const getDataBaseFieldData = async (params = {}) => {
   const dataBaseParams = {
   const dataBaseParams = {
     pageIndex: dataFieldPage.value.curr,
     pageIndex: dataFieldPage.value.curr,
     pageSize: dataFieldPage.value.limit,
     pageSize: dataFieldPage.value.limit,
-    tableGuid: "",
-    databaseGuid: "",
     execGuid: execGuidInfo.value.execGuid,
     execGuid: execGuidInfo.value.execGuid,
-    tableName: "",
-    database: "",
-    fieldName: "",
+    tableGuid: tableGuid.value || '',
+    databaseGuid: dataBaseGuid.value || '',
+    fieldGuid: "",
     labelGuid: "",
     labelGuid: "",
     classifyDetailGuid: "",
     classifyDetailGuid: "",
     gradeDetailGuid: ""
     gradeDetailGuid: ""
@@ -1245,8 +1241,6 @@ const onAChange = async () => {
     await getSearchTableList(2, selectedA.value); // 分类分级搜索
     await getSearchTableList(2, selectedA.value); // 分类分级搜索
   }
   }
   if (activeName.value == 'second') {
   if (activeName.value == 'second') {
-    console.log('onAChange', optionsA.value);
-
     if (activeTab.value === 'word') {
     if (activeTab.value === 'word') {
       await getDbDirFieldSelectData(2, { databaseGuid: selectedA.value, condition: "2" });
       await getDbDirFieldSelectData(2, { databaseGuid: selectedA.value, condition: "2" });
     } else {
     } else {
@@ -1269,8 +1263,6 @@ const onBChange = async () => {
   if (activeName.value == 'second') {
   if (activeName.value == 'second') {
     if (activeTab.value === 'word') {
     if (activeTab.value === 'word') {
       await getDbDirFieldSelectData(3, { tableGuid: selectedB.value, databaseGuid: selectedA.value, condition: "3" });
       await getDbDirFieldSelectData(3, { tableGuid: selectedB.value, databaseGuid: selectedA.value, condition: "3" });
-    } else {
-      await getDbDirTableSelectData(3, { tableGuid: selectedB.value, databaseGuid: selectedA.value, condition: "3" }); // 数据库搜索
     }
     }
   }
   }
 };
 };
@@ -1340,7 +1332,7 @@ onActivated(async () => {
         <el-option v-for="item in optionsB" :key="item.dbGuid" :label="item.name" :value="item.dbGuid" />
         <el-option v-for="item in optionsB" :key="item.dbGuid" :label="item.name" :value="item.dbGuid" />
       </el-select>
       </el-select>
       <el-select v-model="selectedC" placeholder="选择字段名" :disabled="!selectedB" style="width: 140px;margin-right: 8px"
       <el-select v-model="selectedC" placeholder="选择字段名" :disabled="!selectedB" style="width: 140px;margin-right: 8px"
-        :clearable="true">
+        :clearable="true" v-if="!isShowWordSearch">
         <el-option v-for="item in optionsC" :key="item.dbGuid" :label="item.name" :value="item.dbGuid" />
         <el-option v-for="item in optionsC" :key="item.dbGuid" :label="item.name" :value="item.dbGuid" />
       </el-select>
       </el-select>
       <TableTools :searchItems="searchItemList" :init="false" :searchId="'files-standard-search'" @search="toSearch"
       <TableTools :searchItems="searchItemList" :init="false" :searchId="'files-standard-search'" @search="toSearch"