@tongfun/tf-widget 0.1.18 → 0.1.19

package/package/t-data-list/main.vue

@@ -22,14 +22,14 @@
           <el-button v-debounce type="primary" size="mini" @click="refresh(false,true)">刷新 </el-button>
           <!-- <el-button type="primary" size="mini">批改</el-button> -->
           <slot name="importAndExport" />
-          <slot name="buttons" />
+          <slot name="buttons" :ids="ids" :rows="selectedRows" />
         </div>
 
         <!-- 搜索输入框 -->
-        <TListSearch class="common-table-buttons-search" @search="handleSuggestMultiCondition($event)" />
+        <TListSearch ref="tListSearchRef" class="common-table-buttons-search" @search="handleSuggestMultiCondition($event)" />
       </div>
       <!--过滤方案-->
-      <Tplan :fields-option="tableLayout" @change="handlePlanConditionChange" />
+      <Tplan ref="TplanRef" :fields-option="tableLayout" @change="handlePlanConditionChange" />
     </div>
 
     <!--
@@ -51,12 +51,13 @@
         @dbRowClick 也是双击事件，但是当前行的数据被事件发射出来
      -->
     <Ttable
+      ref="TtableRef"
       class="t-table"
       :layout="tableLayout"
       :sum="tableSum"
       show-summary
       :data="tableData"
-      :disable-sum="disableSum"
+      :enable-sum="enableSum"
       :enable-group="enableGroup"
       enable-group-edit
       :page-size="query.pageSize"
@@ -119,7 +120,7 @@ export default {
       type: Boolean,
       default: false
     },
-    disableSum: {
+    enableSum: {
       type: Boolean,
       default: false
     }

package/package/t-data-list/src/js/operatorEnum.js

@@ -18,8 +18,8 @@ const typeEnum = {
   ],
 
   /**
-  * 时间类型
-  */
+   * 时间类型
+   */
   // 短时间
   date: [
     { label: '大于', value: 'TIME_MORE_SHORT' },
@@ -62,9 +62,8 @@ const typeEnum = {
   ],
 
   /**
-  * 枚举类型
-  *
-  */
+   * 枚举类型
+   */
   enum: [
     { label: '等于', value: 'ENUM_EQUAL', strict: true },
     { label: '不等于', value: 'ENUM_UNEQUAL', isFrezz: true },
@@ -73,8 +72,8 @@ const typeEnum = {
   ],
 
   /**
-  * 数字类型
-*/
+   * 数字类型
+   */
   number: [
     { label: '大于', value: 'NUMBER_MORE' },
     { label: '大于等于', value: 'NUMBER_MORE_EQUAL' },

package/package/t-data-list/src/mixins/button-controll-mixin.js

@@ -9,6 +9,9 @@ export default {
   methods: {
     // 跳转到新增页面
     insert () {
+      if (this.$listeners.insert) {
+        return this.$emit('insert')
+      }
       const randomStr = Math.random().toString(36).slice(8)
       this.$router.replace(`${this.$route.path}/insert/${randomStr}`)
     },
@@ -20,6 +23,9 @@ export default {
       if (this.selectedRows.length > 1) {
         return this.$message.warning('只允许选择一条数据')
       }
+      if (this.$listeners.update) {
+        return this.$emit('update', this.selectedRows[0])
+      }
       const randomStr = Math.random().toString(36).slice(8)
       this.$router.replace(`${this.$route.path}/update/${randomStr}/${this.ids[0]}`)
     },
@@ -36,9 +42,7 @@ export default {
       }).then(async () => {
         const { code, msg } = await del({
           target: this.target,
-          params: {
-            ids: this.ids.join(',')
-          }
+          ids: this.ids
         })
         if (code !== 0) {
           return this.$message.error(msg)
@@ -64,12 +68,24 @@ export default {
         this.syncData.tableSelectionClear = false
       }
       if (clearCondition) {
-        this.query.conditionAlwaysList = []
+        // 清空右上角搜索框的条件
+        this.$refs.tListSearchRef.reset()
+        this.searchSuggestCondition = []
+
+        // 清空分组条件
         this.query.conditionGroup = null
-        this.query.conditionMultiList = []
+
+        // 清空表头条件
+        // 清空过滤器显示状态，和快捷过滤条件缓存，通过事件方式将操作改为异步提升速度(好像也没有提升多少)
         this.query.conditionQuickList = []
+        this.$refs.TtableRef.$emit('headConditionClear')
+
         this.query.pageNum = 1
         this.query.pageSize = 200
+
+        // 通知方案切换到默认方案 ,然后触发查询
+        this.$refs.TplanRef.resetToDefaultPlan()
+        return
       }
       this.getTableData(false, true)
     }

package/package/t-data-list/src/t-list-search.vue

@@ -13,6 +13,11 @@ export default {
     return {
       value: ''
     }
+  },
+  methods: {
+    reset () {
+      this.value = ''
+    }
   }
 
 }
@@ -26,7 +31,6 @@ export default {
       border:none ;
       border-radius: 0;
       border-bottom: 1px solid #a7a1a1;
-
     }
   }
 </style>

package/package/t-data-list/src/t-plan/index.vue

@@ -30,8 +30,8 @@
       :visible.sync="showExpanse"
       :plan-names="planNameList"
       :content="currentPlan"
-      @listChange="handleListChange"
-      @change="handleChange"
+      @listChange="getFilterPlan"
+      @change="$emit('change',$event)"
     />
   </div>
 </template>
@@ -93,7 +93,7 @@ export default {
   methods: {
     /**
      * 获取方案列表
-     * 并切换到指定方案（选中状态）
+     * 并切换到指定方案（为选中状态）
      */
     async getFilterPlan (selectId) {
       const res = await getFilterPlan(this.target)
@@ -102,7 +102,6 @@ export default {
       }
       this.planList = res.data
       this.currentPlanId = selectId || this.planList.find(item => item.isDefault).id
-      !selectId && this.$refs.planContentRef.$emit('doSearch')
     },
 
     /**
@@ -112,6 +111,18 @@ export default {
       this.getFilterPlan(planId)
     },
 
+    /**
+     * 将方案重置到默认方案
+     */
+    resetToDefaultPlan () {
+      const defaultPlanContent = this.planList.find(item => item.isDefault)
+      const defaultPlanId = defaultPlanContent?.id
+      if (this.currentPlanId === defaultPlanId) {
+        return this.$refs.planContentRef.loadPlanContent(defaultPlanContent, true)
+      }
+      this.currentPlanId = defaultPlanId
+    },
+
     /**
      * 方案被点击切换方法并查询数据
      */
@@ -120,15 +131,9 @@ export default {
         return
       }
       this.currentPlanId = planId
-      this.$refs.planContentRef.$emit('doSearch')
+      // this.$refs.planContentRef.$emit('doSearch')
     },
 
-    /**
-     *
-     */
-    handleChange (condition) {
-      this.$emit('change', condition)
-    },
     /**
      * 方案列表的拖动
      */

package/package/t-data-list/src/t-plan/plan-content.vue

@@ -86,7 +86,6 @@ export default {
   },
   data () {
     return {
-      doSearch: false,
       errorMsg: '',
       planContent: {
         name: '',
@@ -98,29 +97,23 @@ export default {
   inject: ['target'],
   watch: {
     content (newValue) {
-      const contentCopy = JSON.parse(JSON.stringify(newValue))
-      // 后端大佬骗人，高级过滤条件没有值不一定都是空数组,还有可能是null
+      this.loadPlanContent(newValue)
+    }
+  },
+  methods: {
+    // 加载一个方案数据，处理方案的数据，并发射条件变更事件
+    loadPlanContent (content, immediate = false) {
+      const contentCopy = JSON.parse(JSON.stringify(content))
       contentCopy.contentsList = contentCopy.contentsList || []
-      // 后端大佬没有给常用默认值的时候，前端自行添加默认值
       for (const alwaysItem of contentCopy.schemeUsefulList) {
         if (!alwaysItem.values.length) {
           alwaysItem.values.push('-1')
         }
       }
-
       this.planContent = contentCopy
-      if (this.doSearch) {
-        this.conditionChange()
-        this.doSearch = false
-      }
-    }
-  },
-  created () {
-    this.$on('doSearch', () => {
-      this.doSearch = true
-    })
-  },
-  methods: {
+      this.conditionChange()
+    },
+    // 点击方案内容外侧收起方案详情弹窗
     handleClickOut () {
       if (!this.visible) return
       this.$emit('update:visible', false)

package/package/t-data-list/src/t-table/index.vue

@@ -8,10 +8,11 @@
     <!-- 表格记录 -->
     <div class="t-table-right">
       <TableRecords
+        ref="tableRecordsRef"
         :layout="layout"
         :is-selector="isSelector"
         :sum="sum"
-        :disable-sum="disableSum"
+        :enable-sum="enableSum"
         :data="data"
         :update-in-dialog="updateInDialog"
         :page-size="pageSize"
@@ -78,7 +79,7 @@ export default {
       type: Boolean,
       default: false
     },
-    disableSum: {
+    enableSum: {
       type: Boolean,
       default: false
     }
@@ -88,6 +89,14 @@ export default {
 
     }
   },
+  created () {
+    this.$on('headConditionClear', () => {
+      this.$refs.tableRecordsRef.initTableFilterData()
+    })
+  },
+  beforeDestroy () {
+    this.$off('headConditionClear')
+  },
   provide () {
     return {
       enableGroupEdit: this.enableGroupEdit

package/package/t-data-list/src/t-table/table-group.vue

@@ -4,7 +4,7 @@
     <el-input v-model="search" placeholder="请输入节点名称" />
 
     <!-- 节点展示 -->
-    <el-scrollbar class="scrollbar">
+    <el-scrollbar :class="[queryType === 'LIST' ? 'scrollbar' :'in-selector']">
       <el-tree
         ref="treeRef"
         :data="dataTree"
@@ -75,7 +75,7 @@ export default {
       this.$refs.treeRef.filter(value)
     }
   },
-  inject: ['target'],
+  inject: ['target', 'queryType'],
   created () {
     this.getGroupTree()
   },
@@ -154,16 +154,17 @@ export default {
 
 <style scoped lang='less'>
   .table-group {
-    height:100%;
+    height:70vh;
     .scrollbar{
-      height:calc(100% - 40px);
+      height:70vh;
+    }
+    .in-selector {
+      height:53vh;
     }
     ::v-deep .el-scrollbar__wrap {
       overflow-x:hidden;
     }
     background-color: #fff;
-    // margin-right:10px;
-    // border-radius:5px;
     box-sizing: border-box;
     border: 1px solid #e8eaec;
     border-right: 0px;

package/package/t-data-list/src/t-table/table-records-header-popover.vue

@@ -2,7 +2,6 @@
   <!-- 排序的提示插件 -->
   <div>
     <el-popover
-
       :value="item.isShowFilter"
       width="200"
       trigger="manual"
@@ -21,7 +20,6 @@
             <div class="list-icon">
               <i v-show="radioItem.value === tableFilterData[item.field].operator" class="el-icon-check" />
             </div>
-
           </div>
         </div>
         <div class="context-list header-input">
@@ -55,7 +53,6 @@
             <div class="list-icon">
               <i v-show="tableFilterData[item.field].value.includes(option.enumId)" class="el-icon-check" />
             </div>
-
           </div>
         </div>
         <div class="context-list">
@@ -71,7 +68,6 @@
         style=""
         @mouseup.stop="handleFilterClick"
       />
-
     </el-popover>
   </div>
 </template>

package/package/t-data-list/src/t-table/table-records.vue

@@ -1,5 +1,7 @@
 <template>
   <div ref="tableRecords" class="table-records">
+    <!-- {{ tableFilterData }} -->
+    <!-- {{ layout }} -->
     <div class="table-wrapper">
       <ux-grid
         ref="dataRecordsRef"
@@ -8,7 +10,7 @@
         size="mini"
         column-key
         beautify-table
-        :show-summary="showSummary && !disableSum"
+        :show-summary="showSummaryComp"
         :summary-method="summaryMethod"
         :width-resize="true"
         :highlight-current-row="false"
@@ -107,7 +109,7 @@ export default {
       type: Boolean,
       default: false
     },
-    disableSum: {
+    enableSum: {
       type: Boolean,
       default: false
     }
@@ -124,21 +126,21 @@ export default {
     }
   },
   computed: {
-
+    showSummaryComp () {
+      return this.queryType === 'LIST'
+    }
   },
   watch: {
     layout: {
       handler (newVal) {
-        // 初始化绑定tableFilterData
-        // 如果tableFilterData有内容则抛出
         if (Object.keys(this.tableFilterData).length !== 0) {
           return
         }
-        // 初始化tableFilterData的数据
-        newVal.length > 0 && newVal.forEach(e => {
-          if (e.isId) this.idField = e.field
-          this.$set(this.tableFilterData, e.field, { field: e.field, operator: '', value: '', fieldType: e.componentType })
-        })
+        this.initTableFilterData()
+        // newVal.length > 0 && newVal.forEach(e => {
+        //   if (e.isId) this.idField = e.field
+        //   this.$set(this.tableFilterData, e.field, { field: e.field, operator: '', value: '', fieldType: e.componentType })
+        // })
       },
       immediate: true
     },
@@ -175,10 +177,18 @@ export default {
     }
   },
   methods: {
-    handleClearSelected () {
-      this.$refs.dataRecordsRef.clearSelection()
-      this.clearSelectedRows()
+    /**
+     * 表头过滤
+     */
+    // 初始化或清空表头过滤的缓存容器
+    initTableFilterData () {
+      this.layout.length && this.layout.forEach(e => {
+        if (e.isId) this.idField = e.field
+        this.$set(this.tableFilterData, e.field, { field: e.field, operator: '', value: '', fieldType: e.componentType })
+        this.$set(e, 'isShowIcon', false)
+      })
     },
+    // 表头过滤触发了过滤事件
     filterClick (value, index) {
       if (!this.isSingleFilter) {
         return
@@ -189,6 +199,10 @@ export default {
       }
       this.filterSelectedId = index
     },
+    handleClearSelected () {
+      this.$refs.dataRecordsRef.clearSelection()
+      this.clearSelectedRows()
+    },
     // 清空已选
     clearSelectedRows () {
       this.selectedRows.splice(0, this.selectedRows.length)
@@ -276,7 +290,10 @@ export default {
       ::v-deep .plTableBox{
         .elx-table--body-wrapper{
           height: calc(90vh - 230px );//修改以适应合计行的添加，
-          // margin-bottom: 10px;
+          overflow-x:hidden;
+        }
+        .elx-table:not(.is--empty).show--foot.scroll--x .elx-table--body-wrapper{
+          overflow-x: hidden !important;
         }
         .elx-table--footer-wrapper{
           margin-top: 0px!important;
@@ -317,8 +334,4 @@ export default {
       }
     }
   }
-::v-deep .elx-table:not(.is--empty).show--foot.scroll--x .elx-table--body-wrapper{
-  overflow-x: hidden !important;
-}
-
 </style>

package/package/t-input/children/basic.vue

@@ -28,6 +28,7 @@
       :modal-append-to-body="modalAppendToBody"
       @open="getTableData"
     >
+      <!-- {{ limitation }} -->
       <div class="dataDialog">
         <Ttable
           class="t-table"
@@ -222,6 +223,7 @@ export default {
     position: relative;
     .plTableBox .elx-table--body-wrapper{
       height: calc(59vh - 80px);
+      overflow-x:scroll;
     }
     .el-pagination{
       right: 0;

package/package/t-input/children/group-components/group-dialog.vue

@@ -142,13 +142,7 @@ export default {
   },
   computed: {
     groupList () {
-      let list = []
-      if (this.data && this.data[0]) {
-        list = this.data[0]
-      }
-      // todo: 下面的方式eslint报错,而且下面的是啥逻辑啊,需要追踪数据后确定
-      // return this.data[0] && this.data || []
-      return list
+      return (this.data && this.data[0]) || []
     },
     selectMap () {
       return this.createSelectMap(this.data)

package/package/t-input/children/group.vue

@@ -32,7 +32,7 @@
 
 <script>
 import { getGroupTree } from '@/api/tableV3.js'
-import GroupDialog from '../children/group-components/group-dialog.vue'
+import GroupDialog from './group-components/group-dialog'
 // 使用该组件必穿一个target
 
 export default {

package/package/tf-layout/src/components/tf-menu.vue

@@ -34,7 +34,7 @@
               :index="secondMenuItem.path"
             >
               <svg-icon
-                :icon-class="firstMenuItem.icon"
+                :icon-class="secondMenuItem.icon"
                 style="height: 15px; width: 15px; margin-right: 10px"
               />
               <span>{{ secondMenuItem.title }}</span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tongfun/tf-widget",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "tf-widget",
   "main": "lib/tf-widget.umd.js",
   "private": false,

package/src/mixins/t-data-query-mixin.js

@@ -6,7 +6,7 @@ export default {
       /**
        * 通用过滤查询参数
        */
-      // 搜索建议和右上角全局搜索的快速搜索条件(因为接口进行了复用)
+      // 被指定为搜索建议的查询的字段列表
       suggestFieldList: [],
       // 搜索建议的高级条件
       searchSuggestCondition: [],
@@ -96,7 +96,6 @@ export default {
       multiResult.forEach((item, index) => {
         item.sort = index
       })
-
       return multiResult
     },
     // 限定查询范围的条件
@@ -106,14 +105,14 @@ export default {
       }
       const result = []
       for (const key in this.limitation) {
-        const fieldItem = this.tableLayout.find(v => v.filed === key)
+        const fieldItem = this.tableLayout.find(v => v.field === key)
         if (!fieldItem) continue
 
         let value = ''
         if (fieldItem.componentValueType === 'PARAM_BASIC') {
-          value = this.limitation[key].name
+          value = this.limitation[key]?.name
         } else if (fieldItem.componentValueType === 'PARAM_ENUM') {
-          value = this.limitation[key].id
+          value = this.limitation[key]?.id
         } else {
           value = this.limitation[key]
         }
@@ -175,7 +174,7 @@ export default {
           pageSize: 20
         }
 
-      !this.disableSum && getSum && await this.getTableSum()
+      this.enableSum && getSum && await this.getTableSum()
       try {
         // 查询数据之前赋值高级过滤条件
         queryParams.conditionMultiList = this.multiCondition
@@ -188,12 +187,13 @@ export default {
         if (isSuggest) {
           return res.data.record
         }
-        this.syncData.tableLoading = false
         this.tableData.total = Number(res.data.total)
         this.tableData.records = res.data.record
       } catch (err) {
         // 恢复成默认值
         this.syncData.tableSelectionClear = true
+      } finally {
+        this.syncData.tableLoading = false
       }
     },
     // 表格数据合计
@@ -268,6 +268,7 @@ export default {
     // 每页条数变化
     handleSizeChange (newSize) {
       this.query.pageSize = newSize
+      this.query.pageNum = 1
       this.getTableData(false, false)
     },
     // 翻页

package/lib/css/1.920744ef.css

@@ -1 +0,0 @@
-.el-popover .context-list .list-item[data-v-fcd31cd8]{display:flex;margin:1px 0;padding:2px 8px;justify-content:space-between}.el-popover .context-list .list-item[data-v-fcd31cd8]:hover{background-color:#e7ebfd}.el-popover .context-list .list-item-active[data-v-fcd31cd8]{color:#3b68fc;background-color:#e7ebfd}.el-popover .context-list[data-v-fcd31cd8] .el-input .el-input__inner{height:30px}.el-popover .context-list[data-v-fcd31cd8]:last-child{margin-top:4px;width:100%;display:flex;justify-content:space-between}.el-popover .header-input[data-v-fcd31cd8]{margin-top:5px}.el-popover .filter-icon[data-v-fcd31cd8]{outline:none;width:15px;height:15px;cursor:pointer}