vue2-client 1.8.32 → 1.8.33

package/.env

@@ -14,3 +14,4 @@ VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
 VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
 VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405
+VUE_APP_SYSTEM_NAME=af-system

package/.eslintrc.js

@@ -3,7 +3,7 @@ module.exports = {
   env: {
     node: true
   },
-  'extends': [
+  extends: [
     'plugin:vue/essential',
     'plugin:vue/strongly-recommended',
     '@vue/standard'
@@ -17,10 +17,11 @@ module.exports = {
     'vue/max-attributes-per-line': [
       2,
       {
-        'singleline': 5,
-        'multiline': {
-          'max': 1,
-          'allowFirstLine': false
+        singleline: {
+          max: 5
+        },
+        multiline: {
+          max: 1,
         }
       }
     ],
@@ -35,38 +36,45 @@ module.exports = {
     'vue/html-closing-bracket-newline': 0,
     'vue/no-parsing-error': 0,
     'vue/name-property-casing': 0,
+    'vue/multi-word-component-names': 0,
+    'vue/require-valid-default-prop': 0,
+    'no-template-curly-in-string': 0,
+    'vue/no-mutating-props': 0,
+    'no-useless-escape': 0,
     'no-tabs': 0,
-    'quotes': [
+    'multiline-ternary': 0,
+    'object-shorthand': 0,
+    quotes: [
       2,
       'single',
       {
-        'avoidEscape': true,
-        'allowTemplateLiterals': true
+        avoidEscape: true,
+        allowTemplateLiterals: true
       }
     ],
-    'semi': [
+    semi: [
       2,
       'never',
       {
-        'beforeStatementContinuationChars': 'never'
+        beforeStatementContinuationChars: 'never'
       }
     ],
     'no-delete-var': 2,
     'prefer-const': [
       2,
       {
-        'ignoreReadBeforeAssign': false
+        ignoreReadBeforeAssign: false
       }
     ],
     'template-curly-spacing': 'off',
-    'indent': 'off',
+    indent: 'off',
     // 必须使用全等: false
-    'eqeqeq': 0,
+    eqeqeq: 0,
     // 可以使用!! 双重否定
     'no-extra-boolean-cast': 'off'
   },
   parserOptions: {
-    parser: 'babel-eslint'
+    parser: '@babel/eslint-parser'
   },
   overrides: [
     {

package/CHANGELOG.md

@@ -1,6 +1,61 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.33 -2024-1-18 @江超**
+- 获取配置改为openApi方式
+
+**1.8.30 -2024-1-10 @张振宇**
+- 微前端兼容
+
+**1.8.26 -2024-1-10 @杨亚文**
+- 解决单页面为首页时首次登录不加载问题
+
+**1.8.23 -2023-12-28 @杨亚文**
+- 解决条件导出功能bug
+
+**1.8.22 -2023-12-27 @江超**
+- 解决导出功能在v4环境下的地址错误问题
+
+**1.8.20 -2023-12-21 @江超**
+- 修复滚动条样式问题
+- 售后问题登记页面增加处理结果
+
+**1.8.19 -2023-12-07 @江超**
+- 鉴权相关修改
+
+**1.8.18 -2023-12-07 @江超**
+- 完善单页面组件功能
+
+**1.8.15 - 1.8.17 -2023-11-23 @张振宇**
+- 调整配置化组件
+
+**1.8.14 - 1.8.15 -2023-11-23 @江超**
+- 完善导入功能的返回值
+
+**1.8.13 -2023-11-21 @张振宇**
+- 配置中心增加动态表名功能
+
+**1.8.12 -2023-11-20 @江超**
+- 完成查询配置通用导入和模板下载功能
+
+**1.8.11 -2023-11-08 @刘懿**
+- XStepView接入琉璃配置中心错误修改
+
+**1.8.10 -2023-11-07 @江超**
+- XStepView接入琉璃配置中心
+
+**1.8.9 -2023-10-27 @江超**
+- 完成webpack5的切换
+
+**1.7.20 -2023-10-11 @江超**
+- 跳转首页问题修改
+
+**1.7.19 -2023-10-11 @江超**
+- 菜单头部可配置
+
+**1.7.15 - 1.7.18 -2023-10-11 @江超**
+- 查询配置生成界面调整
+
 **1.7.14 -2023-10-10 @江超**
 - webConfig在开发环境下不存储到indexedDB中
 

package/babel.config.js

@@ -9,7 +9,13 @@ if (IS_PROD) {
 module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset',
-    ['@vue/babel-preset-jsx', { 'injectH': false }]
+    ['@vue/babel-preset-jsx', { injectH: false }]
   ],
-  plugins
+  plugins,
+  env: {
+    test: {
+      presets: ['@babel/preset-env'],
+      plugins: ['istanbul']
+    }
+  }
 }

package/docs/index.md

@@ -12,7 +12,8 @@
 * [XFormCol 适用于表单的通用响应式栅格a-col封装](../src/base-client/components/common/XFormCol/index.md)
 * [XFormTable 动态查询控件，进一步整合了XTable和XForm](../src/base-client/components/common/XFormTable/index.md)
 * [XTable 动态表格控件，根据JSON配置生成一个完整的动态表格](../src/base-client/components/common/XTable/index.md)
-
+* [XTable 动态表格控件，根据JSON配置生成一个完整的动态表格](../src/base-client/components/common/XTable/index.md)
+*
 ### iot
 * [CustomerDetailsView 客户详情页](../src/base-client/components/iot/CustomerDetailsView/index.md)
 * [DeviceDetailsView 档案详情页](../src/base-client/components/iot/DeviceDetailsView/index.md)

package/index.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { initRouter } from '@vue2-client/router'
+import { initRouter } from '@vue2-client/router/index.js'
 import { initI18n } from '@vue2-client/utils/i18n'
 import bootstrap from '@vue2-client/bootstrap'
 import { modules } from '@vue2-client/store'

package/jest-transform-stub.js

@@ -0,0 +1,8 @@
+module.exports = {
+    process () {
+      return 'module.exports = {};'
+    },
+    getCacheKey () {
+      return 'lessTransform'
+    },
+  }

package/jest.config.js

@@ -1,3 +1,21 @@
+const path = require('path')
+require('dotenv').config({ path: path.resolve(__dirname, '.env') })
+
 module.exports = {
-  preset: '@vue/cli-plugin-unit-jest'
-}
+    setupFiles: ['<rootDir>/jest.setup.js'],
+    moduleNameMapper: {
+      '^@vue2-client/(.*)$': '<rootDir>/src/$1',
+      '\\.(css|less)$': 'identity-obj-proxy',
+    },
+    moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx', 'node', 'vue'], // 注意 'vue' 在这里
+    testEnvironment: 'jsdom',
+    transform: {
+      '^.+\\.js$': 'babel-jest',
+      '^.+\\.vue$': 'vue-jest',
+      '^.+\\.less$': 'jest-transform-stub', // 添加这一行
+    },
+    transformIgnorePatterns: [
+      '/node_modules/(?!ant-design-vue)',
+    ]
+    // 其他 Jest 配置项...
+  }

package/jest.setup.js

@@ -0,0 +1,7 @@
+global.matchMedia = global.matchMedia || function () {
+  return {
+    matches: false,
+    addListener: function () {},
+    removeListener: function () {}
+  }
+}

package/package.json

@@ -1,40 +1,47 @@
 {
   "name": "vue2-client",
-  "version": "1.8.32",
+  "version": "1.8.33",
   "private": false,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode mac",
     "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"
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@antv/data-set": "^0.11.8",
     "@antv/g2plot": "^2.4.29",
     "@vue/babel-preset-jsx": "^1.4.0",
+    "amis": "^3.4.3",
     "animate.css": "^4.1.1",
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",
     "clipboard": "^2.0.11",
-    "core-js": "^3.30.1",
+    "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",
     "enquire.js": "^2.1.6",
     "file-saver": "^2.0.5",
     "highlight.js": "^11.7.0",
     "js-base64": "^3.7.5",
     "js-cookie": "^2.2.1",
     "jsencrypt": "^3.3.2",
+    "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
     "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.6.14",
+    "vue": "^2.7.14",
     "vue-i18n": "^8.28.2",
     "vue-json-viewer": "^2.2.22",
     "vue-router": "^3.6.5",
@@ -45,39 +52,41 @@
   },
   "devDependencies": {
     "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.21.4",
-    "@vue/cli-plugin-babel": "^4.5.19",
-    "@vue/cli-plugin-eslint": "^4.5.19",
-    "@vue/cli-service": "^4.5.19",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "@vuepress/plugin-back-to-top": "^1.9.9",
-    "babel-eslint": "^10.1.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-jest": "^26.6.3",
     "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^4.0.1",
+    "compression-webpack-plugin": "^10.0.0",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
     "deepmerge": "^4.3.1",
-    "document-register-element": "^1.14.10",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
-    "eslint-plugin-vue": "^6.2.2",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
     "fast-deep-equal": "^3.1.3",
+    "jest": "^26.6.3",
+    "jest-environment-jsdom": "^26.6.2",
+    "jest-transform-stub": "^2.0.0",
     "less-loader": "^6.2.0",
     "script-loader": "^0.7.2",
+    "ignore-loader": "^0.1.2",
     "style-resources-loader": "^1.5.0",
     "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-custom-element": "^3.3.0",
-    "vue-template-compiler": "2.6.14",
-    "vuepress": "^1.9.9",
-    "webpack": "^4.46.0",
+    "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.2"
+    "whatwg-fetch": "^3.6.19"
   },
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "not ie <= 10"
+    "not dead",
+    "not ie 11"
   ]
 }

package/src/App.vue

@@ -27,6 +27,8 @@ export default {
     this.setWeekModeTheme(this.weekMode)
     // 设置系统版本
     setSystemVersion(this.compatible)
+    // 获取基座应用得路由地址
+    this.setBaseAppRouting()
   },
   watch: {
     weekMode (val) {
@@ -42,18 +44,26 @@ export default {
     'theme.mode': {
       immediate: true,
       handler: function (val) {
-        const closeMessage = this.$message.loading(`您选择了主题模式 ${val}, 正在切换...`)
-        themeUtil.changeThemeColor(this.theme.color, val).then(closeMessage)
+        if (process.env.NODE_ENV === 'production') {
+          const closeMessage = this.$message.loading(`您选择了主题模式 ${val}, 正在切换...`)
+          themeUtil.changeThemeColor(this.theme.color, val).then(closeMessage)
+        } else {
+          console.info('为保证构建性能，关闭开发环境下的主题模式切换')
+        }
       }
     },
     'theme.color': {
       immediate: true,
       handler: function (val) {
-        const closeMessage = this.$message.loading(`您选择了主题色 ${val}, 正在切换...`)
-        themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
+        if (process.env.NODE_ENV === 'production') {
+          const closeMessage = this.$message.loading(`您选择了主题色 ${val}, 正在切换...`)
+          themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
+        } else {
+          console.info('为保证构建性能，关闭开发环境下的主题色切换')
+        }
       }
     },
-    'layout': function () {
+    layout: function () {
       window.dispatchEvent(new Event('resize'))
     }
   },
@@ -69,6 +79,22 @@ export default {
         document.body.classList.remove('week-mode')
       }
     },
+    setBaseAppRouting () {
+      let baseApp = '/login'
+      if (window.__MICRO_APP_ENVIRONMENT__) {
+        const data = window.microApp.getData() // 获取主应用下发的data数据
+        if (data.baseroute) {
+          baseApp = data.baseroute
+        }
+        window.microApp.addDataListener((_data) => {
+          if (_data.baseroute) {
+            baseApp = _data.baseroute
+          }
+        })
+        console.log('microApp', window.microApp)
+        this.$router.push({ path: baseApp })
+      }
+    },
     setLanguage (lang) {
       this.$i18n.locale = lang
       switch (lang) {
@@ -97,6 +123,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  #id{
-  }
+#id {
+}
 </style>

package/src/base-client/components/common/AMisRender/index.js

@@ -0,0 +1,3 @@
+import AMisRender from './index.vue'
+
+export default AMisRender

package/src/base-client/components/common/AMisRender/index.vue

@@ -0,0 +1,257 @@
+<template><div ref="domRef">Loading...</div></template>
+
+<script>
+// import "amis/sdk/sdk.js";
+// import "amis/sdk/sdk.css";
+// import "amis/sdk/iconfont.css";
+
+// 可以不引用, 如果你不想要任何辅助类样式的话 (比如 `m-t-xs` 这种)
+// https://aisuda.bce.baidu.com/amis/zh-CN/style/index
+// import 'amis/sdk/helper.css'
+import qs from 'qs'
+import Vue from 'vue'
+import Index from '@vue2-client/base-client/components/index.js'
+let React
+let amisLib
+let scoped
+const apps = {}
+function loadScript (src, callback) {
+  const script = document.createElement('script')
+  script.setAttribute('type', 'text/javascript')
+  script.setAttribute('src', src)
+  script.onload = () => callback()
+  script.onerror = () => callback(new Error(`Failed to load ${src}`))
+  document.body.appendChild(script)
+}
+const vueList = {}
+
+// eslint-disable-next-line no-unused-vars
+function CustomComponent (props, dom) {
+  const store = Vue.$store
+  const router = Vue.$router
+  const i18n = Vue.$i18n
+  console.log('props', props)
+  React.useEffect(function () {
+    vueList[props.$schema.name] = new Vue({
+      router,
+      store,
+      i18n,
+      render: h => h(Index[props.$schema.type], {
+        props: props.$schema
+      })
+    }).$mount(dom.current)
+  }, [])
+  const app = React.createElement('div', {
+    ref: dom
+  })
+  if (apps[props.name] !== undefined) {
+    const vue = vueList[props.$schema.name]
+    vue.$children[0].active(props.data)
+  } else {
+    apps[props.name] = app
+  }
+  return app
+}
+
+function loadStyles (styles) {
+  for (const path of styles) {
+    const style = document.createElement('link')
+    style.setAttribute('rel', 'stylesheet')
+    style.setAttribute('type', 'text/css')
+    style.setAttribute('href', path)
+    document.head.appendChild(style)
+  }
+}
+// eslint-disable-next-line no-unused-vars
+function appstyle (data) {
+  console.log('111111111111')
+}
+// 动态导入组件
+
+function loadSDK () {
+  return new Promise((resolve, reject) => {
+    if (window.amisRequire) {
+      resolve()
+      return
+    }
+    loadStyles([
+      '/amis/sdk/sdk.css',
+      '/amis/sdk/helper.css',
+      '/amis/sdk/iconfont.css',
+    ])
+    loadScript('/amis/sdk/sdk.js', (err) => {
+      if (err) {
+        reject(err)
+        return
+      }
+      resolve()
+    })
+  })
+}
+
+export default {
+  name: 'AMISRenderer',
+  components: {},
+  props: {
+    schema: {
+      type: Object,
+      default: {
+        type: 'page',
+        body: 'Hello World!',
+      },
+    },
+    locals: {
+      type: Object,
+      default: () => ({}),
+    },
+    props: {
+      type: Object,
+      default: () => ({}),
+    },
+    env: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data () {
+    const router = this.$router
+    return {
+      // 这里面的数据所有 amis 页面都可以获取到
+      // 可以用来放一下公共数据，比如用户信息等
+      // 不要放受控数据，受控数据应该通过 data 下发
+      context: {
+        siteName: 'AMIS DEMO',
+      },
+      get location () {
+        const current = router.history.current
+        return {
+          pathname: current.path,
+          hash: current.hash,
+          query: current.query,
+          search: `?${qs.stringify(current.query)}`,
+        }
+      },
+      loading: false,
+      amisInstance: null,
+      unmounted: false,
+      applist: {}
+    }
+  },
+
+  watch: {
+    locals: function () {
+      this.updateProps()
+    },
+    props: function () {
+      this.updateProps()
+    },
+    $route: function () {
+      this.updateProps()
+    },
+  },
+  async mounted () {
+    try {
+      this.loading = true
+      await loadSDK()
+    } finally {
+      this.loading = false
+    }
+    if (this.unmounted) {
+      return
+    }
+    React = window.amisRequire('react')
+    amisLib = window.amisRequire('amis')
+    scoped = window.amisRequire('amis/embed')
+    const { normalizeLink } = amisLib
+    const router = this.$router
+    // eslint-disable-next-line no-prototype-builtins
+    // console.log('this.schema.type', this.schema.type)
+
+    amisLib.Renderer({
+      test: new RegExp(`(^|\/)${this.schema.type}`)
+    })(props => CustomComponent(props, this.$el))
+
+    const instance = scoped.embed(
+      this.$el,
+      this.schema,
+      {
+        data: {
+          ...this.locals,
+        },
+        context: this.context,
+        location: this.location,
+
+        // todo 下发 location 对象
+        ...this.props,
+      },
+      {
+        // 覆盖 amis env
+        // 参考 https://aisuda.bce.baidu.com/amis/zh-CN/docs/start/getting-started#sdk
+        jumpTo: (to, action) => {
+          if (to === 'goBack') {
+            return router.go(-1)
+          }
+
+          to = normalizeLink(to, this.location)
+
+          if (action?.actionType === 'url') {
+            action.blank === false ? router.push(to) : window.open(to)
+            return
+          }
+
+          // 主要是支持 nav 中的跳转
+          if (action && to && action.target) {
+            window.open(to, action.target)
+            return
+          }
+
+          if (/^https?:\/\//.test(to)) {
+            window.location.replace(to)
+          } else {
+            router.push(to)
+          }
+        },
+
+        updateLocation: (location, replace) => {
+          if (location === 'goBack') {
+            return router.go(-1)
+          }
+
+          location = normalizeLink(location, this.location)
+          replace ? router.replace(location) : router.replace(location)
+        },
+
+        ...this.env,
+      },
+      () => {
+        this.$emit('ready', {
+          instance,
+        })
+      }
+    )
+    this.amisInstance = instance
+  },
+
+  methods: {
+    updateProps () {
+      // eslint-disable-next-line no-unused-expressions
+      this.amisInstance?.updateProps({
+        data: {
+          ...this.locals,
+        },
+        context: this.context,
+        ...this.props,
+      })
+    },
+    initConfig () {
+      console.warn('initConfig')
+    }
+  },
+
+  destroyed () {
+    this.unmounted = true
+    // eslint-disable-next-line no-unused-expressions
+    this.amisInstance?.unmount()
+  },
+}
+</script>