vue2-client 1.13.25 → 1.13.26

package/package.json

@@ -1,107 +1,107 @@
-{
-  "name": "vue2-client",
-  "version": "1.13.25",
-  "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",
-    "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.13.26",
+  "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",
+    "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/XCollapseDemo.vue

@@ -0,0 +1,15 @@
+<template>
+  <x-collapse :query-params-name="openPrescriptionConfig" />
+</template>
+
+<script>
+import XCollapse from '@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'
+export default {
+  name: 'Demo',
+  components: { XCollapse }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/base-client/components/common/XDescriptions/XDescriptions.vue

@@ -1,174 +1,174 @@
-<template>
-  <div class="row">
-    <div class="content">
-      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
-      <div v-show="!loading">
-        <template v-if="!loadError">
-          <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
-            <a-descriptions-item
-              v-for="(value, key) in realData"
-              :key="key"
-              :label="key">
-              {{ formatText(value) }}
-            </a-descriptions-item>
-          </a-descriptions>
-        </template>
-        <template v-else>
-          <a-empty>
-            <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
-          </a-empty>
-        </template>
-      </div>
-    </div>
-    <div class="extra" v-if="extraShow">
-      <slot name="addonAfter"/>
-    </div>
-  </div>
-</template>
-<script>
-
-import { mapState } from 'vuex'
-import { getRealKeyData } from '@vue2-client/utils/formatter'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XDescriptions',
-  components: {
-  },
-  props: {
-    // 标题
-    title: {
-      type: String,
-      required: true
-    },
-    // 内容
-    content: {
-      type: Object,
-      required: true
-    },
-    // 模型名
-    model: {
-      type: String,
-      required: false,
-      default: ''
-    },
-    // 配置名称
-    configName: {
-      type: String,
-      required: true
-    },
-    // 配置所属命名空间
-    serviceName: {
-      type: String,
-      default: undefined
-    },
-    env: {
-      type: String,
-      default: 'prod'
-    },
-    // 每列显示数量
-    column: {
-      type: Number,
-      default: 2
-    },
-    // 每列显示数量
-    getRealData: {
-      type: Boolean,
-      default: false
-    },
-    // 是否展示插槽
-    extraShow: {
-      type: Boolean,
-      default: true
-    }
-  },
-  created () {
-    this.initConfig()
-  },
-  data () {
-    return {
-      // 加载状态
-      loading: false,
-      loadError: false,
-      realData: undefined
-    }
-  },
-  computed: {
-    ...mapState('setting', { isMobile: 'isMobile' })
-  },
-  methods: {
-    initConfig () {
-      this.loading = true
-      this.loadError = false
-      if (this.configName) {
-        this.getConfig()
-      } else {
-        this.loading = false
-        this.loadError = true
-      }
-    },
-    getConfig () {
-      getConfigByName(this.configName, this.serviceName, (res) => {
-        const mapIndex = {}
-        const result = {}
-        if (res.formJson) {
-          res.formJson.filter(item => {
-            const model = item.model
-            return model.indexOf(this.model) > 0
-          })[0].groupItems.forEach(item => {
-            mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
-          })
-          for (const key of Object.keys(this.content)) {
-            const name = mapIndex[key]
-            if (name) {
-              result[name] = this.content[key]
-            } else {
-              result[key] = this.content[key]
-            }
-          }
-        } else if (res.column) {
-          // [{label:'标签1',filed:'字段1'}]
-          let content = {}
-          if (this.getRealData) {
-            content = getRealKeyData(this.content)
-          } else {
-            content = this.content
-          }
-          if (typeof content === 'string') {
-            content = JSON.parse(content)
-          }
-          res.column.forEach(item => {
-            result[item.label] = content[item.filed]
-          })
-        }
-        this.realData = result
-        this.loading = false
-      }, this.env === 'dev')
-    },
-    // 文字格式化
-    formatText (value) {
-      return value ?? '--'
-    }
-  }
-}
-</script>
-<style>
-.row {
-  display: flex;
-
-  .content {
-    -webkit-box-flex: 1;
-    flex: auto;
-    -ms-flex: auto;
-  }
-
-  .extra {
-    flex: 0 1 auto;
-    -webkit-box-flex: 0;
-    -ms-flex: 0 1 auto;
-    min-width: 242px;
-    margin-left: 88px;
-    text-align: right;
-  }
-}
-</style>
+<template>
+  <div class="row">
+    <div class="content">
+      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
+      <div v-show="!loading">
+        <template v-if="!loadError">
+          <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
+            <a-descriptions-item
+              v-for="(value, key) in realData"
+              :key="key"
+              :label="key">
+              {{ formatText(value) }}
+            </a-descriptions-item>
+          </a-descriptions>
+        </template>
+        <template v-else>
+          <a-empty>
+            <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
+          </a-empty>
+        </template>
+      </div>
+    </div>
+    <div class="extra" v-if="extraShow">
+      <slot name="addonAfter"/>
+    </div>
+  </div>
+</template>
+<script>
+
+import { mapState } from 'vuex'
+import { getRealKeyData } from '@vue2-client/utils/formatter'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XDescriptions',
+  components: {
+  },
+  props: {
+    // 标题
+    title: {
+      type: String,
+      required: true
+    },
+    // 内容
+    content: {
+      type: Object,
+      required: true
+    },
+    // 模型名
+    model: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    // 配置名称
+    configName: {
+      type: String,
+      required: true
+    },
+    // 配置所属命名空间
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    // 每列显示数量
+    column: {
+      type: Number,
+      default: 2
+    },
+    // 每列显示数量
+    getRealData: {
+      type: Boolean,
+      default: false
+    },
+    // 是否展示插槽
+    extraShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  created () {
+    this.initConfig()
+  },
+  data () {
+    return {
+      // 加载状态
+      loading: false,
+      loadError: false,
+      realData: undefined
+    }
+  },
+  computed: {
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+  methods: {
+    initConfig () {
+      this.loading = true
+      this.loadError = false
+      if (this.configName) {
+        this.getConfig()
+      } else {
+        this.loading = false
+        this.loadError = true
+      }
+    },
+    getConfig () {
+      getConfigByName(this.configName, this.serviceName, (res) => {
+        const mapIndex = {}
+        const result = {}
+        if (res.formJson) {
+          res.formJson.filter(item => {
+            const model = item.model
+            return model.indexOf(this.model) > 0
+          })[0].groupItems.forEach(item => {
+            mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
+          })
+          for (const key of Object.keys(this.content)) {
+            const name = mapIndex[key]
+            if (name) {
+              result[name] = this.content[key]
+            } else {
+              result[key] = this.content[key]
+            }
+          }
+        } else if (res.column) {
+          // [{label:'标签1',filed:'字段1'}]
+          let content = {}
+          if (this.getRealData) {
+            content = getRealKeyData(this.content)
+          } else {
+            content = this.content
+          }
+          if (typeof content === 'string') {
+            content = JSON.parse(content)
+          }
+          res.column.forEach(item => {
+            result[item.label] = content[item.filed]
+          })
+        }
+        this.realData = result
+        this.loading = false
+      }, this.env === 'dev')
+    },
+    // 文字格式化
+    formatText (value) {
+      return value ?? '--'
+    }
+  }
+}
+</script>
+<style>
+.row {
+  display: flex;
+
+  .content {
+    -webkit-box-flex: 1;
+    flex: auto;
+    -ms-flex: auto;
+  }
+
+  .extra {
+    flex: 0 1 auto;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 1 auto;
+    min-width: 242px;
+    margin-left: 88px;
+    text-align: right;
+  }
+}
+</style>