vue2-client 1.7.20 → 1.8.0-10

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,42 @@ 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/no-mutating-props': 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/babel.config.js

@@ -9,13 +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,
-  'env': {
-    'test': {
-      'presets': ['@babel/preset-env'],
-      'plugins': ['istanbul']
+  env: {
+    test: {
+      presets: ['@babel/preset-env'],
+      plugins: ['istanbul']
     }
   }
 }

package/jest-transform-stub.js

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

package/jest.setup.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.7.20",
+  "version": "1.8.0-10",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
@@ -21,7 +21,7 @@
     "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",
@@ -32,12 +32,14 @@
     "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",
+    "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",
@@ -48,56 +50,39 @@
   },
   "devDependencies": {
     "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.21.4",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
     "@babel/preset-env": "^7.22.20",
-    "@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",
+    "@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",
-    "@vuepress/plugin-back-to-top": "^1.9.9",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^25.5.1",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-component": "^1.1.1",
-    "babel-plugin-istanbul": "^4.1.1",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
+    "babel-jest": "^26.6.3",
     "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.3.2",
-    "babel-preset-react": "^6.24.1",
-    "babel-register": "^6.22.0",
-    "compression-webpack-plugin": "^4.0.1",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
     "deepmerge": "^4.3.1",
-    "document-register-element": "^1.14.10",
-    "escope": "^4.0.0",
-    "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": "^24.0.0",
-    "jest-environment-jsdom": "^23.4.0",
+    "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",
     "style-resources-loader": "^1.5.0",
     "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-custom-element": "^3.3.0",
     "vue-jest": "^4.0.1",
-    "vue-template-compiler": "2.6.14",
-    "vuepress": "^1.9.9",
-    "webpack": "^4.46.0",
+    "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

@@ -53,7 +53,7 @@ export default {
         themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
       }
     },
-    'layout': function () {
+    layout: function () {
       window.dispatchEvent(new Event('resize'))
     }
   },

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)">{{ address.label }}</span></p>
+                  <p class="addressName"><a-icon type="environment" /><span v-html="highLight(address.label, address.word)"></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 (!addressMap.hasOwnProperty(res.district)) {
+                if (!Object.prototype.hasOwnProperty.call(addressMap, res.district)) {
                   addressMap[res.district] = []
                 }
                 addressMap[res.district].push({

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

@@ -653,6 +653,7 @@ export default {
         rule: {
           required: 'false'
         },
+        column: [],
         selectKey: undefined,
         queryType: '=',
         formType: 'input',
@@ -680,7 +681,7 @@ export default {
     // 编辑数据字段前准备数据
     editColumnItemExecute (_item) {
       this.type = '修改'
-      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {} }
+      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {}, column: [] }
       if (!_item.queryType) {
         defaultValue.queryType = '='
       }

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

@@ -191,13 +191,11 @@ export default {
 }
 
 .ant-card-body {
-  :global {
-    .ant-tree {
-      line-height: 3;
+  .ant-tree {
+    line-height: 3;
 
-      li {
-        position: relative;
-      }
+    li {
+      position: relative;
     }
   }
 }

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

@@ -39,7 +39,7 @@ import { mapState } from 'vuex'
 import { fileDelete, upload } from '@vue2-client/services/api/common'
 
 export default {
-  name: 'uploads',
+  name: 'Uploads',
   data () {
     return {
       uploadedFileList: [],

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

@@ -9,7 +9,11 @@
     okText="提交"
     @cancel="close"
     @ok="$refs.nativeForm.onSubmit()">
-    <x-add-native-form ref="nativeForm" @onSubmit="onSubmit" @tempTableModify="tempTableModify"/>
+    <x-add-native-form
+      ref="nativeForm"
+      @afterSubmit="afterSubmit"
+      @onSubmit="onSubmit"
+      @tempTableModify="tempTableModify"/>
   </a-modal>
 </template>
 <script>
@@ -43,6 +47,7 @@ export default {
     },
     methods: {
       init (params) {
+        params.showSubmitBtn = false
         const {
           businessType, title
         } = params
@@ -50,7 +55,7 @@ export default {
         this.title = title
         this.visible = true
         const that = this
-        that.$nextTick(function () {
+        that.$nextTick(() => {
           that.$refs.nativeForm.init(params)
         })
       },
@@ -60,9 +65,20 @@ export default {
       },
       onSubmit (params) {
         this.loading = true
-        this.$emit('onSubmit', params, () => {
-          this.close()
-        })
+        if (this.$listeners.onSubmit) {
+          // 交由父级处理
+          this.$emit('onSubmit', params, () => {
+            this.close()
+          })
+        } else {
+          // 触发默认提交事件
+          this.$refs.nativeForm.defaultSubmit(params.realForm, () => {
+            this.close()
+          })
+        }
+      },
+      afterSubmit (params) {
+        this.$emit('afterSubmit', params)
       },
       tempTableModify (params) {
         this.$emit('tempTableModify', params)

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

@@ -1,63 +1,66 @@
 <template>
-  <a-form-model
-    v-if="loaded"
-    ref="selectForm"
-    :zIndex="1001"
-    :model="form"
-    :rules="rules">
-    <a-row :gutter="16">
-      <x-form-item
-        v-for="(item, index) in realJsonData"
-        :key="index"
-        :attr="item"
-        :disabled="itemDisabled(item)"
-        :files="files"
-        :form="form"
-        :images="images"
-        :service-name="serviceName"
-        mode="新增/修改"
-        :get-data-params="getDataParams"
-      />
-    </a-row>
-    <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
-      <a-card :title="groupItem.name" :bordered="false" size="small">
+  <div>
+    <a-form-model
+      v-if="loaded"
+      ref="selectForm"
+      :zIndex="1001"
+      :model="form"
+      :rules="rules">
+      <a-row :gutter="16">
         <x-form-item
-          v-for="(item, index) in groupItem.groupItems"
+          v-for="(item, index) in realJsonData"
           :key="index"
           :attr="item"
           :disabled="itemDisabled(item)"
           :files="files"
-          :form="form[groupItem.model]"
-          :images="images"
-          :service-name="serviceName"
-          mode="新增/修改"
-          :get-data-params="getDataParams"
-        />
-      </a-card>
-    </a-row>
-    <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key">
-      <a-card :title="item.name" :bordered="false" size="small">
-        <x-form-item
-          v-for="(formItem, formItemIndex) in item.value"
-          :key="key + formItemIndex"
-          :attr="formItem"
-          :disabled="itemDisabled(formItem)"
-          :files="files"
           :form="form"
           :images="images"
           :service-name="serviceName"
           mode="新增/修改"
           :get-data-params="getDataParams"
         />
-      </a-card>
-    </a-row>
-  </a-form-model>
+      </a-row>
+      <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
+        <a-card :title="groupItem.name" :bordered="false" size="small">
+          <x-form-item
+            v-for="(item, index) in groupItem.groupItems"
+            :key="index"
+            :attr="item"
+            :disabled="itemDisabled(item)"
+            :files="files"
+            :form="form[groupItem.model]"
+            :images="images"
+            :service-name="serviceName"
+            mode="新增/修改"
+            :get-data-params="getDataParams"
+          />
+        </a-card>
+      </a-row>
+      <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key">
+        <a-card :title="item.name" :bordered="false" size="small">
+          <x-form-item
+            v-for="(formItem, formItemIndex) in item.value"
+            :key="key + formItemIndex"
+            :attr="formItem"
+            :disabled="itemDisabled(formItem)"
+            :files="files"
+            :form="form"
+            :images="images"
+            :service-name="serviceName"
+            mode="新增/修改"
+            :get-data-params="getDataParams"
+          />
+        </a-card>
+      </a-row>
+    </a-form-model>
+    <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">提交</a-button>
+  </div>
 </template>
 <script>
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import { formatDate } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
-import { runLogic } from '@vue2-client/services/api/common'
+import { addOrModify, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XAddNativeForm',
@@ -82,10 +85,16 @@ export default {
       loading: false,
       // 表单Model
       form: {},
+      // 配置名称
+      configName: undefined,
+      // 配置内容，用于查询配置生成器的预览
+      configContent: undefined,
       // 表单项集合
       formItems: [],
       // 服务名称
       serviceName: undefined,
+      // 是否显示提交按钮
+      showSubmitBtn: true,
       // 修改有文件的表单时使用
       files: [],
       images: [],
@@ -142,9 +151,11 @@ export default {
   methods: {
     init (params) {
       const {
-        formItems, viewMode, isHandleFormKey = true, serviceName, isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
+        configName, configContent, formItems, viewMode, isHandleFormKey = true, showSubmitBtn = true, serviceName, isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
       } = params
       this.loaded = false
+      this.configName = configName
+      this.configContent = configContent
       if (typeof formItems === 'string') {
           this.formItems = JSON.parse(formItems)
       } else {
@@ -152,6 +163,7 @@ export default {
       }
       this.viewMode = viewMode
       this.isHandleFormKey = isHandleFormKey
+      this.showSubmitBtn = showSubmitBtn
       this.serviceName = serviceName
       this.businessType = businessType
       this.title = title
@@ -233,7 +245,9 @@ export default {
           case 'number':
           case 'integer':
           case 'float':
+            // eslint-disable-next-line no-case-declarations
             let defaultValue
+            // eslint-disable-next-line no-case-declarations
             let message
             switch (item.rule.type) {
               case 'number':
@@ -332,21 +346,42 @@ export default {
         }
         if (this.viewMode) {
           this.$message.info('预览模式禁止新增和修改')
-          console.log({
+          return false
+        }
+        if (this.$listeners.onSubmit) {
+          // 交由父级处理
+          this.$emit('onSubmit', {
             businessType: this.businessType,
             serviceName: this.serviceName,
             realForm: realForm,
             currUserName: this.currUser.name
           })
-          return false
+        } else {
+          this.defaultSubmit(realForm)
+        }
+      })
+    },
+    // 默认提交事件
+    defaultSubmit (realForm, callback) {
+      // 组织请求
+      const requestParameters = {
+        queryParamsName: this.configName,
+        queryParams: this.configContent,
+        form: realForm,
+        businessType: this.businessType,
+        operator: this.currUser.name
+      }
+      addOrModify(requestParameters, this.serviceName).then(data => {
+        this.$message.success(this.businessType + '成功！')
+        // commit
+        this.$emit('afterSubmit', { type: this.businessType, id: data.id, form: requestParameters.form })
+      }).catch(e => {
+        this.$message.error(this.businessType + '失败：' + e)
+      }).finally(() => {
+        this.loading = false
+        if (callback) {
+          callback()
         }
-        // 交由父级处理
-        this.$emit('onSubmit', {
-          businessType: this.businessType,
-          serviceName: this.serviceName,
-          realForm: realForm,
-          currUserName: this.currUser.name
-        })
       })
     },
     // 获取表单字段实际值