vue2-client 1.18.67 → 1.18.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.67",
+  "version": "1.18.68",
   "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/HIS/HForm/HForm.vue

@@ -29,7 +29,9 @@ const wrapperClassObject = computed(() => {
     'label-text-justify',
     'simple-inline',
     'label-justify',
-    'charge-form'
+    'charge-form',
+    'mini-form',
+    'content-right'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -77,6 +79,27 @@ defineExpose({
   :deep(.ant-form-item) {
     margin-bottom: 4px;
   }
+  &.h-form-mini-form {
+    :deep(.ant-form-inline) {
+      .ant-row-flex {
+        .ant-col {
+          flex: auto !important;
+          max-width: 250px !important;
+        }
+      }
+    }
+    :deep(.ant-form-item){
+      margin-right: 0px !important;
+    }
+  }
+
+  &.h-form-content-right {
+    :deep(.ant-form-inline) {
+      .ant-row-flex {
+        justify-content: right;
+      }
+    }
+  }
 
   // query-conditions 样式
   &.h-form-query-conditions {

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