Merge branch 'dev_20241202_xukangle' into develop

@@ -10,6 +10,15 @@ export const getProductList = (params) => request({
   method: 'get',
   method: 'get',
   params
   params
 })
 })
+/** 获取数交所产品
+ * @param {Object} params
+ * path: /dam-catalog-table/data-exchange/get-table-select
+*/
+export const getDataExchangeProductList = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/data-exchange/get-table-select`,
+  method: 'get',
+  params
+})
 
 
 /** 获取已添加的数据产品列表 */
 /** 获取已添加的数据产品列表 */
 export const getAddedProductList = (params) => request({
 export const getAddedProductList = (params) => request({
@@ -25,6 +34,13 @@ export const getListingList = (params) => request({
   data: params
   data: params
 })
 })
 
 
+/**获取产品上架数量 */
+export const getListingCount = () => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/product-num`,
+  method: 'post',
+})
+
+
 /** 获取数据产品上架详情 */
 /** 获取数据产品上架详情 */
 export const getListingDetail = (params) => request({
 export const getListingDetail = (params) => request({
   url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/detail`,
   url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/detail`,
@@ -54,6 +70,13 @@ export const listingUpdate = (params) => request({
   data: params
   data: params
 });
 });
 
 
+/**门户更新 */
+export const listingUpdateGateway = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/update-gateway`,
+  method: 'post',
+  data: params
+});
+
 /** 删除数据产品上架信息 */
 /** 删除数据产品上架信息 */
 export const listingDelete = (params) => request({
 export const listingDelete = (params) => request({
   url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/delete`,
   url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/delete`,

@@ -28,7 +28,7 @@ import {
 import { TableColumnWidth } from "@/utils/enum";
 import { TableColumnWidth } from "@/utils/enum";
 import router from "@/router";
 import router from "@/router";
 import { download } from "@/utils/common";
 import { download } from "@/utils/common";
-import { da, sl } from "element-plus/es/locale";
+
 
 
 
 
 const currentPath = ref<string[]>([]);
 const currentPath = ref<string[]>([]);
@@ -146,7 +146,7 @@ onMounted(async () => {
     execGuid: execGuidInfo.value.execGuid,
     execGuid: execGuidInfo.value.execGuid,
     classifyDetail: classifyDetailGuidInfo.value
     classifyDetail: classifyDetailGuidInfo.value
   });
   });
-  getDictionaryList();
+  // getDictionaryList();
   getSearchTableList();
   getSearchTableList();
   // getLabelListData();
   // getLabelListData();
   getGradeData(refGradeGuid.value);
   getGradeData(refGradeGuid.value);
@@ -900,21 +900,22 @@ const classEditFormItems = ref<any>([{
   clearable: true,
   clearable: true,
   block: true,
   block: true,
   visible: true,
   visible: true,
-}, {
-  label: '关联字典',
-  field: 'dictionaryGuid',
-  type: 'select',
-  placeholder: '请选择',
-  default: '',
-  options: [],
-  props: {
-    label: "chName",
-    value: "guid",
-  },
-  filterable: true,
-  clearable: true,
-  required: false
 },
 },
+//{
+//   label: '关联字典',
+//   field: 'dictionaryGuid',
+//   type: 'select',
+//   placeholder: '请选择',
+//   default: '',
+//   options: [],
+//   props: {
+//     label: "chName",
+//     value: "guid",
+//   },
+//   filterable: true,
+//   clearable: true,
+//   required: false
+// },
 {
 {
   label: '字段取值范围',
   label: '字段取值范围',
   type: 'input',
   type: 'input',
@@ -1052,7 +1053,7 @@ const drawerBtnClick = async (btn, info) => {
   } else {
   } else {
     btn.loading = true;
     btn.loading = true;
     console.log('drawerBtnClick', info);
     console.log('drawerBtnClick', info);
-    const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, dictionaryGuid, isUnique, notNull } = info;
+    const { orderNumLength, orderNum, startNumber, endNumber, fieldValueRange, startValue, endValue, fieldPrecision, isUnique, notNull } = info;
     // 判断长度orderNumLength，orderNum 要么都有值，要么都没有值，不能只有一个有值，一个没有值精确提醒
     // 判断长度orderNumLength，orderNum 要么都有值，要么都没有值，不能只有一个有值，一个没有值精确提醒
     let fieldLengthCondition: any = '';
     let fieldLengthCondition: any = '';
     if ((orderNumLength === 'between' && !startNumber) || (orderNumLength === 'between' && !endNumber)) {
     if ((orderNumLength === 'between' && !startNumber) || (orderNumLength === 'between' && !endNumber)) {
@@ -1091,7 +1092,6 @@ const drawerBtnClick = async (btn, info) => {
       if (fieldValueRange) {
       if (fieldValueRange) {
         param = {
         param = {
           fieldPrecision,
           fieldPrecision,
-          dictionaryGuid,
           isUnique,
           isUnique,
           notNull,
           notNull,
           fieldLengthCondition,
           fieldLengthCondition,
@@ -1102,7 +1102,6 @@ const drawerBtnClick = async (btn, info) => {
       } else {
       } else {
         param = {
         param = {
           fieldPrecision,
           fieldPrecision,
-          dictionaryGuid,
           isUnique,
           isUnique,
           notNull,
           notNull,
           fieldLengthCondition,
           fieldLengthCondition,

@@ -87,7 +87,7 @@ const getDictionaryList = () => {
 onMounted(async () => {
 onMounted(async () => {
   await getFieldTypeData()
   await getFieldTypeData()
   await getBizRuleConfigDetailData()
   await getBizRuleConfigDetailData()
-  getDictionaryList()
+  // getDictionaryList()
 })
 })
 
 
 
 
@@ -335,7 +335,7 @@ const saveData = async () => {
           execGuid: router.currentRoute.value.query.execGuid,
           execGuid: router.currentRoute.value.query.execGuid,
           fieldLengthCondition: fieldLengthCondition,
           fieldLengthCondition: fieldLengthCondition,
           fieldPrecision: item.fieldPrecision,
           fieldPrecision: item.fieldPrecision,
-          dictionaryGuid: item.dictionaryGuid,
+          // dictionaryGuid: item.dictionaryGuid,
           isUnique: item.isUnique,
           isUnique: item.isUnique,
           notNull: item.notNull,
           notNull: item.notNull,
           fieldValueRange: item.fieldValueRange
           fieldValueRange: item.fieldValueRange
@@ -348,7 +348,7 @@ const saveData = async () => {
           execGuid: router.currentRoute.value.query.execGuid,
           execGuid: router.currentRoute.value.query.execGuid,
           fieldLengthCondition: fieldLengthCondition,
           fieldLengthCondition: fieldLengthCondition,
           fieldPrecision: item.fieldPrecision,
           fieldPrecision: item.fieldPrecision,
-          dictionaryGuid: item.dictionaryGuid,
+          // dictionaryGuid: item.dictionaryGuid,
           isUnique: item.isUnique,
           isUnique: item.isUnique,
           notNull: item.notNull,
           notNull: item.notNull,
           startValue: item.startValue,
           startValue: item.startValue,
@@ -627,7 +627,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null
         </el-table-column>
         </el-table-column>
 
 
         <!-- 关联字典（可编辑）el-tree-select 形式下拉形式 -->
         <!-- 关联字典（可编辑）el-tree-select 形式下拉形式 -->
-        <el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip>
+        <!-- <el-table-column prop="dictionaryGuid" label="关联字典" width="150" align="left" show-overflow-tooltip>
           <template #default="scope">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">{{ scope.row.dictionaryGuid
             <span v-if="!scope.row.isEdit">{{ scope.row.dictionaryGuid
               ? dictionaryList.find((item: any) => item.guid === scope.row.dictionaryGuid)?.chName : '--' }}</span>
               ? dictionaryList.find((item: any) => item.guid === scope.row.dictionaryGuid)?.chName : '--' }}</span>
@@ -636,7 +636,7 @@ const inputLengthKeyUp = (regexp, scope, field, max: any = null, min: any = null
             </el-select>
             </el-select>
           </template>
           </template>
 
 
-        </el-table-column>
+        </el-table-column> -->
 
 
         <!-- 数据是否唯一（可编辑） -->
         <!-- 数据是否唯一（可编辑） -->
         <el-table-column prop="isUnique" label="数据是否唯一" width="150" align="left" show-overflow-tooltip>
         <el-table-column prop="isUnique" label="数据是否唯一" width="150" align="left" show-overflow-tooltip>