vue2-client 1.12.56 → 1.12.58-chengran

package/package.json

@@ -1,108 +1,108 @@
-{
-  "name": "vue2-client",
-  "version": "1.12.56",
-  "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",
-    "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",
-    "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",
-    "@jest/globals": "^29.7.0",
-    "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.12.58-chengran",
+  "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",
+    "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",
+    "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",
+    "@jest/globals": "^29.7.0",
+    "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

@@ -1,154 +1,175 @@
-<template>
-  <div>
-    <a-collapse
-      :activeKey="activeKey"
-      @change="handleChange"
-    >
-      <a-collapse-panel
-        v-for="(panel, panelIndex) in config.showData"
-        :key="panelIndex.toString()"
-        :show-arrow="false"
-      >
-        <template #header>
-          <div class="header-content">
-            <span
-              class="header-text"
-              :style="config.titleStyle"
-            >
-              {{ panel.title }}
-            </span>
-            <span
-              v-for="(item, headerIndex) in panel.title2 || []"
-              :key="headerIndex"
-              class="info-item"
-              :style="config.title2Style"
-            >
-              <span>{{ item.key }}:</span>
-              <span>{{ item.value }}</span>
-            </span>
-            <span
-              class="time-item"
-              :style="config.title3Style"
-            >
-              {{ panel.title3 }}
-            </span>
-          </div>
-        </template>
-        <!-- 根据类型显示不同内容 -->
-        <template v-if="panel.type === 'picture'">
-          <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
-        </template>
-        <template v-else-if="panel.type === 'cover'">
-          <x-report
-            :use-oss-for-img="false"
-            :config-name="panel.configName"
-            server-name="af-his"
-            :show-img-in-cell="true"
-            :display-only="true"
-            :edit-mode="false"
-            :show-save-button="false"
-            :no-padding="true"
-            :dont-format="true">
-          </x-report>
-        </template>
-      </a-collapse-panel>
-    </a-collapse>
-  </div>
-</template>
-
-<script>
-import XReport from '@vue2-client/base-client/components/common/XReportGrid'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XCollapse',
-  components: {
-    XReport
-  },
-  inject: ['getConfigByName'],
-  data () {
-    return {
-      activeKey: [],
-      config: {}
-    }
-  },
-  props: {
-    // json名
-    queryParamsName: {
-      type: Object,
-      default: 'openPrescriptionConfig'
-    },
-  },
-  created () {
-    this.init(this.queryParamsName)
-  },
-  methods: {
-    async init (config) {
-      getConfigByName(config, 'af-his', res => {
-        this.config = res
-        runLogic(res.mainLogic, localStorage.getItem(config.loc_id), 'af-his').then(result => {
-          console.log(result)
-          this.config.showData = result
-          this.activeKey = this.config.showData.map((_, panelIndex) => panelIndex.toString())
-        })
-      })
-    },
-    handleChange (keys) {
-      this.activeKey = keys
-    },
-  },
-  watch: {
-    queryParamsName: {
-      handler (newValue) {
-        console.log(newValue)
-        this.getData(newValue)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped>
-.header-content {
-  display: flex;
-  align-items: center;
-  gap: 24px;
-}
-
-.header-text {
-  margin-right: 16px;
-  font-size: 16px;
-  font-weight: 800; /* 默认加粗 */
-}
-
-.info-item {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  font-size: 12px;
-  color: #888888;
-}
-
-.time-item {
-  margin-left: auto;
-  text-align: right;
-}
-
-/* 覆盖 ant-design-vue 的默认样式 */
-:deep(.ant-collapse-header) {
-  align-items: center !important;
-}
-
-:deep(.ant-collapse-header-text) {
-  flex: 1;
-}
-
-:deep(.ant-collapse-content > .ant-collapse-content-box) {
-  padding: 0;
-}
-
-:deep(.ant-card-body) {
-  padding: 8px;
-}
-</style>
+<template>
+  <div>
+    <a-collapse
+      :activeKey="activeKey"
+      @change="handleChange"
+    >
+      <a-collapse-panel
+        v-for="(panel, panelIndex) in config.showData"
+        :key="panelIndex.toString()"
+        :show-arrow="false"
+      >
+        <template #header>
+          <div class="header-content">
+            <span
+              class="header-text"
+              :style="config.titleStyle"
+            >
+              {{ panel.title }}
+            </span>
+            <span
+              v-for="(item, headerIndex) in panel.title2 || []"
+              :key="headerIndex"
+              class="info-item"
+              :style="config.title2Style"
+            >
+              <span>{{ item.key }}:</span>
+              <span>{{ item.value }}</span>
+            </span>
+            <span
+              class="time-item"
+              :style="config.title3Style"
+            >
+              {{ panel.title3 }}
+            </span>
+          </div>
+        </template>
+        <!-- 根据类型显示不同内容 -->
+        <template v-if="panel.type === 'picture'">
+          <img :src="panel.configName" alt="图片" style="width: 100%; max-width: 500px;"/>
+        </template>
+        <template v-else-if="panel.type === 'cover'">
+          <x-report
+            :use-oss-for-img="false"
+            :config-name="panel.configName"
+            server-name="af-his"
+            :show-img-in-cell="true"
+            :display-only="true"
+            :edit-mode="false"
+            :show-save-button="false"
+            :no-padding="true"
+            :dont-format="true">
+          </x-report>
+        </template>
+        <template v-else-if="panel.type === 'xlist'">
+          <x-list :list-data="listData" />
+        </template>
+      </a-collapse-panel>
+    </a-collapse>
+  </div>
+</template>
+
+<script>
+import XList from '@vue2-client/base-client/components/his/XList/XList.vue'
+import XReport from '@vue2-client/base-client/components/common/XReportGrid'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XCollapse',
+  components: {
+    XReport,
+    XList
+  },
+  inject: ['getConfigByName'],
+  data () {
+    return {
+      activeKey: [],
+      config: {},
+      configName: '',
+      listData: []
+    }
+  },
+  props: {
+    // json名
+    queryParamsName: {
+      type: Object,
+      default: 'openPrescriptionConfig'
+    },
+  },
+  created () {
+    this.getData(this.queryParamsName)
+    window.addEventListener('storage', this.handleStorageChange)
+  },
+  beforeDestroy () {
+    window.removeEventListener('storage', this.handleStorageChange)
+  },
+  methods: {
+     handleStorageChange (event) {
+      if (event.key === 'watchStorage') {
+        // 处理 watchStorage 键的变化
+        console.log('watchStorage changed to:', event.newValue)
+        // 更新组件状态或其他操作
+        this.getData(this.configName, event.newValue)
+        this.$forceUpdate()
+      }
+    },
+    async getData (config, parameter) {
+      this.configName = config
+      getConfigByName(config, 'af-his', res => {
+        this.config = res
+        runLogic(res.mainLogic, { data: parameter }, 'af-his').then(result => {
+          console.log(result)
+          this.config.showData = result
+          this.activeKey = this.config.showData.map((_, panelIndex) => panelIndex.toString())
+          this.listData = result.listData
+        })
+      })
+    },
+    handleChange (keys) {
+      this.activeKey = keys
+    },
+  },
+  watch: {
+    queryParamsName: {
+      handler (newValue) {
+        this.getData(newValue, null)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.header-content {
+  display: flex;
+  align-items: center;
+  gap: 24px;
+}
+
+.header-text {
+  margin-right: 16px;
+  font-size: 16px;
+  font-weight: 800; /* 默认加粗 */
+}
+
+.info-item {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 12px;
+  color: #888888;
+}
+
+.time-item {
+  margin-left: auto;
+  text-align: right;
+}
+
+/* 覆盖 ant-design-vue 的默认样式 */
+:deep(.ant-collapse-header) {
+  align-items: center !important;
+}
+
+:deep(.ant-collapse-header-text) {
+  flex: 1;
+}
+
+:deep(.ant-collapse-content > .ant-collapse-content-box) {
+  padding: 0;
+}
+
+:deep(.ant-card-body) {
+  padding: 8px;
+}
+</style>

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

@@ -103,18 +103,24 @@ export default {
       this.loaded = true
     },
     getValues (option, value, values) {
+      const _values = []
       for (const item of option) {
         if (value.includes(item.value)) {
           values.push(item.value)
+          _values.push(item.value)
           // 找到匹配节点后，递归添加所有子节点的值
           if (item.children && item.children.length) {
             this.getAllChildrenValues(item.children, values)
           }
         }
         if (item.children && item.children.length) {
-          this.getValues(item.children, value, values)
+          const tempV = this.getValues(item.children, value, values)
+          if (tempV.length === item.children.length) {
+            values.push(item.value)
+          }
         }
       }
+      return _values
     },
     getAllChildrenValues (children, values) {
       for (const child of children) {
@@ -123,6 +129,7 @@ export default {
           this.getAllChildrenValues(child.children, values)
         }
       }
+      return values
     },
     // 获取树形选择框数据
     getTreeData () {

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

@@ -24,7 +24,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值