three-trees-ui 1.0.95 → 1.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.95",
+  "version": "1.0.97",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,
@@ -33,9 +33,7 @@
   ],
   "dependencies": {
     "element-resize-detector": "^1.2.3",
-    "v-viewer": "^1.7.4",
-    "vee-validate": "2.1.7",
-    "viewerjs": "^1.11.7"
+    "vee-validate": "2.1.7"
   },
   "peerDependencies": {
     "axios": "^0.21.1",

package/packages/OnlineForm/src/Form.vue

@@ -32,6 +32,8 @@
   import regionValidator from '@/mixins/regionValidator.js'
   import emitter from '@/mixins/emitter.js'
   import mobileMode from '@/mixins/mobileMode.js'
+  import { Notification } from 'element-ui'
+  import { Notify } from 'vant'
 
   import Vue from 'vue'
   export default {
@@ -80,6 +82,9 @@
         type: Boolean,
         default: false,
       },
+      formExpand: {
+        type: String,
+      },
     },
     data() {
       return {
@@ -129,10 +134,16 @@
           } else {
             // 执行校验逻辑
             this.validateRegion(`[name='${this.formName}']`).then(
-              (errorItems) => {
+              async (errorItems) => {
                 if (errorItems.length > 0) {
                   reject(errorItems)
                 } else {
+                  // 如果有子表，需要检验子表必填
+                  let result = await this.validateTable()
+                  if (result === false) {
+                    reject(8)
+                    return
+                  }
                   this.broadcast('HtGlobalValidate', 'global-validate')
                 }
               }
@@ -140,6 +151,93 @@
           }
         })
       },
+      // 校验子表必填
+      validateTable() {
+        return new Promise((resolve) => {
+          if (!this.formExpand) {
+            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) {
+              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()) {
+              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 {
+            resolve(true)
+          }
+        })
+      },
       init() {
         this.currentComponent = 'runtimeTemplate_' + this.scopeName
         this.loadStatus = 1

package/packages/Preview/src/FrameViewer.vue

@@ -4,13 +4,13 @@
       <loading v-if="loading" />
       <div
         v-else-if="contentType.indexOf('image') > -1"
-        v-viewer="{ movable: false }"
         class="frame-viewer__img"
       >
-        <img
+        <el-image
+          style="width: 100px; height: 100px"
           :src="dataSrc"
-          :style="{ height: utils.isMobile() ? 'auto' : '100%' }"
-        />
+          :preview-src-list="[dataSrc]"
+        ></el-image>
       </div>
       <iframe
         v-else
@@ -31,17 +31,10 @@
   import watermark from './watermark'
   import { createObjectURL } from '../../../src/util/brower.js'
   import utils from '../../../src/utils.js'
-  import 'viewerjs/dist/viewer.css'
-  import { directive as viewer } from 'v-viewer'
 
   export default {
     name: 'FrameViewer',
     components: { Loading },
-    directives: {
-      viewer: viewer({
-        debug: true,
-      }),
-    },
     props: {
       src: {
         type: String,
@@ -74,6 +67,7 @@
         loading: false,
         contentType: '',
         utils,
+        srcList: [],
       }
     },
     mounted() {

package/packages/TemplateForm/src/main.vue

@@ -493,6 +493,7 @@
         let _this = this
         _this.reloadOnlineForm = true
         setTimeout(() => {
+          let data = this.data
           eval(rep.diyJs)
         }, 10)
       },

package/src/mixins/onlineSubtable.js

@@ -15,6 +15,19 @@ export default {
     }
   },
   computed: {
+    showMobileEdit() {
+      return (subName) => {
+        if (this.permission && this.permission.fields[subName]) {
+          return Object.keys(this.permission.fields[subName]).some((k) => {
+            return (
+              this.permission.fields[subName][k] == 'b' ||
+              this.permission.fields[subName][k] == 'w'
+            )
+          })
+        }
+        return false
+      }
+    },
     // 子表前端分页过滤器
     pagingSubData() {
       const me = this