three-trees-ui 1.1.4 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "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 == 1) {
+                bindPath = `row.${configAttr[configAttr.length - 1]}`
+              }
+              if (this.subDialogMode == 1) {
+                this.$set(pInst.row, configAttr[configAttr.length - 1], _val)
+              } else {
+                utils.setValueByPath(pInst, bindPath, _val, thisIndex)
+              }
             }
           }
         })
@@ -1541,12 +1548,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 == 1) {
+                bindPath = `row.${configAttr[configAttr.length - 1]}`
+              }
+              if (this.subDialogMode == 1) {
+                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/OnlineForm/src/Form.vue

@@ -158,83 +158,88 @@
             resolve(true)
             return
           }
-          const expandList = JSON.parse(this.formExpand)
-
-          if (!expandList.list) {
-            resolve(true)
-            return
-          }
-          const subTableList = expandList.list.filter((it) => {
-            return (
-              (this.isMobile && it.ctrlType == 'subDiv') ||
-              (!this.isMobile && it.ctrlType === 'subtable')
-            )
-          })
-          if (!this.isMobile) {
-            // pc端找到 分页的子表 校验
-            const havePageSub = subTableList.filter((k) => {
-              return k.subtablePagination
-            })
-            if (!havePageSub.length) {
+          try {
+            const expandList = JSON.parse(this.formExpand)
+            if (!expandList.list) {
               resolve(true)
               return
             }
-          }
-          const mainAlias = Object.keys(this.data)[0]
-          const mainData = this.data[mainAlias]
-          const errorResult = []
-
-          Object.keys(mainData).forEach((key) => {
-            if (key.startsWith('sub_')) {
-              const curSubConfig = subTableList.find((sub) => {
-                return sub.name == key.replace('sub_', '')
+            const subTableList = expandList.list.filter((it) => {
+              return (
+                (this.isMobile && it.ctrlType == 'subDiv') ||
+                (!this.isMobile && it.ctrlType === 'subtable')
+              )
+            })
+            if (!this.isMobile) {
+              // pc端找到 分页的子表 校验
+              const havePageSub = subTableList.filter((k) => {
+                return k.subtablePagination
               })
-              const subAlias = key.replace('sub_', '')
-              const subPermission = this.permission.fields[subAlias]
-              mainData[key].forEach((item, index) => {
-                Object.keys(item).forEach((subKey) => {
-                  if (subPermission[subKey] == 'b' && !item[subKey]) {
-                    const subItem = curSubConfig.list.find((l) => {
-                      return l.name === subKey
-                    })
-                    let haveIndex = errorResult.findIndex((it) => {
-                      return (
-                        it.tableName === curSubConfig.desc &&
-                        it.fieldName === subItem.desc
-                      )
-                    })
-                    if (haveIndex === -1) {
-                      errorResult.push({
-                        tableName: curSubConfig.desc,
-                        index: index + 1,
-                        fieldName: subItem.desc,
+              if (!havePageSub.length) {
+                resolve(true)
+                return
+              }
+            }
+            const mainAlias = Object.keys(this.data)[0]
+            const mainData = this.data[mainAlias]
+            const errorResult = []
+
+            Object.keys(mainData).forEach((key) => {
+              if (key.startsWith('sub_')) {
+                const curSubConfig = subTableList.find((sub) => {
+                  return sub.name == key.replace('sub_', '')
+                })
+                const subAlias = key.replace('sub_', '')
+                const subPermission = this.permission.fields[subAlias]
+                mainData[key].forEach((item, index) => {
+                  Object.keys(item).forEach((subKey) => {
+                    if (subPermission[subKey] == 'b' && !item[subKey]) {
+                      const subItem = curSubConfig.list.find((l) => {
+                        return l.name === subKey
                       })
+                      let haveIndex = errorResult.findIndex((it) => {
+                        return (
+                          it.tableName === curSubConfig.desc &&
+                          it.fieldName === subItem.desc
+                        )
+                      })
+                      if (haveIndex === -1) {
+                        errorResult.push({
+                          tableName: curSubConfig.desc,
+                          index: index + 1,
+                          fieldName: subItem.desc,
+                        })
+                      }
                     }
-                  }
+                  })
                 })
-              })
-            }
-          })
-          if (errorResult.length > 0) {
-            const messages = errorResult.map((k) => {
-              return `${k.tableName}，【${k.fieldName}】必填`
+              }
             })
-            // 判断是移动端还是pc
-            if (utils.isMobile()) {
-              this.$notify({
-                message: messages.join('\n'),
-                background: '#f25130',
+            if (errorResult.length > 0) {
+              const messages = errorResult.map((k) => {
+                return `${k.tableName}，【${k.fieldName}】必填`
               })
+              // 判断是移动端还是pc
+              if (utils.isMobile()) {
+                this.$notify({
+                  message: messages.join('\n'),
+                  background: '#f25130',
+                })
+              } else {
+                Notification.error({
+                  title: this.$t('ht.common.warmTips'),
+                  dangerouslyUseHTMLString: true,
+                  message: messages.join('<br/>'),
+                })
+              }
+              resolve(false)
             } else {
-              Notification.error({
-                title: this.$t('ht.common.warmTips'),
-                dangerouslyUseHTMLString: true,
-                message: messages.join('<br/>'),
-              })
+              resolve(true)
             }
-            resolve(false)
-          } else {
+          } catch (e) {
             resolve(true)
+            console.error('formExpand 格式错误')
+            return
           }
         })
       },

package/src/mixins/onlineSubtable.js

@@ -616,6 +616,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))
           )