vue2-client 1.15.64 → 1.15.66

package/package.json

@@ -1,110 +1,110 @@
-{
-  "name": "vue2-client",
-  "version": "1.15.64",
-  "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-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.66",
+  "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-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/XCollapse/XCollapse.vue

@@ -77,7 +77,7 @@
             :countVisible="false"
             :env="env"
             :style="config.componentStyle || ''"
-            :_panelIndex="panelIndex"
+            :ipanelIndex="panelIndex"
             @deleteData="deleteData"
             @add="add"
             @listClick="listClick"

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -1094,13 +1094,13 @@ export default {
           this.show = obj
         } else if (obj && typeof obj === 'object') {
           // obj 是一个对象，并且不是数组
-          if (obj.hasOwnProperty('show')) {
+          if (Object.prototype.hasOwnProperty.call(obj, 'show')) {
             this.show = obj?.show
           }
-          if (obj.hasOwnProperty('readOnly')) {
+          if (Object.prototype.hasOwnProperty.call(obj, 'readOnly')) {
             this.readOnly = obj?.readOnly
           }
-          if (obj.hasOwnProperty('disabled')) {
+          if (Object.prototype.hasOwnProperty.call(obj, 'disabled')) {
             this.disabled = obj?.disabled
           }
         }
@@ -1116,13 +1116,13 @@ export default {
           this.show = obj
         } else if (obj && typeof obj === 'object') {
           // obj 是一个对象，并且不是数组
-          if (obj.hasOwnProperty('show')) {
+          if (Object.prototype.hasOwnProperty.call(obj, 'show')) {
             this.show = obj?.show
           }
-          if (obj.hasOwnProperty('readOnly')) {
+          if (Object.prototype.hasOwnProperty.call(obj, 'readOnly')) {
             this.readOnly = obj?.readOnly
           }
-          if (obj.hasOwnProperty('disabled')) {
+          if (Object.prototype.hasOwnProperty.call(obj, 'disabled')) {
             this.disabled = obj?.disabled
           }
         }

package/src/base-client/components/common/XTable/ExportExcel.vue

@@ -226,6 +226,7 @@ export default {
   <a-modal
     title="选择导出列"
     width="35vw"
+    :z-index="1001"
     :confirmLoading="confirmLoading"
     v-model="exportModalVisible"
     :destroy-on-close="true"

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -548,6 +548,11 @@ export default {
 }
 </script>
 
+<style scoped lang="less">
+:deep(.ant-table-fixed-right) {
+  overflow: visible !important;
+}
+</style>
 <style>
 .table-draggable-handle {
   height: 100% !important;

package/src/base-client/components/his/XList/XList.vue

@@ -1,22 +1,24 @@
 <template>
   <!-- 列表卡片模式 listMode: card -->
-  <div v-if="listMode"
+  <div
+    v-if="listMode"
     class="demo-infinite-container"
     ref="listRef"
     @scroll="handleInfiniteOnLoad">
-    <a-list :grid="{ gutter: 16, xs: 1, sm: 2, md: 2, lg: 3, xl: 3, xxl: 4 }"
+    <a-list
+      :grid="{ gutter: 16, xs: 1, sm: 2, md: 2, lg: 3, xl: 3, xxl: 4 }"
       :data-source="localData">
       <a-list-item slot="renderItem" slot-scope="item, index">
         <div class="card-a-col">
           <a-row class="card-row">
             <a-col class="id-a-col" :span="4" v-for="(detail,idx) in item.filter(d => d.label == label)" :key="idx">
-              {{detail.value}}<span style="font-size: 16px;font-weight: 400 !important;">床</span>
+              {{ detail.value }}<span style="font-size: 16px;font-weight: 400 !important;">床</span>
             </a-col>
             <a-col :span="20" class="id-a-col-2">
               <template v-for="(detail,idx) in item">
-                <span class="describe-list-a-col" :class="{name: detail.bold}" :key="idx" v-if="detail.type == 'title'">{{detail.value}}</span>
+                <span class="describe-list-a-col" :class="{name: detail.bold}" :key="idx" v-if="detail.type == 'title'">{{ detail.value }}</span>
                 <span :key="idx" class="component-a-col" v-else-if="detail.type == 'component' && detail.label != label">
-                  {{`${detail.label}：`}}
+                  {{ `${detail.label}：` }}
                   <component
                     :is="detail.slotType"
                     :key="idx"
@@ -28,17 +30,18 @@
                   />
                 </span>
                 <span :key="idx" class="component-a-col" v-else-if="detail.type == 'date'">
-                  {{`${detail.label}：`}}
+                  {{ `${detail.label}：` }}
                   <a-date-picker @change="onChange" />
                 </span>
-                <span class="describe-list-a-col" :class="{name: detail.bold}" :key="idx" v-else-if="detail.label != label">{{`${detail.label}：${detail.value}`}}</span>
+                <span class="describe-list-a-col" :class="{name: detail.bold}" :key="idx" v-else-if="detail.label != label">{{ `${detail.label}：${detail.value}` }}</span>
               </template>
-              <a-button v-for="(btn, i) in buttonNames"
-                        :key="i"
-                        icon="search"
-                        class="button-a-col"
-                        @click.stop="click(item, index)">
-                {{btn}}
+              <a-button
+                v-for="(btn, i) in buttonNames"
+                :key="i"
+                icon="search"
+                class="button-a-col"
+                @click.stop="click(item, index)">
+                {{ btn }}
               </a-button>
             </a-col>
           </a-row>
@@ -58,14 +61,16 @@
   <!-- 默认标签模式 -->
   <div class="list-wrapper" v-else>
     <a-list size="large" :data-source="data" itemLayout="horizontal" class="list-container" ref="listRef">
-      <a-list-item slot="renderItem"
+      <a-list-item
+        slot="renderItem"
         slot-scope="item, index"
         class="list-item"
         @click="handleClick(index)"
         @mouseenter="enableHoverOptions && handleMouseEnter(index)"
         @mouseleave="handleMouseLeave"
         :class="{ 'hover-active': enableHoverOptions && hoveredIndex === index }">
-        <i v-if="icon"
+        <i
+          v-if="icon"
           class="icon-menu"
           :style="getIconStyle(item)">
         </i>
@@ -86,16 +91,18 @@
         </div>
 
         <!-- 悬浮选项框 -->
-        <div v-show="enableHoverOptions && hoveredIndex === index"
+        <div
+          v-show="enableHoverOptions && hoveredIndex === index"
           class="hover-options"
           @mouseenter="handleOptionsEnter"
           @mouseleave="handleOptionsLeave">
           <div class="hover-options-content">
-            <div v-for="(item, idx) in select_options"
+            <div
+              v-for="(Item, idx) in select_options"
               :key="idx"
               class="option-item"
-              @click="handleOptionClick(index, item)">
-              {{ item }}
+              @click="handleOptionClick(index, Item)">
+              {{ Item }}
             </div>
           </div>
         </div>

package/src/base-client/components/his/XTreeRows/XTreeRows.vue

@@ -42,7 +42,7 @@ export default {
       }
     },
     // 父组件索引
-    _panelIndex: {
+    ipanelIndex: {
       type: Number,
       default: ''
     }
@@ -152,7 +152,7 @@ export default {
         this.lastSelectedNode = result.node
         this.$emit('search-complete', {
           hasMatch: true,
-          panelIndex: this._panelIndex // 接收父组件传入的面板索引
+          panelIndex: this.ipanelIndex // 接收父组件传入的面板索引
         })
         // 滚动到目标节点
         this.$nextTick(() => {