vue2-client 1.8.31 → 1.8.32

package/.env

@@ -14,4 +14,3 @@ 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,11 +17,10 @@ module.exports = {
     'vue/max-attributes-per-line': [
       2,
       {
-        singleline: {
-          max: 5
-        },
-        multiline: {
-          max: 1,
+        'singleline': 5,
+        'multiline': {
+          'max': 1,
+          'allowFirstLine': false
         }
       }
     ],
@@ -36,45 +35,38 @@ 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,
-    'multiline-ternary': 0,
-    'object-shorthand': 0,
-    quotes: [
+    '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'
+    parser: 'babel-eslint'
   },
   overrides: [
     {

package/CHANGELOG.md

@@ -1,58 +1,6 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.8.30 -2023-1-10 @张振宇**
-- 微前端兼容
-
-**1.8.26 -2023-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,13 +9,7 @@ if (IS_PROD) {
 module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset',
-    ['@vue/babel-preset-jsx', { injectH: false }]
+    ['@vue/babel-preset-jsx', { 'injectH': false }]
   ],
-  plugins,
-  env: {
-    test: {
-      presets: ['@babel/preset-env'],
-      plugins: ['istanbul']
-    }
-  }
+  plugins
 }

package/docs/index.md

@@ -12,8 +12,7 @@
 * [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/index.js'
+import { initRouter } from '@vue2-client/router'
 import { initI18n } from '@vue2-client/utils/i18n'
 import bootstrap from '@vue2-client/bootstrap'
 import { modules } from '@vue2-client/store'

package/jest.config.js

@@ -1,21 +1,3 @@
-const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '.env') })
-
 module.exports = {
-    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 配置项...
-  }
+  preset: '@vue/cli-plugin-unit-jest'
+}

package/package.json

@@ -1,47 +1,40 @@
 {
   "name": "vue2-client",
-  "version": "1.8.31",
+  "version": "1.8.32",
   "private": false,
   "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode mac",
+    "serve": "vue-cli-service serve",
     "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"
+    "lint:nofix": "vue-cli-service lint --no-fix"
   },
   "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.33.0",
+    "core-js": "^3.30.1",
     "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.7.14",
+    "vue": "2.6.14",
     "vue-i18n": "^8.28.2",
     "vue-json-viewer": "^2.2.22",
     "vue-router": "^3.6.5",
@@ -52,41 +45,39 @@
   },
   "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-jest": "^26.6.3",
+    "@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-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "copy-webpack-plugin": "^11.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
+    "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^4.0.1",
     "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
+    "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",
     "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-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
+    "vue-custom-element": "^3.3.0",
+    "vue-template-compiler": "2.6.14",
+    "vuepress": "^1.9.9",
+    "webpack": "^4.46.0",
     "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
+    "whatwg-fetch": "^3.6.2"
   },
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "not dead",
-    "not ie 11"
+    "not ie <= 10"
   ]
 }

package/src/App.vue

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

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

@@ -25,7 +25,7 @@
                   <a-icon type="bank" /> {{ group.title }}
                 </span>
                 <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
-                  <p class="addressName"><a-icon type="environment" /><span v-html="highLight(address.label, address.word)"></span></p>
+                  <p class="addressName"><a-icon type="environment" /> <span v-html="highLight(address.label, address.word)">{{ address.label }}</span></p>
                   <p v-if="address.address !== '[]'" class="addressRemark">
                     {{ address.address }}
                   </p>
@@ -169,7 +169,7 @@ export default {
             const addressMap = {}
             result.tips.forEach((res) => {
               if (res.location) {
-                if (!Object.prototype.hasOwnProperty.call(addressMap, res.district)) {
+                if (!addressMap.hasOwnProperty(res.district)) {
                   addressMap[res.district] = []
                 }
                 addressMap[res.district].push({

package/src/base-client/components/common/AmapMarker/AmapPointRendering.vue

@@ -19,7 +19,7 @@ export default {
     describeList: {
       type: Array,
       // eslint-disable-next-line vue/require-valid-default-prop
-      default: () => { return [] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
+      default: () => { return [ ] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
     },
     // 需要渲染的点位数据
     markers: {
@@ -30,7 +30,7 @@ export default {
     imgurl: {
       type: String,
       default: () => {
-        return 'https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png'
+        return "https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png"
       }
     },
     mapStyle: {
@@ -105,7 +105,7 @@ export default {
           extData: this.markers
         })
         marker.on('click', (e) => {
-          if (e.target.getExtData() && e.target.getExtData().lng) {
+          if(e.target.getExtData() && e.target.getExtData().lng){
             this.infoWindow.setContent(document.getElementById('amap_point_rendering_template'))
             this.infoWindow.open(this.map, [e.target.getExtData().lng, e.target.getExtData().lat])
           }

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

@@ -15,6 +15,9 @@
           :rules="rules"
           :wrapper-col="wrapperCol"
         >
+          <a-form-model-item label="服务名称" prop="serviceName">
+            <a-input v-model="form.serviceName" placeholder="查询接口所在的服务名称，默认system"/>
+          </a-form-model-item>
           <a-form-model-item label="查询主表名" prop="tableName">
             <a-input v-model="form.tableName" placeholder="查询用的主表+别名，用空格隔开，如：t_userfiles u"/>
           </a-form-model-item>
@@ -68,17 +71,17 @@
               <a-button icon="import" @click="$message.warn('从创意库中选择并引用高质量的通用表单项配置，敬请期待')">从创意库引入</a-button>
             </a-space>
             <a-row :gutter="24">
-              <a-col :span="6">
+              <a-col :span="8">
                 <span style="font-weight: bold">
                   标签名
                 </span>
               </a-col>
-              <a-col :span="6">
+              <a-col :span="7">
                 <span style="font-weight: bold">
                   字段名
                 </span>
               </a-col>
-              <a-col :span="10">
+              <a-col :span="7">
                 <span style="font-weight: bold">
                   数据模式
                 </span>
@@ -102,17 +105,17 @@
                 <span class="dragTips">拖到此处放置</span>
               </a-row>
               <a-row :gutter="24" class="column_item">
-                <a-col :span="6">
+                <a-col :span="7">
                   <span style="font-weight: bold">
                     {{ columnItem.title }}
                   </span>
                 </a-col>
-                <a-col :span="6">
+                <a-col :span="7">
                   <span style="font-weight: bold">
                     {{ columnItem.key }}
                   </span>
                 </a-col>
-                <a-col :span="10">
+                <a-col :span="8">
                   <a-tooltip>
                     <template slot="title">
                       查询表单项
@@ -145,13 +148,7 @@
                   </a-tooltip>
                   <a-tooltip>
                     <template slot="title">
-                      Excel导入项
-                    </template>
-                    <a-tag :color="columnItem.dataModeArray.includes('excelImportItem') ? '#107C41' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="file-excel" /></a-tag>
-                  </a-tooltip>
-                  <a-tooltip>
-                    <template slot="title">
-                      数据组
+                      字段组存储
                     </template>
                     <a-tag :color="columnItem.dataModeArray.includes('group') ? '#82A0D8' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="crown" /></a-tag>
                   </a-tooltip>
@@ -228,14 +225,14 @@
       </template>
       <x-form-table
         :queryParamsJson="result"
-        :view-mode="true"
-        :service-name="serviceName">
+        :view-mode="true">
       </x-form-table>
     </a-modal>
   </a-drawer>
 </template>
 
 <script>
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
@@ -247,7 +244,8 @@ export default {
   components: {
     CreateQueryItem,
     JsonViewer,
-    XFormTable
+    XFormTable,
+    XFormItem
   },
   data () {
     return {
@@ -268,6 +266,7 @@ export default {
       labelCol: { span: 3 },
       wrapperCol: { span: 18 },
       form: {
+        serviceName: '',
         tableName: '',
         joinArray: {},
         condition: {},
@@ -344,14 +343,6 @@ export default {
     toEditJson: {
       type: Object,
       default: () => {}
-    },
-    saveExportJson: {
-      type: Boolean,
-      default: false
-    },
-    serviceName: {
-      type: String,
-      default: undefined
     }
   },
   watch: {
@@ -389,8 +380,27 @@ export default {
           }, this.toEditJson
         )
         for (const columnItem of this.form.column) {
+          // 数据模式兼容性处理
           if (!(columnItem.dataMode || columnItem.dataModeArray)) {
             columnItem.dataModeArray = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']
+          } else if (columnItem.dataMode) {
+            if (columnItem.dataMode === 'all') {
+              columnItem.dataModeArray = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']
+            } else if (columnItem.dataMode === 'form') {
+              columnItem.dataModeArray = ['queryForm', 'addOrEditForm', 'sqlQueryCondition']
+            } else if (columnItem.dataMode === 'table') {
+              columnItem.dataModeArray = ['table', 'sqlQueryItem']
+            } else if (columnItem.dataMode === 'table_form') {
+              columnItem.dataModeArray = ['table', 'sqlQueryItem', 'sqlQueryCondition']
+            } else if (columnItem.dataMode === 'only_form') {
+              columnItem.dataModeArray = ['queryForm']
+            } else if (columnItem.dataMode === 'only_table') {
+              columnItem.dataModeArray = ['table']
+            } else if (columnItem.dataMode === 'clear') {
+              columnItem.dataModeArray = ['sqlQueryItem', 'sqlQueryCondition']
+            } else if (columnItem.dataMode === 'only_add_modify') {
+              columnItem.dataModeArray = ['addOrEditForm', 'sqlQueryItem']
+            }
           }
           delete columnItem.dataMode
           // 插槽兼容处理
@@ -474,7 +484,6 @@ export default {
       this.result = {}
     },
     onClose () {
-      this.$emit('close')
       this.$emit('update:visible', false)
     },
     onModelClose () {
@@ -493,7 +502,7 @@ export default {
     },
     itemHandle (item, type) {
       this.itemMap[item.key] = item
-      if (this.type === '新增') {
+      if (type === '新增') {
         this.form.column.push(item)
       } else {
         this.$set(this.form.column, this.selectIndex, item)
@@ -509,7 +518,6 @@ export default {
       this.$refs.queryItem.addColumnItemExecute()
     },
     editColumnItem (key, index) {
-      this.type = '修改'
       if (this.itemMap[key]) {
         this.$refs.queryItem.editColumnItemExecute(this.itemMap[key])
         this.selectIndex = index
@@ -600,11 +608,8 @@ export default {
       this.$refs.businessCreateForm.validate(valid => {
         if (valid) {
           this.viewHandle(() => {
-            if (this.saveExportJson) {
-              this.exportJson()
-            } else {
-              this.$emit('saveQueryParams', this.result)
-            }
+            // saveQueryParams
+            this.exportJson()
           })
         }
       })