Merge remote-tracking branch 'origin/qin_25'

src/api/DesignForm/types.ts

@@ -229,6 +229,8 @@ export interface echatsViews {
 	title:string;
 	y:string[];
 	x:string[];
+	ysun?: string[];
+  	xsun?: string[];
 	filter:string[];
 	timelength:number;
 	search:searchInfo;

src/components/DesignForm/public/expand/userDialog.vue

@@ -205,12 +205,13 @@ const defaultProps = {
             @node-click="handleNodeClick"
             :props="defaultProps"
             highlight-current
+            clearable
           />
         </div>
       </el-col>
       <el-col :span="12">
         <div class="search">
-          <el-input placeholder="请输入用户名" v-model="userName" />
+          <el-input placeholder="请输入用户名" v-model="userName" clearable />
           <el-button type="primary" @click="searchClick">查询</el-button>
           <el-button @click="resetClick">重置</el-button>
         </div>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue

@@ -58,6 +58,8 @@ const echartsInfo = reactive<echatsViews>({
   widthBox: 0,
   y: [],
   x: [],
+  ysun: [],
+  xsun: [],
   filter: [],
   timelength: 1,
   search: {
@@ -82,8 +84,8 @@ const dimMeaList = () => {
     console.log("获取维度义量化字段", data);
     dimAry.value = data.data.dimList;
     meaAry.value = data.data.meaList;
-    sunDimAry.value = data.data.sunDimList;
-    sunMeaAry.value = data.data.sunMeaList;
+    sunDimAry.value = data.data.SunDimListAry;
+    sunMeaAry.value = data.data.SunMeaListAry;
   });
   /*获取视图数据*/
   getChartCont({ id: props.state.formData.form.name }).then((data) => {

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/winBox/dimMea.vue

@@ -508,6 +508,11 @@ const pickDimMeaSet = () => {
     "确定选择----------checkListsunduLiang-------------->",
     checkListsunduLiang.value
   );
+  console.log(
+    "确定选择----------checkListsund-------------->",
+    checkListsund.value
+  );
+  
   switch (props.dimMeaType) {
     case 2:
       drawTitle.value = "添加度量";
@@ -529,6 +534,17 @@ const pickDimMeaSet = () => {
   handleClose();
 };
 
+/**
+@ 作者: 秦东
+@ 时间: 2025-08-27 10:20:38
+@ 功能: 组装子表数据结构
+*/
+const makeSunTableStruct = () => {
+
+}
+
+
+
 /**
 @ 作者: 秦东
 @ 时间: 2025-06-30 14:28:37
@@ -702,16 +718,17 @@ const checkListsunduLiang = ref([]);
           </el-collapse>
         </div>
       </el-checkbox-group>
+     
       <el-divider
-        v-if="props.dimMeaType == 3 || props.dimMeaType == 4"
+        v-if="(props.dimMeaType == 3 || props.dimMeaType == 4) "
         content-position="left"
         >子表</el-divider
       >
       <el-tabs v-if="props.dimMeaType != 2" type="border-card">
-        <el-tab-pane v-for="(item, index) in props.sunMeaAry" :label="index">
+        <el-tab-pane v-for="(item, index) in props.sunMeaAry" :label="item.tableName" :key="index">
           <el-checkbox-group v-model="checkListsund">
-            <div v-for="(iv, idx) in item">
-              <el-checkbox :value="iv.field" :label="iv.title" size="large" :key="idx" />
+            <div v-for="(iv, idx) in item.tableUnit">
+              <el-checkbox :value="iv" :label="iv.title" size="large" :key="idx" />
             </div>
           </el-checkbox-group>
         </el-tab-pane>
@@ -765,15 +782,15 @@ const checkListsunduLiang = ref([]);
         </div>
       </el-checkbox-group>
       <el-divider
-        v-if="props.dimMeaType == 3 || props.dimMeaType == 4"
+        v-if="(props.dimMeaType == 3 || props.dimMeaType == 4)  "
         content-position="left"
         >子表</el-divider
       >
-      <el-tabs v-if="props.dimMeaType != 1" type="border-card">
-        <el-tab-pane v-for="(item, index) in props.sunDimAry" :label="index">
+      <el-tabs v-if="props.dimMeaType != 1 " type="border-card">
+        <el-tab-pane v-for="(item, index) in props.sunDimAry" :label="item.tableName" :key="index">
           <el-checkbox-group v-model="checkListsunduLiang">
-            <div v-for="(iv, idx) in item">
-              <el-checkbox :value="iv.field" :label="iv.title" size="large" :key="idx" />
+            <div v-for="(iv, idx) in item.tableUnit">
+              <el-checkbox :value="iv" :label="iv.title" size="large" :key="idx" />
             </div>
           </el-checkbox-group>
         </el-tab-pane>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue

@@ -1617,7 +1617,7 @@ const delAllPick = () => {
           </el-button>
         </div>
         <div>
-          {{ state.view }}
+       
           <el-button-group class="ml-4">
             <el-tooltip
               v-if="state.config.searchFormIsShow"

src/views/sysworkflow/lowcodepage/pageList.vue

@@ -991,7 +991,7 @@ const dialogConfirm = (editVal: string) => {
             </el-button>
           </div>
           <div>
-            {{ state.view }}
+         
             <el-button-group class="ml-4">
               <el-tooltip
                 v-if="state.config.searchFormIsShow"