three-trees-ui 1.0.93 → 1.0.95

package/src/index.js

@@ -42,6 +42,7 @@ import HtEditor from '../packages/Editor/index'
 import HtPicture from '../packages/picture/index'
 import HtExplain from '../packages/Explain/index'
 import HtAvatarImage from '../packages/Avatar/index'
+import HtSubEditModeDialog from '../packages/SubEditModeDialog/index'
 import {
   HtH1,
   HtH2,
@@ -230,6 +231,7 @@ const HotentUi = {
   HtPostDialog,
   HtJobDialog,
   HtRoleDialog,
+  HtSubEditModeDialog,
 }
 
 HotentUi.install = (Vue, opts = {}) => {

package/src/mixins/onlineSubtable.js

@@ -10,13 +10,15 @@ 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)
       }
@@ -54,6 +56,25 @@ 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(
@@ -257,7 +278,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]
@@ -354,6 +375,7 @@ export default {
       return num
     },
     getExpandArr(data, type) {
+      this.collapseType = type
       if (type === 'expand' && data) {
         let arr = []
         data.forEach((item) => {
@@ -368,7 +390,7 @@ export default {
       if (this.isPrint) {
         this.$router.go(-1)
       }
-      setTimeout(function () {
+      setTimeout(function() {
         location.reload()
       }, 200)
     },
@@ -454,7 +476,7 @@ export default {
       this.$forceUpdate()
     },
     //子表默认值回填
-    addSubTab(subTabPath) {
+    addSubTab(subTabPath, subEditMode, name) {
       let pathArr = subTabPath.split('.')
       if (pathArr.length < 3) {
         this.$message({
@@ -474,9 +496,9 @@ export default {
         //把数组里面的值为 null 转换为空字符串
         let str = JSON.stringify(subInitData).replace(/null/g, '""')
         let subData = JSON.parse(str)
-        const subDataArr = this.data[pathArr[1]][pathArr[2]]
+        this.subDataArr = this.data[pathArr[1]][pathArr[2]]
         //子表添加后的长度，因为在nextTick中，子表已经添加完毕。
-        const nextIndex = subDataArr.length
+        const nextIndex = this.subDataArr.length
         for (var key in subData) {
           //点添加时判断要新增子表记录中的孙表是否有值
           if (key.indexOf('sub_') == 0) {
@@ -497,8 +519,16 @@ 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)
-        subDataArr.push(fillObj)
+        this.subDataArr.push(fillObj)
       }
     },
     //子表添加头部样式
@@ -514,14 +544,13 @@ 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) {
@@ -798,15 +827,17 @@ 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,3 +128,43 @@
     }
   }
 }
+
+.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,16 +90,17 @@ 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,6 +1163,13 @@ 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)
+    })
+  },
 }
 
 // 在数组上扩展一个删除指定项的方法