vue2-client 1.16.46 → 1.16.48

package/package.json

@@ -1,112 +1,112 @@
-{
-  "name": "vue2-client",
-  "version": "1.16.46",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
-    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
-    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
-    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
-    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
-    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "marked": "^4",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "splitpanes": "^2.4.1",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-color": "2.7.0",
-    "vue-draggable-resizable": "^2.3.0",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.16.48",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
+    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
+    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
+    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "marked": "^4",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "splitpanes": "^2.4.1",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-color": "2.7.0",
+    "vue-draggable-resizable": "^2.3.0",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

package/src/base-client/components/common/HIS/HButtons/HButtons.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import XButtons from '@vue2-client/base-client/components/common/XButtons/XButtons.vue'
-import { ref } from 'vue'
+import { ref, computed, useAttrs } from 'vue'
 
 defineProps({
   // HButtons特有的属性
@@ -13,6 +13,24 @@ defineProps({
 // 内部 XButtons 实例引用
 const xButtonsRef = ref()
 
+// 兼容多种样式配置
+const attrs = useAttrs()
+const wrapperClassObject = computed(() => {
+  const a = attrs
+  const classes = {}
+
+  // 通用布尔样式开关（以存在/空字符串/'true' 为真）
+  const booleanStyleKeys = [
+    'max-width200'
+  ]
+  for (const key of booleanStyleKeys) {
+    const val = a[key]
+    const truthy = val === true || val === '' || val === 'true'
+    if (truthy) classes[`h-buttons-${key}`] = true
+  }
+  return classes
+})
+
 // 暴露方法：获取内部 XButtons 实例
 defineExpose({
   getXButtonsInstance: function () { return xButtonsRef.value }
@@ -23,7 +41,8 @@ defineExpose({
   <div
     class="h-buttons-wrapper"
     :class="[
-      `h-buttons-${buttonStyle}`
+      `h-buttons-${buttonStyle}`,
+      wrapperClassObject
     ]"
   >
     <x-buttons
@@ -31,7 +50,7 @@ defineExpose({
       v-bind="$attrs"
       v-on="$listeners"
     >
-      <template v-for="(_, name) in $slots" #[name]="slotData">
+      <template v-for="(_, name) in $slots" v-slot:[name]="slotData">
         <slot :name="name" v-bind="slotData" />
       </template>
     </x-buttons>
@@ -145,20 +164,21 @@ defineExpose({
       }
     }
   }
-  // button-left样式 - 按钮从左到右排列
-  &.h-buttons-button-left {
+  // 按钮布局样式公共部分
+  &.h-buttons-button-left,
+  &.h-buttons-button-center,
+  &.h-buttons-button-right,
+  &.h-buttons-button-space-between {
     :deep(.ant-btn-group) {
       width: 100%;
       display: flex;
       flex-wrap: nowrap;
-      justify-content: flex-start;
-      gap: 12px;
       .ant-btn {
         border: 1px solid #CDCDCD;
         color: #5D5C5C;
-        flex: 0 0 auto;
-        min-width: 124px;
         width: auto;
+        min-width: 124px;
+        max-width: 170px;
         white-space: nowrap;
         overflow: hidden;
         margin-right: 0px;
@@ -166,69 +186,51 @@ defineExpose({
       }
     }
   }
+  &.h-buttons-max-width200 {
+    :deep(.ant-btn) {
+        max-width: 200px !important;
+    }
+  }
+  // button-left样式 - 按钮从左到右排列
+  &.h-buttons-button-left {
+    :deep(.ant-btn-group) {
+      justify-content: flex-start;
+      gap: 12px;
+      .ant-btn {
+        flex: 1 1 auto;
+      }
+    }
+  }
   // button-center样式 - 按钮居中排列
   &.h-buttons-button-center {
     :deep(.ant-btn-group) {
-      width: 100%;
-      display: flex;
-      flex-wrap: nowrap;
       justify-content: center;
       gap: 12px;
       .ant-btn {
-        border: 1px solid #CDCDCD;
-        color: #5D5C5C;
-        flex: 0 0 auto;
-        min-width: 124px;
-        width: auto;
-        white-space: nowrap;
-        overflow: hidden;
-        margin-right: 0px;
-        text-overflow: ellipsis;
+        flex: 1 1 auto;
       }
     }
   }
   // button-right样式 - 按钮从右到左排列
   &.h-buttons-button-right {
     :deep(.ant-btn-group) {
-      width: 100%;
-      display: flex;
-      flex-wrap: nowrap;
       justify-content: flex-end;
       gap: 12px;
       .ant-btn {
-        border: 1px solid #CDCDCD;
-        color: #5D5C5C;
-        flex: 0 0 auto;
-        width: auto;
-        min-width: 124px;
-        white-space: nowrap;
-        overflow: hidden;
-        margin-right: 0px;
-        text-overflow: ellipsis;
+        flex: 1 1 auto;
       }
     }
   }
   // button-space-between样式 - 按钮两端对齐（两个按钮时分布在两端）
   &.h-buttons-button-space-between {
     :deep(.ant-btn-group) {
-      width: 100%;
-      display: flex;
-      flex-wrap: nowrap;
       justify-content: space-between;
       .ant-btn {
-        border: 1px solid #CDCDCD;
-        color: #5D5C5C;
-        width: auto;
         flex: 1 1 auto;
-        max-width: 180px;
-        min-width: 124px;
-        white-space: nowrap;
-        overflow: hidden;
-        margin-right: 0px;
-        text-overflow: ellipsis;
       }
     }
   }
+
    // button-icon-tiles样式 - 左侧彩色图标块 + 右侧文字
   &.h-buttons-button-icon-tiles {
     :deep(.ant-btn-group) {

package/src/base-client/components/common/HIS/HForm/HForm.vue

@@ -14,18 +14,13 @@ const wrapperClassObject = computed(() => {
     'query-conditions',
     'padding-50',
     'label-text-horizontal',
+    'label-text-justify'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
     const truthy = val === true || val === '' || val === 'true'
     if (truthy) classes[`h-form-${key}`] = true
   }
-
-  const size = a.size
-  if (size && typeof size === 'string') {
-    classes[`h-form-size-${size}`] = true
-  }
-
   return classes
 })
 
@@ -129,5 +124,31 @@ defineExpose({
       }
     }
   }
+
+  // label-text-justify 样式 - 标签文字两端对齐分散占满 必填*可能会有问题
+  &.h-form-label-text-justify {
+    :deep(.ant-form-item-label) {
+      padding-left: 0;
+      padding-right: 8px;
+      label {
+        position: relative;
+        display: block;
+        width: 100%;
+        white-space: nowrap;
+        margin: 0;
+        text-indent: 0;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: inter-ideograph;
+        box-sizing: border-box;
+        padding-right: 12px; // 给绝对定位的冒号留出空间
+      }
+      // 将冒号绝对定位到最右侧，避免参与两端对齐计算
+      label::after {
+        position: absolute;
+        right: 0;
+      }
+    }
+  }
 }
 </style>