vue2-client 1.15.130 → 1.15.132

package/package.json

@@ -1,111 +1,111 @@
-{
-  "name": "vue2-client",
-  "version": "1.15.130",
-  "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",
-    "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.15.132",
+  "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",
+    "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,107 +1,178 @@
-<script setup lang="ts">
-import XButtons from '@vue2-client/base-client/components/common/XButtons/XButtons.vue'
-import { ref } from 'vue'
-
-defineProps({
-  // HButtons特有的属性
-  buttonStyle: {
-    type: String,
-    default: 'button24'
-  }
-})
-
-// 内部 XButtons 实例引用
-const xButtonsRef = ref()
-
-// 暴露方法：获取内部 XButtons 实例
-defineExpose({
-  getXButtonsInstance: function () { return xButtonsRef.value }
-})
-</script>
-
-<template>
-  <div
-    class="h-buttons-wrapper"
-    :class="[
-      `h-buttons-${buttonStyle}`
-    ]"
-  >
-    <x-buttons
-      ref="xButtonsRef"
-      v-bind="$attrs"
-      v-on="$listeners"
-    >
-      <template v-for="(_, name) in $slots" #[name]="slotData">
-        <slot :name="name" v-bind="slotData" />
-      </template>
-    </x-buttons>
-  </div>
-</template>
-
-<style scoped lang="less">
-.h-buttons-wrapper {
-  // 基础样式
-  :deep(.ant-btn-group) {
-    .ant-btn {
-      border-radius: 6px;
-      background-color: #FFFFFF;
-      border: 1px solid #9499A0;
-      color: #313131;
-      font-weight: normal;
-      letter-spacing: 0em;
-      width: 110px;
-      font-size: 16px;
-      font-family: "Source Han Sans";
-      line-height: normal;
-      margin-right: 25px;
-      height: 32px;
-    }
-  }
-
-  // button24样式
-  &.h-buttons-button24 {
-    :deep(.ant-btn-group) {
-      .ant-btn {
-        border: 1px solid #CDCDCD;
-        color: #5D5C5C;
-        font-weight: normal;
-        letter-spacing: 0em;
-        font-size: 16px;
-        line-height: normal;
-        margin-right: 25px;
-        border-radius: 6px;
-        background-color: #FFFFFF;
-        // 这个不合理
-        // top: -100px;
-        width: fit-content;
-        min-width: 110px;
-        font-family: "Source Han Sans";
-        height: 32px;
-      }
-    }
-  }
-
-  // button23样式
-  &.h-buttons-button23 {
-    :deep(.ant-btn-group) {
-      .ant-btn {
-        border: none;
-        padding: 0 !important;
-        color: #FFFFFF;
-        font-weight: normal;
-        letter-spacing: 0em;
-        font-size: 16px;
-        line-height: normal;
-        border-radius: 50%;
-        background-color: #1890FF;
-        margin-left: 10px;
-        top: -88px;
-        width: 30px;
-        font-family: "Source Han Sans";
-        height: 30px;
-      }
-    }
-  }
-
-}
-</style>
+<script setup lang="ts">
+import XButtons from '@vue2-client/base-client/components/common/XButtons/XButtons.vue'
+import { ref } from 'vue'
+
+defineProps({
+  // HButtons特有的属性
+  buttonStyle: {
+    type: String,
+    default: 'button24'
+  }
+})
+
+// 内部 XButtons 实例引用
+const xButtonsRef = ref()
+
+// 暴露方法：获取内部 XButtons 实例
+defineExpose({
+  getXButtonsInstance: function () { return xButtonsRef.value }
+})
+</script>
+
+<template>
+  <div
+    class="h-buttons-wrapper"
+    :class="[
+      `h-buttons-${buttonStyle}`
+    ]"
+  >
+    <x-buttons
+      ref="xButtonsRef"
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <template v-for="(_, name) in $slots" #[name]="slotData">
+        <slot :name="name" v-bind="slotData" />
+      </template>
+    </x-buttons>
+  </div>
+</template>
+
+<style scoped lang="less">
+.h-buttons-wrapper {
+  // 基础样式
+  :deep(.ant-btn-group) {
+    .ant-btn {
+      border-radius: 6px;
+      background-color: #FFFFFF;
+      border: 1px solid #9499A0;
+      color: #313131;
+      font-weight: normal;
+      letter-spacing: 0em;
+      width: 110px;
+      font-size: 16px;
+      font-family: "Source Han Sans";
+      line-height: normal;
+      margin-right: 25px;
+      height: 32px;
+    }
+  }
+
+  // button24样式
+  &.h-buttons-button24 {
+    :deep(.ant-btn-group) {
+      .ant-btn {
+        border: 1px solid #CDCDCD;
+        color: #5D5C5C;
+        font-weight: normal;
+        letter-spacing: 0em;
+        font-size: 16px;
+        line-height: normal;
+        margin-right: 25px;
+        border-radius: 6px;
+        background-color: #FFFFFF;
+        // 这个不合理
+        // top: -100px;
+        width: fit-content;
+        min-width: 110px;
+        font-family: "Source Han Sans";
+        height: 32px;
+      }
+    }
+  }
+
+  // button23样式
+  &.h-buttons-button23 {
+    :deep(.ant-btn-group) {
+      .ant-btn {
+        border: none;
+        padding: 0 !important;
+        color: #FFFFFF;
+        font-weight: normal;
+        letter-spacing: 0em;
+        font-size: 16px;
+        line-height: normal;
+        border-radius: 50%;
+        background-color: #1890FF;
+        margin-left: 10px;
+        top: -88px;
+        width: 30px;
+        font-family: "Source Han Sans";
+        height: 30px;
+      }
+    }
+  }
+
+  // +号样式
+  &.h-buttons-table-height-button23 {
+    :deep(.ant-btn-group) {
+      display: inline-flex;
+      align-items: center;
+      height: 100%;
+
+      .ant-btn {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        border: none;
+        padding: 0 !important;
+        color: #FFFFFF;
+        font-weight: normal;
+        letter-spacing: 0em;
+        font-size: 16px;
+        line-height: normal;
+        border-radius: 50%;
+        background-color: #1890FF;
+        margin-left: 10px;
+        width: 30px;
+        font-family: "Source Han Sans";
+        height: 30px;
+        /* 自适应上移：按按钮自身高度百分比位移 */
+        transform: translateY(-100%);
+      }
+    }
+  }
+
+  // 居中+悬停高亮的新样式
+  &.h-buttons-plus-center {
+    :deep(.ant-btn-group) {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 16px;
+
+      .ant-btn {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #CDCDCD;
+        background-color: #FFFFFF;
+        color: #5D5C5C;
+        border-radius: 6px;
+        min-width: 110px;
+        height: 32px;
+        font-size: 16px;
+        font-family: "Source Han Sans";
+        transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease;
+
+        &:hover {
+          background-color: #0057FE;
+          border-color: #0057FE;
+          color: #FFFFFF;
+        }
+      }
+    }
+  }
+
+  // 水印图标与按钮容器布局调整
+  &.h-buttons-button-watermark-icon {
+    :deep(.watermark-icon) {  transform: translate(-50%, -54%) !important; }
+    :deep(.x-button) { display: flex !important; }
+    :deep(.ant-btn-group) {
+      margin: 0 auto;
+      display: block;
+    }
+  }
+
+}
+</style>