Просмотр исходного кода

优化新建表达时候,数据管理不出现

yangfan 3 месяцев назад
Родитель
Сommit
8ad58a1f7e

+ 3 - 0
src/components/ColumnDesign/index.vue

@@ -1143,6 +1143,7 @@ export default {
             width: 0,
             children: [],
             visible: item.visible || true,
+            mobileVisible: item.mobileVisible || true,
             widthAuto: item.widthAuto || false,
             colorScale: item.colorScale || {},
             config: o.__config__
@@ -1166,6 +1167,7 @@ export default {
                 width: '',
                 colorScale: find ? find.colorScale || {} : {},
                 visible: find ? find.visible || false : true,
+                mobileVisible: find ? find.mobileVisible || false : true,
                 widthAuto: find ? find.widthAuto : false,
                 config: o.__config__
               }
@@ -1190,6 +1192,7 @@ export default {
           width: '',
           children: [],
           visible: true,
+          mobileVisible: true,
           widthAuto: false,
           colorScale: {},
           config: o.__config__

+ 29 - 2
src/components/ColumnDesign/scene.vue

@@ -88,7 +88,13 @@
         <vxe-column field="visible" title="显示" width="90">
           <template #header> <vxe-checkbox v-model="visibleCheck" size="mini">显示</vxe-checkbox></template>
           <template slot-scope="scope">
-            <el-checkbox v-model="scope.row.visible" />
+            <el-checkbox v-model="scope.row.visible" @change="visibleCheckChange(scope)" />
+          </template>
+        </vxe-column>
+        <vxe-column field="visible" title="移动端显示" width="90">
+          <template #header> <vxe-checkbox v-model="mobileVisibleCheck" size="mini">移动端显示</vxe-checkbox></template>
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.mobileVisible" />
           </template>
         </vxe-column>
         <vxe-column field="sortable" title="排序" width="90">
@@ -161,6 +167,7 @@ export default {
       predefineColors: ['#ff4500', '#ff8c00', '#ffd700', '#90ee90', '#00ced1', '#1e90ff', '#c71585'],
       showHelpTip1: false,
       visibleCheck: false,
+      mobileVisibleCheck: false,
       sortCheck: false,
       isFieldShow: false,
       setSeachFlag: false,
@@ -218,6 +225,22 @@ export default {
         this.columnData.columnList = g.T.toTree(columnList, 'children', '_ID', '_PID')
       }
     },
+    mobileVisibleCheck(val) {
+      if (val) {
+        const columnList = g.T.toTable(this.columnData.columnList, 'children').map((item) => {
+          item.mobileVisible = true
+          return item
+        })
+        this.columnData.columnList = g.T.toTree(columnList, 'children', '_ID', '_PID')
+      }
+      if (!val) {
+        const columnList = g.T.toTable(this.columnData.columnList, 'children').map((item) => {
+          item.mobileVisible = false
+          return item
+        })
+        this.columnData.columnList = g.T.toTree(columnList, 'children', '_ID', '_PID')
+      }
+    },
     sortCheck(val) {
       if (val) {
         const columnList = g.T.toTable(this.columnData.columnList, 'children').map((item) => {
@@ -280,7 +303,7 @@ export default {
           item.format = val.format
           item.type = val.dateType
           item.dateType = val.dateType
-          item.value = val.conditions[0].values ? val.conditions[0].values[0] !== 'Invalid date' ? val.conditions[0].values : null : null
+          item.value = val.conditions[0].values ? (val.conditions[0].values[0] !== 'Invalid date' ? val.conditions[0].values : null) : null
           item.function = val.conditions[0].function
         }
       })
@@ -343,6 +366,10 @@ export default {
     setColor(item) {
       this.fieldForm = { ...this.fieldForm, ...item }
       this.isColorVisible = true
+    },
+    visibleCheckChange(row) {
+      row.mobileVisible = row.visible
+      console.log(row)
     }
   }
 }

+ 2 - 2
src/utils/define.js

@@ -3,9 +3,9 @@
 // JAVA Cloud对应网关地址
 // const APIURl = 'http://192.168.0.103:8181'
 
-const url = 'https://windata.platomix.net' // 测试环境
+// const url = 'https://windata.platomix.net' // 测试环境
 // const url = 'https://api.bi.platomix.net' // 测试环境
-// const url = 'https://bi.platomix.net' // BI环境
+const url = 'https://bi.platomix.net' // BI环境
 // const url = 'https://miniapp.zhangmushiye.com/' // 樟木环境
 // const url = 'http://hr.cscec8st.com.cn:50021/' // 中建环境
 // const url = 'http://hr.cscec8st.com.cn:50022/' // 中建环境

Разница между файлами не показана из-за своего большого размера
+ 2 - 2
src/utils/request.js