doway-coms 1.6.80 → 1.6.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.6.80",
+  "version": "1.6.83",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/AuditsList/src/index.vue

@@ -38,7 +38,12 @@
           </div>
         </div>
       </div>
-      <div v-else class="history">暂无数据</div>
+      <div v-else class="history">
+        <div class="none">
+          <div class="img"></div>
+          <i class="text">暂无历史数据</i>
+        </div>
+      </div>
     </vxe-modal>
   </div>
 </template>
@@ -194,6 +199,24 @@ export default {
       }
     }
   }
+  .none {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    .img {
+      width: 200px;
+      height: 150px;
+      background: url("~@/assets/img/暂无数据.png") no-repeat;
+      background-size: 100%;
+    }
+    text {
+      font-size: 15px;
+      text-align: center;
+    }
+  }
 }
 /*滚动条整体部分*/
 .history::-webkit-scrollbar {

package/packages/BaseGrid/src/index.vue

@@ -346,7 +346,7 @@
           >
             <a-input allowClear v-model="loopFilterValue.value[0]" @keyup.enter.native="filterConfirm(scope.column)" />
           </div>
-          <a-button @click="saveFilterTable(scope.column)">默认筛选</a-button>
+          <a-button @click="saveFilterTable(scope.column)" v-if="moduleCode && dataCode">默认配置</a-button>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
@@ -361,7 +361,7 @@
           >
             <a-input allowClear v-model="loopFilterValue.value[0]" @keyup.enter.native="filterConfirm(scope.column)" />
           </div>
-          <a-button @click="saveFilterTable(scope.column)">默认筛选</a-button>
+          <a-button @click="saveFilterTable(scope.column)" v-if="moduleCode && dataCode">默认配置</a-button>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
@@ -376,6 +376,7 @@
           >
             <a-input allowClear v-model="loopFilterValue.value[0]" @keyup.enter.native="filterConfirm(scope.column)" />
           </div>
+          <a-button @click="saveFilterTable(scope.column)" v-if="moduleCode && dataCode">默认配置</a-button>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
@@ -401,6 +402,7 @@
               @keyup.enter.native="filterConfirm(scope.column)"
             />
           </div>
+          <a-button @click="saveFilterTable(scope.column)" v-if="moduleCode && dataCode">默认配置</a-button>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
@@ -424,7 +426,7 @@
             </div>
           </a-checkbox-group>
           <br>
-          <a-button @click="saveFilterTable(scope.column)">默认筛选</a-button>
+          <a-button @click="saveFilterTable(scope.column)" v-if="moduleCode && dataCode">默认配置</a-button>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
       </template>
@@ -446,7 +448,7 @@
             </div>
           </a-checkbox-group>
         <br>
-        <a-button @click="saveFilterTable(scope.column)">默认筛选</a-button>
+        <a-button @click="saveFilterTable(scope.column)" v-if="moduleCode && dataCode">默认配置</a-button>
         <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
       </template>
@@ -485,7 +487,7 @@
               @keyup.enter.native="filterConfirm(scope.column)"
             />
           </div>
-          <a-button @click="saveFilterTable(scope.column)">默认筛选</a-button>
+          <a-button @click="saveFilterTable(scope.column)" v-if="moduleCode && dataCode">默认配置</a-button>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
@@ -504,7 +506,7 @@
               @keyup.enter.native="filterConfirm(scope.column)"
             />
           </div>
-          <a-button @click="saveFilterTable(scope.column)">默认筛选</a-button>
+          <a-button @click="saveFilterTable(scope.column)" v-if="moduleCode && dataCode">默认配置</a-button>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
@@ -681,7 +683,7 @@ export default {
       filterStr: [],
       // 表格上方显示全部筛选条件
       tagData: [],
-      // 默认筛选条件-存储初始字段参数
+      // 默认配置条件-存储初始字段参数
       defaultPostData: {},
     }
   },
@@ -1005,7 +1007,7 @@ export default {
   mounted() {
     // 头部筛选条件标签数据
     this.tagData = JSON.parse(JSON.stringify(this.$refs.baseGrid.getCheckedFilters()))
-    // 默认筛选数据
+    // 默认配置数据
     this.defaultPostData = {
       moduleCode: this.moduleCode,
       dataCode: this.dataCode,
@@ -2320,7 +2322,9 @@ export default {
     },
     resizableChange(scope) {
       // 配置后渲染表格
-      this.saveTableHeight()
+      if (this.moduleCode && this.dataCode) {
+        this.saveTableHeight()
+      }
       this.$emit("resizableChange", scope);
     },
     setVisiable(fields, visible) {
@@ -2877,7 +2881,7 @@ export default {
       returnField = title + ' ' + '包含' + ' ' + curretnValue
       return returnField
     },
-    // 保存默认筛选条件
+    // 保存默认配置条件
     saveFilterTable(colInfo) {
       colInfo.filters[0].data.bindingValues = [];
       XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {

package/packages/LeaveAMessage/src/index.vue

@@ -5,7 +5,6 @@
     </div>
     <vxe-modal
       v-model="showOdoo"
-      :height="moduleHeight"
       :zIndex="1000"
       :showHeader="false"
       :mask="false"