[bug-350] 区分列表调用与值来源、对话框调用loading动画判定

src/api/platform/data/dataTemplate.js

@@ -215,12 +215,13 @@ export function getSelectorDataByKey(params) {
  * 获取列表数据
  * @param {*} params
  */
-export function queryDataTable(params) {
+export function queryDataTable(params, type) {
   return request({
     url: DATA_URL() + '/data/template/queryDataTable',
     method: 'post',
     data: params,
-    isLoading: true
+    // 仅列表类型触发loading事件
+    isLoading: type === 'default'
   })
 }
 

src/business/platform/data/templaterender/templates/list.vue

@@ -755,11 +755,11 @@ export default {
          * 加载数据
          */
         loadData (outerKey) {
-            // 取消loading,直接在接口处设置,避免模板加载loading与数据加载loading差异过大
-            // this.loading = true
+            // 仅模板类型为对话框时触发页内loading事件，其余根据接口判定触发全局loading
+            this.loading = this.dataTemplate.type === 'dialog'
             if (this.$utils.isEmpty(this.template)) return
-            queryDataTable(this.getFormatParams(outerKey)).then((response) => {
-                // this.loading = false
+            queryDataTable(this.getFormatParams(outerKey), this.dataTemplate.type).then((response) => {
+                this.loading = false
                 ActionUtils.handleListData(this, response.data)
                 this.setSelectRow()
                 if (this.$refs.crud) {
@@ -771,7 +771,7 @@ export default {
                     }, 100)()
                 }
             }).catch(() => {
-                // this.loading = false
+                this.loading = false
             })
         },
         /**