three-trees-ui 1.1.5 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/CustomDialog/src/customMobileDialog.vue

@@ -92,22 +92,22 @@
                 <ht-input
                   v-model="queryParams[index].startDate"
                   placeholder="开始日期"
-                  @click.native="showDate(index, 'startDate')"
                   readonly
+                  @click.native="showDate(index, 'startDate')"
                 ></ht-input>
                 <span style="margin:0 10px;">至</span>
                 <ht-input
                   v-model="queryParams[index].endDate"
                   placeholder="结束日期"
-                  @click.native="showDate(index, 'endDate')"
                   readonly
+                  @click.native="showDate(index, 'endDate')"
                 ></ht-input>
               </div>
               <ht-input
                 v-else
                 v-model="queryParams[index][condition.field]"
-                @click.native="showDate(index, condition.field)"
                 readonly
+                @click.native="showDate(index, condition.field)"
               ></ht-input>
             </div>
             <!-- 选择器 -->
@@ -172,7 +172,7 @@
               <ht-custom-dialog
                 v-model="queryParams[index][condition.field]"
                 :model-name="condition.config.keyBind"
-                dialogType="search"
+                dialog-type="search"
                 :custdialog="{
                   name: '请选择',
                   icon: '',
@@ -349,8 +349,8 @@
     </van-action-sheet>
     <!-- 修改时间 -->
     <van-popup
-      v-model="isShowDatePop"
       v-if="isShowDatePop"
+      v-model="isShowDatePop"
       position="bottom"
       round
     >
@@ -390,6 +390,10 @@
       currentSubData: Array,
       dialogConfig: Object,
       dialogType: String,
+      subDialogMode: {
+        type: String,
+        default: '',
+      },
     },
     data() {
       return {
@@ -996,12 +1000,15 @@
                 // this.$emit('input', _val)
                 this.$emit('updateInput', _val)
               }
-              utils.setValueByPath(
-                pInst,
-                `${pInst.data ? 'data.' : 'model.'}${path}`,
-                _val,
-                thisIndex
-              )
+              let bindPath = `${pInst.data ? 'data.' : 'model.'}${path}`
+              if (this.subDialogMode == 3) {
+                bindPath = `row.${configAttr[configAttr.length - 1]}`
+              }
+              if (this.subDialogMode == 3) {
+                this.$set(pInst.row, configAttr[configAttr.length - 1], _val)
+              } else {
+                utils.setValueByPath(pInst, bindPath, _val, thisIndex)
+              }
             }
           }
         })
@@ -1277,11 +1284,20 @@
             this.sunIndex || this.sunIndex === 0 ? this.sunIndex : null
           )
         } else {
-          value = utils.getValueByPath(
-            pInst,
-            bind,
-            this.subIndex || this.subIndex === 0 ? this.subIndex : null
-          )
+          // 子表弹窗编辑模式时，获取参数特殊处理
+          if (this.subDialogMode == 3 && bind.split('.').length === 4) {
+            value = utils.getValueByPath(
+              pInst,
+              'row.' + bind.split('.')[3],
+              this.subIndex || this.subIndex === 0 ? this.subIndex : null
+            )
+          } else {
+            value = utils.getValueByPath(
+              pInst,
+              bind,
+              this.subIndex || this.subIndex === 0 ? this.subIndex : null
+            )
+          }
         }
         return value
       },
@@ -1541,12 +1557,15 @@
               if (this.modelName && this.modelName.endsWith(path)) {
                 this.$emit('updateInput', _val)
               }
-              utils.setValueByPath(
-                pInst,
-                `${pInst.data ? 'data.' : 'model.'}${path}`,
-                _val,
-                thisIndex
-              )
+              let bindPath = `${pInst.data ? 'data.' : 'model.'}${path}`
+              if (this.subDialogMode == 3) {
+                bindPath = `row.${configAttr[configAttr.length - 1]}`
+              }
+              if (this.subDialogMode == 3) {
+                this.$set(pInst.row, configAttr[configAttr.length - 1], _val)
+              } else {
+                utils.setValueByPath(pInst, bindPath, _val, thisIndex)
+              }
             }
           }
         })

package/packages/CustomDialog/src/main.vue

@@ -100,6 +100,7 @@
         :current-sub-data="currentSubData"
         :dialog-config="dialogConfig"
         :dialog-type="dialogType"
+        :sub-dialog-mode="subDialogMode"
         @calacInputSuffixHeight="calacInputSuffixHeight"
         @updateInput="updateInput"
       ></custom-mobile-dialog>
@@ -183,6 +184,10 @@
         type: String,
         default: 'form',
       },
+      subDialogMode: {
+        type: String,
+        default: '',
+      },
     },
     data() {
       return {

package/packages/SubEditModeDialog/src/main.vue

@@ -31,20 +31,35 @@
   </van-popup>
 </template>
 <script>
-  import { cloneDeep } from 'lodash'
+  import { cloneDeep, debounce } from 'lodash'
   import utils from '@/utils.js'
+  import CustomQuery from '@/services/CustomQuery.js'
+  import { decode } from '@/util/base64'
 
   export default {
     name: 'HtSubEditModeDialog',
-    props: {},
+    props: {
+      queryJson: {
+        type: Array,
+        default: () => {
+          return []
+        },
+      },
+      scriptValue: {
+        type: String,
+        default: '',
+      },
+    },
     data() {
       return {
+        subQueryJson: [],
         dialogVisible: false,
         dialogType: 'add',
         row: {},
         orgRow: {}, // 存储原始数据，用来修改子表的数据
         data: {}, // 主表数据，用来处理参数绑定、值回显等问题
         permission: {},
+        subTabPath: '', // 子表path
       }
     },
     computed: {
@@ -52,14 +67,129 @@
         return `Form${utils.guid()}`
       },
     },
+
     methods: {
-      showDialog({ type, data, mainData }) {
-        this.dialogVisible = true
+      getBindValue(data, key) {
+        //当系统接到触发请求要带出数据时，发现有多个查询结果，此时将多个结果以逗号分隔的模式全部都带出来
+        let value = []
+        data.forEach((item) => {
+          if (!utils.isEmpty(item[key])) {
+            value.push(item[key])
+          }
+        })
+        return value.join(',')
+      },
+      doQuery(alias, params, resultBind, index) {
+        try {
+          let _this = this
+          let queryParams = {}
+          if (params && params.length > 0) {
+            params.forEach((item) => {
+              queryParams[item.field] = null
+              if (!item.defaultValue && item.fieldPath) {
+                const fieldPathArr = item.fieldPath.split('.')
+                const fieldPath =
+                  fieldPathArr.length === 4
+                    ? 'row.' + fieldPathArr[3]
+                    : item.fieldPath
+                const val = utils.getValueByPath(this, fieldPath, index)
+                queryParams[item.field] = val || item.emptyValue // emptyValue-关联查询绑定参数为空时的绑定值
+              }
+            })
+          }
+          CustomQuery.load(alias, queryParams).then((data) => {
+            if (
+              data &&
+              data.constructor == Array &&
+              resultBind &&
+              resultBind.constructor == Object
+            ) {
+              // 关联查询值回绑时，默认获取返回的第一条记录
+              Object.keys(resultBind).forEach((k) => {
+                const path =
+                  resultBind[k].split('.').length === 4
+                    ? 'row.' + resultBind[k].split('.')[3]
+                    : resultBind[k]
+                const value = _this.getBindValue(data, k)
+
+                utils.setValueByPath(this, path, value)
+              })
+            }
+          })
+        } catch (error) {
+          console.error('获取关联查询出错：' + error)
+        }
+      },
+      initRelationQuery() {
+        if (!this.subQueryJson.length) {
+          return
+        }
+        let _this = this
+        this.subQueryJson.forEach((item) => {
+          if (!item.triggerTime) {
+            return
+          }
+          let triggerAlias = item.triggerField.split('.')[
+            item.triggerField.split('.').length - 1
+          ]
+          let resultBind = {}
+          if (item.resultfield && item.resultfield.length > 0) {
+            item.resultfield.forEach((field) => {
+              resultBind[field.field] = field.fieldPath
+            })
+          }
+          if (item.triggerTime.indexOf('change') != -1 && item.triggerField) {
+            //值变化触发
+            _this.$watch(
+              'row.' + triggerAlias,
+              debounce(function(newVal, oldVal) {
+                if (
+                  (newVal != '' || oldVal != undefined) &&
+                  newVal !== oldVal
+                ) {
+                  _this.doQuery(
+                    item.alias,
+                    item.conditionfield,
+                    resultBind,
+                    null
+                  )
+                }
+              }, 500)
+            )
+          }
+          if (item.triggerTime.indexOf('load') != -1) {
+            //加载时触发 & 不包含子表
+            if (item.noValuabletrigger && item.noValuableField) {
+              //有值不触发
+              const noValueField = item.noValuableField.split('.')[
+                item.noValuableField.split('.').length - 1
+              ]
+              const val = utils.getValueByPath(this, noValueField)
+              if (val != '' && val != undefined && val != null) {
+                return
+              }
+            }
+            setTimeout(() => {
+              _this.doQuery(item.alias, item.conditionfield, resultBind, null)
+            }, 100)
+          }
+        })
+      },
+      showDialog({ type, data, mainData, subTabPath }) {
+        this.subTabPath = subTabPath
+        this.subQueryJson = this.queryJson.filter((item) => {
+          return (
+            item.entType === 'sub' && item.triggerField.includes(subTabPath)
+          )
+        })
         this.permission = utils.getOnlineFormInstance(this).permission || {}
         this.dialogType = type
         this.orgRow = data
         this.data = mainData
         this.row = cloneDeep(data)
+        this.initRelationQuery()
+        this.dialogVisible = true
+        this.handleJs()
       },
       handleConfirm() {
         utils
@@ -77,6 +207,17 @@
           })
           .catch(() => {})
       },
+      // 执行js脚本
+      handleJs() {
+        if (!this.scriptValue) {
+          return
+        }
+        const diyJs = decode(this.scriptValue)
+        let row = this.row
+        let data = this.data
+        let _this = this
+        eval(diyJs)
+      },
     },
   }
 </script>

package/packages/UserSelector/src/main.vue

@@ -175,6 +175,10 @@
       mode: {
         type: String,
       },
+      subDialogMode: {
+        type: String,
+        default: '',
+      },
     },
     data() {
       return {

package/packages/UserSelectorInput/src/main.vue

@@ -25,6 +25,7 @@
       select-label="fullname"
       :quick-search-props="quickSearchProps"
       :mode="mode"
+      :sub-dialog-mode="subDialogMode"
       @filter-type-change="handleFilterTypeChange"
       @valueChange="valueChange"
       @change="handleChange"
@@ -76,6 +77,10 @@
         type: Number,
         default: 20,
       },
+      subDialogMode: {
+        type: String,
+        default: '',
+      },
     },
     data() {
       return {

package/src/mixins/onlineSubtable.js

@@ -81,11 +81,12 @@ export default {
       )
       this.subDataArr.push(data)
     },
-    editSubRow(row, name) {
+    editSubRow(row, name, subTabPath) {
       this.$refs[`HtSubEditModeDialog_${name}`].showDialog({
         data: row,
         mainData: this.data,
         type: 'edit',
+        subTabPath,
       })
     },
     //合计计算
@@ -537,6 +538,7 @@ export default {
             data: fillObj,
             mainData: this.data,
             type: 'add',
+            subTabPath,
           })
           return
         }
@@ -616,6 +618,7 @@ export default {
           this.data[boAlias]['sub_' + subTableName] &&
           this.data[boAlias]['sub_' + subTableName].length < 1
         ) {
+          subInitData.sub_guid = this.guid()
           this.data[boAlias]['sub_' + subTableName].push(
             JSON.parse(JSON.stringify(subInitData))
           )

package/src/utils.js

@@ -922,7 +922,7 @@ var utils = {
     if (!config.hasOwnProperty(key)) {
       throw `config对象中未找到属性${key}`
     }
-    const keyPath = config[key]
+    let keyPath = config[key]
     // 获取当前组件所在的表单
     const formInst = utils.getOnlineFormInstance(inst.$parent)
     // 获取当前组件是否在子表中的某一行
@@ -948,6 +948,14 @@ var utils = {
       let wholeKeyPath = utils.getWholePathOfSub(keyPath, paths, index)
       return utils.getValueByPath(formInst, wholeKeyPath)
     } else {
+      if (
+        formInst &&
+        formInst.$options &&
+        formInst.$options.name == 'HtSubEditModeDialog'
+      ) {
+        keyPath =
+          'row.' + config[key].split('.')[config[key].split('.').length - 1]
+      }
       return utils.getValueByPath(formInst, keyPath)
     }
   },
@@ -956,7 +964,7 @@ var utils = {
     if (!config.hasOwnProperty(key)) {
       return
     }
-    const keyPath = config[key]
+    let keyPath = config[key]
     // 获取当前组件所在的表单
     const formInst = utils.getOnlineFormInstance(inst)
     // 获取当前组件是否在子表中的某一行
@@ -982,6 +990,14 @@ var utils = {
       let wholeKeyPath = utils.getWholePathOfSub(keyPath, paths, index)
       utils.setValueByPath(formInst, wholeKeyPath, value)
     } else {
+      if (
+        formInst &&
+        formInst.$options &&
+        formInst.$options.name == 'HtSubEditModeDialog'
+      ) {
+        keyPath =
+          'row.' + config[key].split('.')[config[key].split('.').length - 1]
+      }
       utils.setValueByPath(formInst, keyPath, value)
     }
   },