vue2-client 1.13.13 → 1.13.14

package/package.json

@@ -1,107 +1,107 @@
-{
-  "name": "vue2-client",
-  "version": "1.13.13",
-  "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.14",
+  "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/XInput/XInput.vue

@@ -1,101 +1,116 @@
-<template>
-  <div class="x-input-wrapper">
-    <a-input
-      v-model="innerValue"
-      v-bind="$attrs"
-      :placeholder="config?.placeholder"
-      :size="config?.size"
-      :maxLength="config?.maxLength"
-      :disabled="config?.disabled"
-      :allowClear="config?.allowClear"
-      @change="handleInput"
-      @pressEnter="handleSearch"
-    >
-      <template v-if="config?.prefix" #prefix>
-        <a-icon :type="config.prefix" @click="handleSearch" class="clickable-icon" />
-      </template>
-      <template v-if="config?.suffix" #suffix>
-        <a-icon :type="config.suffix" @click="handleSearch" class="clickable-icon" />
-      </template>
-    </a-input>
-  </div>
-</template>
-
-<script>
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XInput',
-  inheritAttrs: false,
-  props: {
-    value: {
-      type: [String, Number],
-      default: ''
-    },
-    queryParamsName: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      innerValue: this.value || '',
-      config: null
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  emits: ['search'],
-  methods: {
-    runLogic,
-    async getData (data) {
-      getConfigByName(data, 'af-his', res => {
-        this.config = res
-        if (res.defaultValue !== undefined) {
-          this.innerValue = res.defaultValue
-        }
-      })
-    },
-    handleInput (e) {
-      const value = e.target.value
-      this.innerValue = value
-      this.$emit('search', value)
-    },
-    handleSearch () {
-      // 统一的搜索事件：将当前输入值发送给父组件
-      this.$emit('search', this.innerValue)
-    }
-  },
-  watch: {
-    value: {
-      handler (newValue) {
-        this.innerValue = newValue
-      },
-      immediate: true
-    },
-    queryParamsName: {
-      handler (newValue) {
-        this.getData(newValue)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped>
-.x-input-wrapper {
-  position: relative;
-  display: inline-block;
-  width: 100%;
-}
-
-:deep(.clickable-icon) {
-  cursor: pointer;
-}
-
-:deep(.clickable-icon:hover) {
-  color: #1890ff;
-}
-</style>
+<template>
+  <div class="x-input-wrapper">
+    <div class="input-container">
+      <span v-if="config?.label" class="input-label">{{ config.label }}</span>
+      <a-input
+        v-model="innerValue"
+        v-bind="$attrs"
+        :placeholder="config?.placeholder"
+        :size="config?.size"
+        :maxLength="config?.maxLength"
+        :disabled="config?.disabled"
+        :allowClear="config?.allowClear"
+        @change="handleInput"
+        @pressEnter="handleSearch"
+      >
+        <template v-if="config?.prefix" #prefix>
+          <a-icon :type="config.prefix" @click="handleSearch" class="clickable-icon" />
+        </template>
+        <template v-if="config?.suffix" #suffix>
+          <a-icon :type="config.suffix" @click="handleSearch" class="clickable-icon" />
+        </template>
+      </a-input>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XInput',
+  inheritAttrs: false,
+  props: {
+    value: {
+      type: [String, Number],
+      default: ''
+    },
+    queryParamsName: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      innerValue: this.value || '',
+      config: null
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  emits: ['search'],
+  methods: {
+    runLogic,
+    async getData (data) {
+      getConfigByName(data, 'af-his', res => {
+        this.config = res
+        if (res.defaultValue !== undefined) {
+          this.innerValue = res.defaultValue
+        }
+      })
+    },
+    handleInput (e) {
+      const value = e.target.value
+      this.innerValue = value
+      this.$emit('search', value)
+    },
+    handleSearch () {
+      // 统一的搜索事件：将当前输入值发送给父组件
+      this.$emit('search', this.innerValue)
+    }
+  },
+  watch: {
+    value: {
+      handler (newValue) {
+        this.innerValue = newValue
+      },
+      immediate: true
+    },
+    queryParamsName: {
+      handler (newValue) {
+        this.getData(newValue)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.x-input-wrapper {
+  position: relative;
+  display: inline-block;
+  width: 100%;
+}
+
+.input-container {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+}
+
+.input-label {
+  white-space: nowrap;
+  color: rgba(0, 0, 0, 0.85);
+  min-width: 30px;
+}
+
+:deep(.clickable-icon) {
+  cursor: pointer;
+}
+
+:deep(.clickable-icon:hover) {
+  color: #1890ff;
+}
+</style>

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

@@ -1,99 +1,126 @@
-<template>
-  <div class="x-time-select">
-    <a-range-picker
-      :value="dateRange"
-      :placeholder="['开始日期', '结束日期']"
-      separator="至"
-      :disabled="disabled"
-      :allowClear="allowClear"
-      :format="format"
-      @change="handleDateChange"
-    />
-  </div>
-</template>
-
-<script>
-import moment from 'moment'
-
-export default {
-  name: 'XTimeSelect',
-  props: {
-    value: {
-      type: Array,
-      default: () => []
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    allowClear: {
-      type: Boolean,
-      default: true
-    },
-    format: {
-      type: String,
-      default: 'YYYY/MM/DD'
-    }
-  },
-  data () {
-    return {
-      dateRange: []
-    }
-  },
-  watch: {
-    value: {
-      handler (newVal) {
-        if (newVal && newVal.length === 2) {
-          this.dateRange = [
-            newVal[0] ? moment(newVal[0]) : null,
-            newVal[1] ? moment(newVal[1]) : null
-          ]
-        } else {
-          this.dateRange = []
-        }
-      },
-      immediate: true,
-      deep: true
-    }
-  },
-  methods: {
-    handleDateChange (dates, dateStrings) {
-      this.dateRange = dates
-      console.warn(dateStrings)
-      this.$emit('change', dateStrings)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.x-time-select {
-  position: relative;
-  width: 100%;
-  box-sizing: border-box;
-  display: block;
-}
-.x-time-select :deep(.ant-picker-range),
-.x-time-select :deep(.ant-picker) {
-  width: 100%;
-  height: 30px;
-  border-radius: 7px;
-  background: #FFFFFF;
-  border: 1px solid #E5E9F0;
-}
-.x-time-select :deep(.ant-calendar-picker) {
-  width: 100%;
-  display: block;
-}
-.x-time-select :deep(.ant-calendar-picker-input) {
-  width: 100%;
-  height: 30px;
-  border-radius: 7px;
-  background: #FFFFFF;
-  border: 1px solid #E5E9F0;
-}
-
-.x-time-select :deep(.ant-input) {
-  width: 100%;
-}
-</style>
+<template>
+  <div class="x-time-select">
+    <div class="time-select-container">
+      <span v-if="label" class="time-select-label">{{ label }}</span>
+      <a-range-picker
+        :value="dateRange"
+        :placeholder="['开始日期', '结束日期']"
+        separator="至"
+        :disabled="disabled"
+        :allowClear="allowClear"
+        :format="format"
+        @change="handleDateChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import moment from 'moment'
+
+export default {
+  name: 'XTimeSelect',
+  props: {
+    queryParamsName: {
+      type: String,
+      default: null
+    },
+    value: {
+      type: Array,
+      default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    allowClear: {
+      type: Boolean,
+      default: true
+    },
+    format: {
+      type: String,
+      default: 'YYYY/MM/DD'
+    }
+  },
+  data () {
+    return {
+      dateRange: [],
+      label: ''
+    }
+  },
+  watch: {
+    value: {
+      handler (newVal) {
+        if (newVal && newVal.length === 2) {
+          this.dateRange = [
+            newVal[0] ? moment(newVal[0]) : null,
+            newVal[1] ? moment(newVal[1]) : null
+          ]
+        } else {
+          this.dateRange = []
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    handleDateChange (dates, dateStrings) {
+      this.dateRange = dates
+      console.warn(dateStrings)
+      this.$emit('change', dateStrings)
+    },
+    getData (data) {
+      this.label = data
+    }
+  }
+}
+</script>
+
+<style scoped>
+.x-time-select {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  display: block;
+}
+
+.time-select-container {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.time-select-label {
+  white-space: nowrap;
+  color: rgba(0, 0, 0, 0.85);
+  min-width: 30px;
+}
+
+.x-time-select :deep(.ant-picker-range),
+.x-time-select :deep(.ant-picker) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+.x-time-select :deep(.ant-calendar-picker) {
+  width: 100%;
+  display: block;
+}
+.x-time-select :deep(.ant-calendar-picker-input) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+
+.x-time-select :deep(.ant-input) {
+  width: 100%;
+}
+</style>

package/src/router/async/router.map.js

@@ -53,6 +53,7 @@ routerResource.example = {
   path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelect.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XInput/XInput.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue'),
@@ -78,7 +79,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
   // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
   // component: () => import('@vue2-client/components/FilePreview/FilePreviewDemo.vue'),
-    component: () => import('@vue2-client/pages/ReportGrid/index.vue')
+  //   component: () => import('@vue2-client/pages/ReportGrid/index.vue')
 }
 // routerResource.example = () =>
 //    import('@vue2-client/pages/Example')