vue2-client 1.18.34 → 1.18.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.34",
+  "version": "1.18.35",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/assets/svg/female.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="32" height="32" viewBox="0 0 32 32"><g><path d="M16,6.193552C12.580641,6.193552,9.8064489,8.9677448,9.8064489,12.387104C9.8064489,15.806449,12.580641,18.580641,16,18.580641C19.419361,18.580641,22.193602,15.806449,22.193602,12.387104C22.193602,8.9677448,19.419361,6.193552,16,6.193552C16,6.193552,16,6.193552,16,6.193552ZM16,15.483871C14.29032,15.483871,12.903233,14.096769,12.903233,12.387104C12.903233,10.677424,14.29032,9.2903204,16,9.2903204C17.7096,9.2903204,19.096802,10.677424,19.096802,12.387104C19.096802,14.096769,17.7096,15.483871,16,15.483871C16,15.483871,16,15.483871,16,15.483871ZM16,0C7.1612964,0,0,7.1612964,0,16C0,24.838722,7.1612964,32,16,32C24.838722,32,32,24.838722,32,16C32,7.1612964,24.838722,0,16,0C16,0,16,0,16,0ZM16,28.903204C12.793552,28.903204,9.8645124,27.722561,7.6064487,25.78064C8.5677443,24.296803,10.212896,23.290403,12.096769,23.232321C13.438704,23.645123,14.716129,23.851683,16,23.851683C17.28384,23.851683,18.561281,23.65168,19.903202,23.232321C21.787041,23.296803,23.43232,24.296803,24.3936,25.78064C22.135521,27.722561,19.206402,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204ZM26.496801,23.47744C24.922562,21.451681,22.490402,20.128962,19.716162,20.128962C19.058081,20.128962,18.038723,20.748322,16,20.748322C13.967746,20.748322,12.941936,20.128962,12.283874,20.128962C9.5161285,20.128962,7.0838728,21.451681,5.5032325,23.47744C3.9935522,21.367682,3.0967681,18.787043,3.0967681,16C3.0967681,8.883873,8.883873,3.0967681,16,3.0967681C23.116163,3.0967681,28.903204,8.883873,28.903204,16C28.903204,18.787043,28.006401,21.367682,26.496801,23.47744C26.496801,23.47744,26.496801,23.47744,26.496801,23.47744Z" fill="#D15DFF" fill-opacity="1"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="32" height="32" viewBox="0 0 32 32"><g><path d="M16,6.193552C12.580641,6.193552,9.8064489,8.9677448,9.8064489,12.387104C9.8064489,15.806449,12.580641,18.580641,16,18.580641C19.419361,18.580641,22.193602,15.806449,22.193602,12.387104C22.193602,8.9677448,19.419361,6.193552,16,6.193552C16,6.193552,16,6.193552,16,6.193552ZM16,15.483871C14.29032,15.483871,12.903233,14.096769,12.903233,12.387104C12.903233,10.677424,14.29032,9.2903204,16,9.2903204C17.7096,9.2903204,19.096802,10.677424,19.096802,12.387104C19.096802,14.096769,17.7096,15.483871,16,15.483871C16,15.483871,16,15.483871,16,15.483871ZM16,0C7.1612964,0,0,7.1612964,0,16C0,24.838722,7.1612964,32,16,32C24.838722,32,32,24.838722,32,16C32,7.1612964,24.838722,0,16,0C16,0,16,0,16,0ZM16,28.903204C12.793552,28.903204,9.8645124,27.722561,7.6064487,25.78064C8.5677443,24.296803,10.212896,23.290403,12.096769,23.232321C13.438704,23.645123,14.716129,23.851683,16,23.851683C17.28384,23.851683,18.561281,23.65168,19.903202,23.232321C21.787041,23.296803,23.43232,24.296803,24.3936,25.78064C22.135521,27.722561,19.206402,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204ZM26.496801,23.47744C24.922562,21.451681,22.490402,20.128962,19.716162,20.128962C19.058081,20.128962,18.038723,20.748322,16,20.748322C13.967746,20.748322,12.941936,20.128962,12.283874,20.128962C9.5161285,20.128962,7.0838728,21.451681,5.5032325,23.47744C3.9935522,21.367682,3.0967681,18.787043,3.0967681,16C3.0967681,8.883873,8.883873,3.0967681,16,3.0967681C23.116163,3.0967681,28.903204,8.883873,28.903204,16C28.903204,18.787043,28.006401,21.367682,26.496801,23.47744C26.496801,23.47744,26.496801,23.47744,26.496801,23.47744Z" fill="#D15DFF" fill-opacity="1"/></g></svg>

package/src/assets/svg/male.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="32" height="32" viewBox="0 0 32 32"><g><path d="M16,6.193552C12.580641,6.193552,9.8064489,8.9677448,9.8064489,12.387104C9.8064489,15.806449,12.580641,18.580641,16,18.580641C19.419361,18.580641,22.193602,15.806449,22.193602,12.387104C22.193602,8.9677448,19.419361,6.193552,16,6.193552C16,6.193552,16,6.193552,16,6.193552ZM16,15.483871C14.29032,15.483871,12.903233,14.096769,12.903233,12.387104C12.903233,10.677424,14.29032,9.2903204,16,9.2903204C17.7096,9.2903204,19.096802,10.677424,19.096802,12.387104C19.096802,14.096769,17.7096,15.483871,16,15.483871C16,15.483871,16,15.483871,16,15.483871ZM16,0C7.1612964,0,0,7.1612964,0,16C0,24.838722,7.1612964,32,16,32C24.838722,32,32,24.838722,32,16C32,7.1612964,24.838722,0,16,0C16,0,16,0,16,0ZM16,28.903204C12.793552,28.903204,9.8645124,27.722561,7.6064487,25.78064C8.5677443,24.296803,10.212896,23.290403,12.096769,23.232321C13.438704,23.645123,14.716129,23.851683,16,23.851683C17.28384,23.851683,18.561281,23.65168,19.903202,23.232321C21.787041,23.296803,23.43232,24.296803,24.3936,25.78064C22.135521,27.722561,19.206402,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204ZM26.496801,23.47744C24.922562,21.451681,22.490402,20.128962,19.716162,20.128962C19.058081,20.128962,18.038723,20.748322,16,20.748322C13.967746,20.748322,12.941936,20.128962,12.283874,20.128962C9.5161285,20.128962,7.0838728,21.451681,5.5032325,23.47744C3.9935522,21.367682,3.0967681,18.787043,3.0967681,16C3.0967681,8.883873,8.883873,3.0967681,16,3.0967681C23.116163,3.0967681,28.903204,8.883873,28.903204,16C28.903204,18.787043,28.006401,21.367682,26.496801,23.47744C26.496801,23.47744,26.496801,23.47744,26.496801,23.47744Z" fill="#0057FE" fill-opacity="1"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="32" height="32" viewBox="0 0 32 32"><g><path d="M16,6.193552C12.580641,6.193552,9.8064489,8.9677448,9.8064489,12.387104C9.8064489,15.806449,12.580641,18.580641,16,18.580641C19.419361,18.580641,22.193602,15.806449,22.193602,12.387104C22.193602,8.9677448,19.419361,6.193552,16,6.193552C16,6.193552,16,6.193552,16,6.193552ZM16,15.483871C14.29032,15.483871,12.903233,14.096769,12.903233,12.387104C12.903233,10.677424,14.29032,9.2903204,16,9.2903204C17.7096,9.2903204,19.096802,10.677424,19.096802,12.387104C19.096802,14.096769,17.7096,15.483871,16,15.483871C16,15.483871,16,15.483871,16,15.483871ZM16,0C7.1612964,0,0,7.1612964,0,16C0,24.838722,7.1612964,32,16,32C24.838722,32,32,24.838722,32,16C32,7.1612964,24.838722,0,16,0C16,0,16,0,16,0ZM16,28.903204C12.793552,28.903204,9.8645124,27.722561,7.6064487,25.78064C8.5677443,24.296803,10.212896,23.290403,12.096769,23.232321C13.438704,23.645123,14.716129,23.851683,16,23.851683C17.28384,23.851683,18.561281,23.65168,19.903202,23.232321C21.787041,23.296803,23.43232,24.296803,24.3936,25.78064C22.135521,27.722561,19.206402,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204C16,28.903204,16,28.903204,16,28.903204ZM26.496801,23.47744C24.922562,21.451681,22.490402,20.128962,19.716162,20.128962C19.058081,20.128962,18.038723,20.748322,16,20.748322C13.967746,20.748322,12.941936,20.128962,12.283874,20.128962C9.5161285,20.128962,7.0838728,21.451681,5.5032325,23.47744C3.9935522,21.367682,3.0967681,18.787043,3.0967681,16C3.0967681,8.883873,8.883873,3.0967681,16,3.0967681C23.116163,3.0967681,28.903204,8.883873,28.903204,16C28.903204,18.787043,28.006401,21.367682,26.496801,23.47744C26.496801,23.47744,26.496801,23.47744,26.496801,23.47744Z" fill="#0057FE" fill-opacity="1"/></g></svg>

package/src/base-client/components/common/AmapMarker/index.js

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering

package/src/base-client/components/common/HIS/HFormGroup/index.js

@@ -1,3 +1,3 @@
-import HFormGroup from './HFormGroup.vue'
-
-export default HFormGroup
+import HFormGroup from './HFormGroup.vue'
+
+export default HFormGroup

package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue

@@ -683,11 +683,8 @@ export default {
       }
       // 处理表单校验情况
       if (item.rule) {
-        if (groupItem) {
-          this.rules[groupItem] = []
-        } else {
-          this.rules[rulesKey] = []
-        }
+        const rulesArrayKey = groupItem || rulesKey
+        this.rules[rulesArrayKey] = []
         const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
         let trigger
         let message
@@ -713,19 +710,26 @@ export default {
               message = '请输入' + item.name
               trigger = 'blur'
           }
-          if (groupItem) {
-            this.rules[groupItem].push({
-              required: true,
-              message: message,
-              trigger: trigger
-            })
-          } else {
-            this.rules[rulesKey].push({
-              required: true,
-              message: message,
-              trigger: trigger
-            })
-          }
+          this.rules[rulesArrayKey].push({
+            required: true,
+            message: message,
+            trigger: trigger
+          })
+        }
+        // 文件/图片上传最小数量校验：必填时强制校验；非必填但已上传时也需校验
+        if (['file', 'image'].includes(item.type) && item.minAcceptCount) {
+          const minCount = Number(item.minAcceptCount)
+          this.rules[rulesArrayKey].push({
+            validator: (rule, value, callback) => {
+              const count = Array.isArray(value) ? value.length : (value ? 1 : 0)
+              if ((required || count > 0) && count < minCount) {
+                callback(new Error(`请至少上传${minCount}个${item.name}`))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change'
+          })
         }
 
         switch (item.rule.type) {
@@ -753,33 +757,18 @@ export default {
                 defaultValue = 0.0
                 break
             }
-            if (groupItem) {
-              this.rules[groupItem].push({
-                type: item.rule.type,
-                message: item.name + '必须为' + message,
-                transform: (value) => {
-                  if (value && value.length !== 0) {
-                    return Number(value)
-                  } else {
-                    return defaultValue
-                  }
-                },
-                trigger: 'blur'
-              })
-            } else {
-              this.rules[rulesKey].push({
-                type: item.rule.type,
-                message: item.name + '必须为' + message,
-                transform: (value) => {
-                  if (value && value.length !== 0) {
-                    return Number(value)
-                  } else {
-                    return defaultValue
-                  }
-                },
-                trigger: 'blur'
-              })
-            }
+            this.rules[rulesArrayKey].push({
+              type: item.rule.type,
+              message: item.name + '必须为' + message,
+              transform: (value) => {
+                if (value && value.length !== 0) {
+                  return Number(value)
+                } else {
+                  return defaultValue
+                }
+              },
+              trigger: 'blur'
+            })
             break
           case 'email': {
             const validator = (rule, value, callback) => {
@@ -789,7 +778,7 @@ export default {
                 callback()
               }
             }
-            this.rules[groupItem || rulesKey].push({
+            this.rules[rulesArrayKey].push({
               type: 'email',
               validator: validator,
               message: '请输入正确的邮箱地址',
@@ -798,7 +787,7 @@ export default {
             break
           }
           case 'userPhone': {
-            this.rules[groupItem || rulesKey].push({
+            this.rules[rulesArrayKey].push({
               type: 'userPhone',
               validator: (rule, value, callback) => {
                 if (value && !REG_PHONE.test(value)) {
@@ -813,7 +802,7 @@ export default {
             break
           }
           case 'idNumber': {
-            this.rules[groupItem || rulesKey].push({
+            this.rules[rulesArrayKey].push({
               validator: (rule, value, callback) => {
                 if (value && !checkIdNumber(value)) {
                   callback(new Error('请输入正确的身份证号码'))
@@ -826,7 +815,7 @@ export default {
             break
           }
           case 'landlineNumber': {
-            this.rules[rulesKey].push({
+            this.rules[rulesArrayKey].push({
               validator: (rule, value, callback) => {
                 if (value && !REG_LANDLINE.test(value)) {
                   callback(new Error('请输入正确的座机号码'))
@@ -841,7 +830,7 @@ export default {
           // 大于0
           case 'greaterThanZero': {
             item.numberInput = true
-            this.rules[rulesKey].push({
+            this.rules[rulesArrayKey].push({
               validator: (rule, value, callback) => {
                 if (isNaN(value) || value <= 0) {
                   callback(new Error('请输入一个大于0的数字'))
@@ -856,7 +845,7 @@ export default {
           // 大于等于0
           case 'greaterThanOrEqualZero': {
             item.numberInput = true
-            this.rules[rulesKey].push({
+            this.rules[rulesArrayKey].push({
               validator: (rule, value, callback) => {
                 if (isNaN(value) || value < 0) {
                   callback(new Error('请输入一个大于等于0的数字'))
@@ -869,7 +858,7 @@ export default {
             break
           }
           case 'stringLength': {
-            this.rules[rulesKey].push({
+            this.rules[rulesArrayKey].push({
               validator: (rule, value, callback) => {
                 if (value && value.length < item.rule.minLen) {
                   callback(new Error('长度不能少于' + item.rule.minLen + '个字符'))
@@ -884,7 +873,7 @@ export default {
             break
           }
           case 'customJs': {
-            this.rules[rulesKey].push({
+            this.rules[rulesArrayKey].push({
               validator: (rule, value, callback) => {
                 this.customJsValidate(rule, value, callback, item)
               },

package/src/base-client/components/common/XAddNativeForm/demo.vue

@@ -11,7 +11,7 @@ export default {
     }
   },
   mounted () {
-    getConfigByNameAsync('formtestForm', 'af-system').then(res => {
+    getConfigByNameAsync('SecurityPhotoForm', 'af-safecheck').then(res => {
       this.$refs.xAddFrom.init(Object.assign(res, {
         modifyModelData: {
           data: {}
@@ -26,6 +26,9 @@ export default {
     },
     singLocal () {
       console.log('singLocal')
+    },
+    onSubmit () {
+      this.$refs.xAddFrom.onSubmit()
     }
   }
 }
@@ -43,8 +46,10 @@ export default {
     </a-card>
     <a-card>
       <pre>{{
-        form ? JSON.stringify(form, null, 2) : '请先点击获取表单数据' }}
+        form ? JSON.stringify(form, null, 2) : '请先点击获取表单数据11111' }}
+        <a-button type="primary" @click="onSubmit()">提交</a-button>
     </pre>
+
     </a-card>
   </div>
 </template>