Merge remote-tracking branch 'origin/1.2.2' into 1.2.2

src/components/ColumnDesign/scene.vue

@@ -217,6 +217,22 @@ export default {
         })
         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) => {
+          item.sortable = 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.sortable = false
+          return item
+        })
+        this.columnData.columnList = g.T.toTree(columnList, 'children', '_ID', '_PID')
+      }
     }
   },
   mounted() {
@@ -264,7 +280,7 @@ export default {
           item.format = val.format
           item.type = val.dateType
           item.dateType = val.dateType
-          item.value = val.conditions[0].values
+          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
         }
       })

src/components/Generator/components/InputTable/index.vue

@@ -37,7 +37,7 @@
         </template>
         <template slot-scope="scope">
           <template v-if="detailType === 'detail'">
-            {{ tableFormData[scope.$index][cindex].value }}
+            {{ detailGetValue(tableFormData[scope.$index][cindex],head) }}
           </template>
           <template v-else>
             <!-- 单选框组 多选框组 都替换成下拉 并添加options -->
@@ -95,14 +95,18 @@
 </template>
 <script>
 import relationTable from "@/components/Generator/components/RelationTable/index.vue";
-import { dyOptionsList } from '@/components/Generator/generator/comConfig'
-import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-import { previewDataInterface } from '@/api/systemData/dataInterface'
-import { deteleChildrenModel, deteleModel, getChildrenBrowserData, getChildrenConfigData, NewAddModel, NewupdateModel } from '@/api/onlineDev/visualDev'
+import {dyOptionsList} from '@/components/Generator/generator/comConfig'
+import {
+  deteleChildrenModel,
+  getChildrenBrowserData,
+  getChildrenConfigData,
+  NewupdateModel
+} from '@/api/onlineDev/visualDev'
 import {deepClone, numberChinese} from '@/utils'
 import moment from 'moment/moment'
-import { getAPIData, getTabelAPIData } from '@/components/Dataset-filter/util'
+import {getAPIData, getTabelAPIData} from '@/components/Dataset-filter/util'
 import {dictDetail} from "@/api/newbi/dict";
+
 export default {
   name: 'input-table',
   components: {relationTable},
@@ -566,6 +570,10 @@ export default {
           additionalType.propsUrl = t.__config__.propsUrl
           additionalType.apiProps = t.__config__.apiProps
         }
+        if (t.__config__.jnpfKey === 'date'){
+          additionalType.defaultDay = t.defaultDay
+          additionalType.editChange = t.editChange
+        }
         let res = {
           tag: t.__config__.tag,
           formId: t.__config__.formId,
@@ -585,6 +593,13 @@ export default {
             res.value = val ? val[relationColumn.primaryId] : null
           }
         }
+        //默认当前时间
+        if (t.__config__.jnpfKey === 'date' && res.defaultDay) {
+          //添加默认时间 当前没有值时添加数据 允许编辑时更新 重新赋值
+          if (!res.value || res.editChange) {
+            res.value = moment().valueOf()
+          }
+        }
         // if (t.tag === 'el-upload') this.$set(res, 'value', t.defaultValue)
         return res
       })
@@ -711,6 +726,61 @@ export default {
       });
       this.$refs.relationTable.visible = false
     },
+    // 子表详情展示数据过滤
+    detailGetValue(data,scheme){
+      // 日期选择器
+      if (data.tag === 'el-date-picker'){
+        let filterVal = data.value
+        if (filterVal && g.getLen(String(filterVal)) === 10) {
+          try {
+            filterVal = filterVal * 1000
+          } catch (e) {}
+        }
+        return filterVal
+          ? XEUtils.toDateString(filterVal,scheme.format) !== 'Invalid Date'
+            ? XEUtils.toDateString(filterVal,scheme.format)
+            : filterVal
+          : ''
+      }
+      // 时间选择器
+      if (data.tag === 'el-time-picker') {
+        let filterVal = data.value
+        try {
+          return  filterVal
+            ? moment(Number(filterVal)).format(scheme.format) !== 'Invalid Date'
+              ? moment(Number(filterVal)).format(scheme.format)
+              : filterVal
+            : ''
+        } catch (e) {}
+      }
+      // 开关
+      if (data.tag === 'el-switch') {
+        if (data.value == scheme['active-value']) {
+          return scheme['active-text'] || '是'
+        } else {
+          return  scheme['inactive-text'] || '否'
+        }
+      }
+      // 下拉 多选 单选
+      if (['select', 'checkbox', 'radio'].includes(scheme.__config__.jnpfKey)){
+        if (data.ApiReturn && data.ApiReturn.length){
+          let activeObj = data.options.find(i=> i[data.apiProps.value] === data.value)
+          if (activeObj){
+            return activeObj[data.apiProps.label]
+          }else {
+            return data.value
+          }
+        }else {
+          let activeObj = data.options.find(i=> i[scheme.__config__.props.value] === data.value)
+          if (activeObj){
+            return activeObj[scheme.__config__.props.label]
+          }else {
+            return data.value
+          }
+        }
+      }
+      return data.value
+    },
   }
 }
 </script>

src/components/Generator/components/RelationTable/index.vue

@@ -145,6 +145,7 @@ import { getBrowserData, getChildrenConfigData, getConfigData, getPrecondition,
 import { dictDetail } from '@/api/newbi/dict'
 import { getAPIData, getTreeAPIData } from '@/components/Dataset-filter/util'
 import { getFileById } from '@/api/common'
+import {comUrl} from "@/utils/define";
 
 export default {
   name: 'index',
@@ -181,6 +182,7 @@ export default {
       mergeCells: [],
       imgList: {},
       fileList: {},
+      comUrlImage:comUrl,
       // 表头筛选数组
       filterList: {},
       getPreconditionObj: {},
@@ -561,7 +563,7 @@ export default {
             }
             // console.log(compoentConfig.jnpfKey)
             if (compoentConfig.jnpfKey === 'uploadImg') {
-              // data.slots.default = 'default_images'
+              data.slots.default = 'default_images'
               data.showOverflow = false
               data.width = 300
             }
@@ -680,7 +682,7 @@ export default {
             if (item.config && item.config.isJoin) {
               item.slots = {}
               if (item.jnpfKey === 'uploadImg') {
-                // item.slots.default = 'default_images'
+                item.slots.default = 'default_images'
                 item.showOverflow = false
               }
               columnList.push(item)

src/views/basic/dynamicModel/list/Search.vue

@@ -507,7 +507,7 @@ export default {
       let arr = []
       for (let i = 0; i < this.searchList.length; i++) {
         const e = this.searchList[i]
-        if (e.conditions && e.conditions.length && e.conditions[0] && e.conditions[0].values && e.conditions[0].values.length && e.conditions[0].values[0] !== '') {
+        if (e.conditions && e.conditions.length && e.conditions[0] && e.conditions[0].values && e.conditions[0].values.length && e.conditions[0].values[0] !== ''&& e.conditions[0].values[0] !== 'Invalid date') {
           let obj = {}
           obj.cubeColumnId = e.__vModel__
           obj.function = e.conditions[0].function