three-trees-ui 1.0.95 → 1.0.96

package/src/mixins/onlineSubtable.js

@@ -10,15 +10,13 @@ export default {
       transitionIndex: -1,
       left_image: '',
       right_image: '',
-      collapseType: 'expand',
-      subDataArr: [],
     }
   },
   computed: {
     // 子表前端分页过滤器
     pagingSubData() {
       const me = this
-      return function(datapath) {
+      return function (datapath) {
         // 通过子表数据路径获取分页数据
         return SubPagination.pagingByPath(datapath, me)
       }
@@ -56,25 +54,6 @@ export default {
     }
   },
   methods: {
-    getSunExpandArr(data, type) {
-      return this.getExpandArr(data, type)
-    },
-    getSubEditModeData(data = {}, type) {
-      if (type === 'edit') return
-      this.$root.$emit(
-        'add-new-collapse-item',
-        data.sub_guid,
-        this.collapseType
-      )
-      this.subDataArr.push(data)
-    },
-    editSubRow(row, name) {
-      this.$refs[`HtSubEditModeDialog_${name}`].showDialog({
-        data: row,
-        mainData: this.data,
-        type: 'edit',
-      })
-    },
     //合计计算
     getSummaries(param, list) {
       let CancelTheCalculation = sessionStorage.getItem(
@@ -278,7 +257,7 @@ export default {
       let exp = calc.mathExp
       if (!exp) return null
       var reg = /([\[|\{]).*?\((.*?)\)[\}|\]]/g
-      exp = exp.replace(reg, function() {
+      exp = exp.replace(reg, function () {
         var symbol = arguments[1],
           name = arguments[2]
         const prop = name.split('.')[1]
@@ -375,7 +354,6 @@ export default {
       return num
     },
     getExpandArr(data, type) {
-      this.collapseType = type
       if (type === 'expand' && data) {
         let arr = []
         data.forEach((item) => {
@@ -390,7 +368,7 @@ export default {
       if (this.isPrint) {
         this.$router.go(-1)
       }
-      setTimeout(function() {
+      setTimeout(function () {
         location.reload()
       }, 200)
     },
@@ -476,7 +454,7 @@ export default {
       this.$forceUpdate()
     },
     //子表默认值回填
-    addSubTab(subTabPath, subEditMode, name) {
+    addSubTab(subTabPath) {
       let pathArr = subTabPath.split('.')
       if (pathArr.length < 3) {
         this.$message({
@@ -496,9 +474,9 @@ export default {
         //把数组里面的值为 null 转换为空字符串
         let str = JSON.stringify(subInitData).replace(/null/g, '""')
         let subData = JSON.parse(str)
-        this.subDataArr = this.data[pathArr[1]][pathArr[2]]
+        const subDataArr = this.data[pathArr[1]][pathArr[2]]
         //子表添加后的长度，因为在nextTick中，子表已经添加完毕。
-        const nextIndex = this.subDataArr.length
+        const nextIndex = subDataArr.length
         for (var key in subData) {
           //点添加时判断要新增子表记录中的孙表是否有值
           if (key.indexOf('sub_') == 0) {
@@ -519,16 +497,8 @@ export default {
         }
         let fillObj = this.toFillOrg(pathArr[1] + '.' + pathArr[2], subData)
         fillObj.sub_guid = this.guid()
-        if (subEditMode == 2) {
-          this.$refs[`HtSubEditModeDialog_${name}`].showDialog({
-            data: fillObj,
-            mainData: this.data,
-            type: 'add',
-          })
-          return
-        }
         this.$root.$emit('add-new-collapse-item', fillObj.sub_guid)
-        this.subDataArr.push(fillObj)
+        subDataArr.push(fillObj)
       }
     },
     //子表添加头部样式
@@ -544,13 +514,14 @@ export default {
       return { '--headerBgColor': color ? color : '#f4f4f4' }
     },
     guid() {
-      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(
-        c
-      ) {
-        var r = (Math.random() * 16) | 0,
-          v = c == 'x' ? r : (r & 0x3) | 0x8
-        return v.toString(16)
-      })
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(
+        /[xy]/g,
+        function (c) {
+          var r = (Math.random() * 16) | 0,
+            v = c == 'x' ? r : (r & 0x3) | 0x8
+          return v.toString(16)
+        }
+      )
     },
     //孙表默认值回填
     addSunTab(subTabPath, index) {
@@ -827,17 +798,15 @@ export default {
             if (conf.code) {
               const codePath = conf.code.split('.')
               if (!this.data[paths[0]][paths[1]][0][codePath[2]]) {
-                this.data[paths[0]][paths[1]][0][
-                  codePath[2]
-                ] = this.fillOrg.code
+                this.data[paths[0]][paths[1]][0][codePath[2]] =
+                  this.fillOrg.code
               }
             }
             if (conf.name) {
               const namePath = conf.name.split('.')
               if (!this.data[paths[0]][paths[1]][0][namePath[2]]) {
-                this.data[paths[0]][paths[1]][0][
-                  namePath[2]
-                ] = this.fillOrg.name
+                this.data[paths[0]][paths[1]][0][namePath[2]] =
+                  this.fillOrg.name
               }
             }
           }

package/src/styles/selector.scss

@@ -11,10 +11,10 @@
         .ht-selector__table {
           height: 380px;
         }
-        .el-pagination {
+        .el-pagination{
           white-space: pre-wrap !important;
         }
-      }
+      }    
     }
 
     @media (min-width: 1400px) {
@@ -128,43 +128,3 @@
     }
   }
 }
-
-.custom-selector-mobile {
-  .custom-selector-mobile-box {
-    display: flex;
-    min-height: 32px;
-    align-items: center;
-    padding: 4px 14px;
-    flex-wrap: wrap;
-    gap: 4px;
-    line-height: 22px;
-    padding-right: 40px;
-    box-sizing: border-box;
-    .el-icon-error {
-      color: #909399;
-    }
-  }
-  .el-input__inner {
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    user-select: none;
-    background: none;
-    color: transparent !important;
-    pointer-events: none;
-    height: 100%;
-  }
-  .el-input__suffix-inner {
-    display: flex;
-    align-items: center;
-  }
-  .el-icon-circle-close {
-    margin-right: 3px;
-  }
-  .user-icon,
-  .el-icon-circle-close {
-    display: inline-block !important;
-  }
-}

package/src/styles/variables.scss

@@ -90,17 +90,16 @@ col[width='1'] {
         cursor: pointer;
         color: #dbdbdb;
       }
-      .el-icon-search,
       .user-icon,
       .org-icon {
         display: none;
       }
     }
-    // .el-input {
-    //   .el-input__inner {
-    //     color: #fff;
-    //   }
-    // }
+    .el-input {
+      .el-input__inner {
+        color: #fff;
+      }
+    }
   }
   .el-select__tags_readonly {
     .tag-wrap {

package/src/utils.js

@@ -1163,13 +1163,6 @@ var utils = {
       return url
     }
   },
-  guid: () => {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      var r = (Math.random() * 16) | 0,
-        v = c == 'x' ? r : (r & 0x3) | 0x8
-      return v.toString(16)
-    })
-  },
 }
 
 // 在数组上扩展一个删除指定项的方法

package/packages/SubEditModeDialog/index.js

@@ -1,7 +0,0 @@
-import subEditModeDialog from './src/main.vue'
-
-subEditModeDialog.install = function(Vue) {
-  Vue.component(subEditModeDialog.name, subEditModeDialog)
-}
-
-export default subEditModeDialog

package/packages/SubEditModeDialog/src/main.vue

@@ -1,115 +0,0 @@
-<template>
-  <van-popup
-    v-if="dialogVisible"
-    v-model="dialogVisible"
-    position="right"
-    get-container="body"
-    class="ht-sub-edit-mode-dialog"
-  >
-    <van-nav-bar
-      title="子表编辑"
-      left-arrow
-      @click-left="dialogVisible = false"
-    />
-    <el-form
-      v-if="dialogVisible"
-      v-form="{
-        formItemAlign: 'top',
-        inputsDisplay: 'block',
-        roInputDisplayMode: 'text',
-      }"
-      class="sub-edit-main"
-      :data-vv-scope="searchFormScope"
-      label-position="top"
-    >
-      <slot :row="{ row, index: 0 }"></slot>
-    </el-form>
-    <div class="sub-edit-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="handleConfirm">确 定</el-button>
-    </div>
-  </van-popup>
-</template>
-<script>
-  import { cloneDeep } from 'lodash'
-  import utils from '@/utils.js'
-
-  export default {
-    name: 'HtSubEditModeDialog',
-    props: {},
-    data() {
-      return {
-        dialogVisible: false,
-        dialogType: 'add',
-        row: {},
-        orgRow: {}, // 存储原始数据，用来修改子表的数据
-        data: {}, // 主表数据，用来处理参数绑定、值回显等问题
-        permission: {},
-      }
-    },
-    computed: {
-      searchFormScope() {
-        return `Form${utils.guid()}`
-      },
-    },
-    methods: {
-      showDialog({ type, data, mainData }) {
-        this.dialogVisible = true
-        this.permission = utils.getOnlineFormInstance(this).permission || {}
-        this.dialogType = type
-        this.orgRow = data
-        this.data = mainData
-        this.row = cloneDeep(data)
-      },
-      handleConfirm() {
-        utils
-          .validateForm(this, this.searchFormScope)
-          .then(() => {
-            this.dialogVisible = false
-            // 点击确认更新子表数据
-            const keys = Object.keys(this.orgRow || {})
-            keys.forEach((key) => {
-              if (this.orgRow[key] !== this.row[key]) {
-                this.orgRow[key] = this.row[key]
-              }
-            })
-            this.$emit('getSubEditModeData', this.row, this.dialogType)
-          })
-          .catch(() => {})
-      },
-    },
-  }
-</script>
-<style lang="scss" scoped>
-  ::v-deep {
-    .el-row {
-      display: flex;
-      flex-wrap: wrap;
-    }
-  }
-</style>
-<style lang="scss">
-  .ht-sub-edit-mode-dialog {
-    width: 100%;
-    height: 100vh;
-    display: flex;
-    flex-direction: column;
-
-    .sub-edit-main {
-      flex: 1;
-      padding: 16px;
-      overflow-y: auto;
-      &.el-form--label-top .el-form-item__label {
-        padding-bottom: 0;
-      }
-    }
-    .sub-edit-footer {
-      height: 46px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      padding: 0 24px;
-      border-top: 1px solid #ebebeb;
-    }
-  }
-</style>