doway-coms 1.6.73 → 1.6.75

package/package.json

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

package/packages/AuditsList/index.js

@@ -0,0 +1,8 @@
+// 导入组件，组件必须声明 name
+import AuditsList from './src/index.vue';
+// 为组件提供 install 安装方法，供按需引入
+AuditsList.install = function(Vue) {
+    Vue.component(AuditsList.name, AuditsList);
+};
+// 默认导出组件
+export default AuditsList;

package/packages/AuditsList/src/index.vue

@@ -0,0 +1,198 @@
+<template>
+  <div>
+    <div class="icon" @click="showModal = !showModal">
+      <a-icon type="edit" style="font-size: 30px; color: #fff" />
+    </div>
+    <vxe-modal
+      v-model="showModal"
+      :height="600"
+      :width="300"
+      :zIndex="1000"
+      :showHeader="false"
+      :mask="false"
+      :mask-closable="true"
+      :position="{
+        left: '78%',
+        top: '15%'
+      }"
+      destroy-on-close
+    >
+      <div class="history" v-if="historyList.length>0">
+        <div class="title">修改记录</div>
+        <div
+          class="box"
+          v-for="(item,index) in historyList"
+          :key="index"
+          @click="historyData(item)"
+        >
+          <div class="item">
+            <div
+              class="status"
+              :style="{color:textColor(item.logOperation)}"
+            >{{item.logOperation|filterData}}</div>
+            <div class="time">{{item.createTime}}</div>
+            <div class="name">{{item.createUserName}}</div>
+          </div>
+          <div class="divider">
+            <div></div>
+          </div>
+        </div>
+      </div>
+      <div v-else class="history">暂无数据</div>
+    </vxe-modal>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "auditsList",
+  props: {
+    formId: {
+      type: String
+    },
+    historyList:{
+    }
+  },
+  components: {},
+  watch: {
+    
+  },
+  filters: {
+    filterData(val) {
+      switch (val) {
+        case "update":
+          return "修改";
+        case "add":
+          return "新增";
+        default:
+          return val;
+      }
+    }
+  },
+  mounted() {},
+  data() {
+    return {
+      showModal: false,
+    };
+  },
+  methods: {
+    historyData(val) {
+      this.$emit("historyData", val);
+    },
+    textColor(val) {
+      switch (val) {
+        case "add":
+          return "green";
+        case "update":
+          return "orange";
+      }
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.icon {
+  position: fixed;
+  top: 46%;
+  right: 5px;
+  z-index: 100;
+  cursor: pointer;
+  width: 40px;
+  height: 40px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 5px;
+  background: #089def;
+}
+::v-deep .vxe-modal--wrapper .vxe-modal--content {
+  padding: 0;
+}
+.history {
+  width: 100%;
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: auto;
+  .title{
+    text-align: center;
+    padding: 10px;
+    font-size: 15px;
+    font-weight: bold;
+  }
+  .box {
+    .item {
+      height: 40px;
+      max-height: 40px;
+      display: flex;
+      cursor: pointer;
+      .time {
+        flex: 2.5;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .status {
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .name {
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+    .item:hover {
+      background: #e3e5e7;
+      transition: all 0.5s;
+    }
+    .divider{
+      height: 5px;
+      max-height: 5px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      div{
+        width: 180px;
+        height: 1px;
+        background: #eee;
+      }
+    }
+  }
+}
+/*滚动条整体部分*/
+.history::-webkit-scrollbar {
+  width: 5px;
+  height: 5px;
+  z-index: 10;
+}
+/*滚动条的轨道*/
+.history::-webkit-scrollbar-track {
+  background-color: #ffffff;
+  z-index: 10;
+}
+/*滚动条里面的小方块，能向上向下移动*/
+.history::-webkit-scrollbar-thumb {
+  background-color: #bfbfbf;
+  border-radius: 5px;
+  border: 1px solid #f1f1f1;
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  z-index: 10;
+}
+.history::-webkit-scrollbar-thumb:hover {
+  background-color: #a8a8a8;
+  z-index: 10;
+}
+.history::-webkit-scrollbar-thumb:active {
+  background-color: #787878;
+  z-index: 10;
+}
+/*边角，即两个滚动条的交汇处*/
+.history::-webkit-scrollbar-corner {
+  background-color: #ffffff;
+  z-index: 10;
+}
+</style>

package/packages/BaseGrid/src/SeqSetting.vue

@@ -107,26 +107,7 @@ export default {
     }
   },
   created() {
-    this.adjustUserDefineColumns = this.userDefineColumns;
-    // 设置唯一标识，用于保存时找到字段并重新排序
-    this.adjustUserDefineColumns.forEach((x, index)=> x.currentKey = index + x.field)
-    this.columns = [];
-    this.adjustUserDefineColumns.forEach((item) => {
-      // 去除操作列和序号、多选框列
-      if (item.field === "operation" || item.field == undefined) {
-          return;
-      }
-      const column = {
-        currentKey: item.currentKey,
-        field: item.field,
-        title: item.title,
-        visible: item.visible,
-        width: item.width,
-        filters: item.filters,
-        order: item.order,
-      }
-      this.columns.push(column);
-    })
+    this.setColumnsOptions()
   },
   mounted() {
     // 初始排序数组
@@ -134,6 +115,28 @@ export default {
     this.setOptions()
   },
   methods: {
+    setColumnsOptions() {
+      this.adjustUserDefineColumns = this.userDefineColumns;
+      // 设置唯一标识，用于保存时找到字段并重新排序
+      this.adjustUserDefineColumns.forEach((x, index)=> x.currentKey = index + x.field)
+      this.columns = [];
+      this.adjustUserDefineColumns.forEach((item) => {
+        // 去除操作列和序号、多选框列
+        if (item.field === "operation" || item.field == undefined) {
+            return;
+        }
+        const column = {
+          currentKey: item.currentKey,
+          field: item.field,
+          title: item.title,
+          visible: item.visible,
+          width: item.width,
+          filters: item.filters,
+          order: item.order,
+        }
+        this.columns.push(column);
+      })
+    },
     // 配置方法
     setOptions() {
         var vm = this
@@ -204,6 +207,14 @@ export default {
       })
       saveUserModuleDataFieldApi(postData)
         .then(res => {
+          // 更改columns序号
+          // vm.columns.forEach(column => {
+          //   let tempObject = postData.fields.find(x => x.field == column.field)
+          //   if (tempObject) {
+          //     column.sort = tempObject.sort
+          //   }
+          // })
+          // console.log('1',vm.columns);
           // 返回表格组件触发更新
           vm.$emit('saveSeqConfig',postData, res.content)
         })

package/packages/BaseGrid/src/index.vue

@@ -101,6 +101,7 @@
                 :height="height"
                 :userDefineColumns="userDefineColumns"
                 ref="baseAdjustGridView"
+                @saveSeqConfig="saveSeqConfig"
               />
             </template>
             <div @click="clickHeader" v-if="moduleCode && dataCode" >
@@ -741,7 +742,7 @@ export default {
   props: {
     isSeqPopover: {
       type: Boolean,
-      default: true,
+      default: false,
     },
     showOverFlow: {
       type: Boolean,
@@ -1867,9 +1868,9 @@ export default {
       let tableCollectColumn = this.$refs.baseGrid.getTableColumn().collectColumn;
       // 表格排序信息更新
       XEUtils.arrayEach(tableCollectColumn, (loopCol) => {
-        const find = XEUtils.find(emitColumns, item => loopCol.field === item.field)
+        const find = XEUtils.find(emitColumns.fields, item => loopCol.field === item.field)
         if (find) {
-          loopCol.sort = find.sort
+          loopCol.params.sort = find.sort
         }
       })
       //设置表格顺序
@@ -1878,9 +1879,11 @@ export default {
         (p) => p.params.sort
       );
       // 更新表格
-      vm.$refs.baseGrid.reloadColumn(tableCollectColumn);
+      this.$refs.baseGrid.reloadColumn(tableCollectColumn)
+      this.userDefineColumns = this.tableCollectColumn
+      // this.$refs.baseAdjustGridView.setColumnsOptions()
       //清空store缓存
-      vm.$store.commit(
+      this.$store.commit(
         "SET_MODULE_VIEW_INFO",{
           moduleCode:this.moduleCode,
           info: resData