vue2-client 1.20.61 → 1.20.63

package/.idea/af-vue2-client.iml

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

package/.idea/deployment.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
+    <serverData>
+      <paths name="50.4">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+    </serverData>
+  </component>
+</project>

package/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="temurin-25" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

package/package.json

@@ -1,115 +1,116 @@
-{
-  "name": "vue2-client",
-  "version": "1.20.61",
-  "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",
-    "html-to-image": "^1.11.13",
-    "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",
-    "ol": "10.3.1",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "splitpanes": "^2.4.1",
-    "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-config-prettier": "^10.1.8",
-    "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.20.63",
+  "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",
+    "html-to-image": "^1.11.13",
+    "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",
+    "ol": "10.3.1",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "splitpanes": "^2.4.1",
+    "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",
+    "vue3-sfc-loader": "^0.9.5",
+    "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-config-prettier": "^10.1.8",
+    "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/VueSfcComponent/CloudVueSfcComponent.vue

@@ -0,0 +1,233 @@
+<script>
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+import { loadModule } from 'vue3-sfc-loader/vue2'
+import { VueSfcModuleCache } from '@vue2-client/utils/module-loader'
+
+export default {
+  name: 'CloudVueSfcComponent',
+  props: {
+    configName: {
+      type: String,
+      required: true
+    },
+    serviceName: {
+      type: String,
+      default: process.env.VUE_APP_SYSTEM_NAME
+    }
+  },
+  data() {
+    return {
+      componentDefinition: null,
+      loading: false,
+      error: null,
+      injectedStyles: []
+    }
+  },
+  computed: {
+    previewStyles() {
+      return {
+        width: '100%',
+        height: '100%',
+        overflow: 'auto'
+      }
+    }
+  },
+  created() {
+    this.loadSfcFromCloud()
+  },
+  beforeDestroy() {
+    this.cleanupInjectedStyles()
+  },
+  methods: {
+    cleanupInjectedStyles() {
+      if (this.injectedStyles && this.injectedStyles.length > 0) {
+        this.injectedStyles.forEach(style => {
+          if (style.parentNode) {
+            style.parentNode.removeChild(style)
+          }
+        })
+        this.injectedStyles = []
+      }
+    },
+
+    /**
+     * 刷新组件 - 重新从云端获取并渲染
+     */
+    refresh() {
+      this.loadSfcFromCloud()
+    },
+
+    /**
+     * 从云端加载 SFC
+     */
+    async loadSfcFromCloud() {
+      this.loading = true
+      this.error = null
+      this.cleanupInjectedStyles()
+
+      try {
+        // 1. 获取云端配置
+        const config = await getConfigByNameAsync(this.configName, this.serviceName)
+
+        if (!config || !config.source) {
+          this.error = '配置内容为空'
+          this.componentDefinition = null
+          return
+        }
+
+        const sfcCode = typeof config.source === 'string' ? config.source : JSON.stringify(config.source)
+
+        if (!sfcCode || !sfcCode.trim()) {
+          this.error = '配置内容为空'
+          this.componentDefinition = null
+          return
+        }
+
+        // 2. 获取 moduleCache
+        const moduleCache = VueSfcModuleCache.toObject()
+
+        // 3. 准备编译选项
+        const timestamp = Date.now()
+        const virtualUrl = `cloud-sfc.vue?t=${timestamp}`
+
+        const options = {
+          moduleCache,
+          getFile: (url) => {
+            if (url.startsWith('cloud-sfc.vue')) {
+              return {
+                getContentData: (asBinary) => asBinary ? null : sfcCode,
+                type: '.vue'
+              }
+            }
+            console.warn('[CloudVueSfcComponent] getFile 被非 cloud-sfc 路径调用:', url)
+            return {
+              getContentData: () => null,
+              type: ''
+            }
+          },
+          addStyle: (textContent) => {
+            const style = document.createElement('style')
+            style.textContent = textContent
+            document.head.appendChild(style)
+            this.injectedStyles.push(style)
+          }
+        }
+
+        // 4. 编译 SFC
+        const component = await loadModule(virtualUrl, options)
+
+        if (component && typeof component === 'object') {
+          this.componentDefinition = component
+        } else {
+          this.error = '组件加载失败，返回结果为空'
+          this.componentDefinition = null
+        }
+      } catch (e) {
+        console.error('[CloudVueSfcComponent] 加载错误:', e)
+        this.error = this.formatError(e)
+        this.componentDefinition = null
+      } finally {
+        this.loading = false
+      }
+    },
+
+    formatError(e) {
+      if (e.message) {
+        return e.message.replace(/https?:\/\/[^\s]+/g, '').trim() || '组件渲染失败'
+      }
+      if (typeof e === 'string') {
+        return e
+      }
+      return '组件渲染失败'
+    }
+  },
+  render(h) {
+    if (this.loading) {
+      return h('div', {
+        class: 'cloud-vue-sfc-component',
+        style: this.previewStyles
+      }, [
+        h('div', {
+          class: 'loading-wrapper',
+          style: { display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100%' }
+        }, [
+          h('a-spin', { props: { size: 'large' } }),
+          h('span', { style: { marginLeft: '12px', color: '#666' } }, '正在加载云端组件...')
+        ])
+      ])
+    }
+
+    if (this.error) {
+      return h('div', {
+        class: 'cloud-vue-sfc-component',
+        style: this.previewStyles
+      }, [
+        h('div', {
+          class: 'error-wrapper',
+          style: { padding: '16px', color: '#f5222d' }
+        }, [
+          h('a-icon', { props: { type: 'close-circle', theme: 'filled', style: { fontSize: '20px', marginRight: '8px' } } }),
+          h('span', { style: { fontWeight: '500' } }, '加载错误'),
+          h('pre', {
+            style: {
+              marginTop: '8px',
+              padding: '12px',
+              background: '#fff2f0',
+              borderRadius: '4px',
+              fontSize: '12px',
+              whiteSpace: 'pre-wrap',
+              wordBreak: 'break-all'
+            }
+          }, this.error),
+          h('a-button', {
+            props: { type: 'link', icon: 'reload', style: { marginTop: '8px' } },
+            on: { click: this.refresh }
+          }, '重试')
+        ])
+      ])
+    }
+
+    if (this.componentDefinition) {
+      try {
+        return h(this.componentDefinition, { props: this.$attrs })
+      } catch (err) {
+        console.error('[CloudVueSfcComponent] 渲染错误:', err)
+        return h('div', {
+          style: { padding: '16px', color: '#f5222d' }
+        }, '渲染组件时出错: ' + err.message)
+      }
+    }
+
+    return h('div', {
+      class: 'cloud-vue-sfc-component',
+      style: this.previewStyles
+    }, [
+      h('div', {
+        class: 'empty-wrapper',
+        style: { display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100%', color: '#999' }
+      }, [
+        h('a-empty', {
+          props: { description: '暂无云端组件内容' }
+        })
+      ])
+    ])
+  }
+}
+</script>
+
+<style scoped lang="less">
+.cloud-vue-sfc-component {
+  background: #fff;
+  border: 1px solid #e8e8e8;
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+.loading-wrapper,
+.error-wrapper,
+.content-wrapper,
+.empty-wrapper {
+  width: 100%;
+  height: 100%;
+}
+</style>