vue2-client 1.8.64 → 1.8.66

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.66 -2024-3-5 @江超**
+- 完善`XTable`在开发环境下的查询效果
+
+**1.8.65 -2024-3-5 @张振宇**
+- fix `XTree` 组件 控制台报错
+
 **1.8.63 - 1.8.64 -2024-3-4 @江超**
 - 新增`XTree`组件
 - 全局设置字体为`PingFangSC-Regular`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.64",
+  "version": "1.8.66",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -142,6 +142,13 @@ export default {
         return false
       }
     },
+    // 环境
+    env: {
+      type: String,
+      default: () => {
+        return 'prod'
+      }
+    },
     // 数据只有一页时是否展示分页，true：展示，auto：隐藏
     showPagination: {
       type: Boolean,
@@ -220,7 +227,8 @@ export default {
           title: this.title,
           viewMode: this.viewMode,
           isTableTemp: this.isTableTemp,
-          serviceName: this.serviceName
+          serviceName: this.serviceName,
+          env: this.env
         })
         this.$refs.xForm.init({
           formItems: res.formJson,

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

@@ -183,7 +183,9 @@ export default {
       iconStyle: {
         position: 'relative',
         top: '1px'
-      }
+      },
+      // 当前环境
+      env: 'prod'
     }
   },
   props: {
@@ -234,7 +236,8 @@ export default {
         buttonState,
         title,
         serviceName,
-        viewMode
+        viewMode,
+        env = 'prod'
       } = params
       this.queryParams = queryParams
       this.tableColumns = JSON.parse(JSON.stringify(tableColumns))
@@ -245,6 +248,7 @@ export default {
       this.title = title
       this.serviceName = serviceName
       this.viewMode = viewMode
+      this.env = env
       this.rowKey = this.tableColumns[0].dataIndex
       let totalWidth = 0
       // 设置表格宽度
@@ -372,8 +376,8 @@ export default {
           exportData({
             queryParamsName: that.queryParamsName,
             queryParams: that.queryParams,
-            form: conditionParams
-          }, that.serviceName).then(res => {
+            form: conditionParams,
+          }, that.serviceName, this.env === 'dev').then(res => {
             let value = res
             if (that.compatible === 'V4') {
               value = res.value
@@ -418,7 +422,7 @@ export default {
         this.$emit('tempTableEdit', requestParameters)
         return
       }
-      return queryWithResource(requestParameters, this.serviceName).then(res => {
+      return queryWithResource(requestParameters, this.serviceName, this.env === 'dev').then(res => {
         // 将更新需要的主键值加入到primaryKeyData中
         const primaryKeyData = {}
         primaryKeyData[primaryKeyName] = this.selectId
@@ -441,7 +445,7 @@ export default {
               queryParamsName: this.queryParamsName,
               idList: this.selectedRowKeys
             }
-            remove(requestParameters, this.serviceName).then(res => {
+            remove(requestParameters, this.serviceName, this.env === 'dev').then(res => {
               resolve(res)
               this.$message.success('删除成功！')
               this.refresh(true)

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

@@ -1,71 +1,71 @@
-<script setup>
-const props = defineProps({
-  // 树数据
-  // example: [{ title: '标题', key: '1', children: []}]
-  treeData: {
-    type: Array,
-    required: true
-  }
-})
-
-const emit = defineEmits(['onSelect'])
-
-function onSelect (keys, e) {
-  emit('onSelect', keys, e)
-}
-</script>
-
-<template>
-  <div class="tree_main">
-    <a-directory-tree
-      :tree-data="props.treeData"
-      @select="onSelect"
-      :default-selected-keys="props.treeData.length > 0 ? props.treeData[0].key : null"
-      :default-expand-all="true"
-    ></a-directory-tree>
-  </div>
-</template>
-
-<style lang="less" scoped>
-.tree_main {
-  :deep(.ant-tree li .ant-tree-node-content-wrapper){
-    color: #000000e0;
-  }
-  :deep(.ant-tree li span.ant-tree-switcher, .ant-tree li span.ant-tree-iconEle) {
-    color: #0000004d;
-    i {
-      font-size: 16px !important;
-      line-height: 40px;
-    }
-  }
-  :deep(.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper::before, .ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper::before){
-    height: 40px;
-    border-radius: 6px;
-  }
-  :deep(.ant-tree.ant-tree-directory > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before){
-    background: #e6f7ff;
-  }
-  :deep(.ant-tree.ant-tree-directory .ant-tree-child-tree > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before){
-    background: #e6f7ff;
-  }
-  :deep(.ant-tree.ant-tree-directory .ant-tree-child-tree > li.ant-tree-treenode-selected > span.ant-tree-switcher){
-    color: #0000004d;
-  }
-  :deep(.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper.ant-tree-node-selected, .ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper.ant-tree-node-selected){
-    color: #000000e0;
-  }
-  :deep(.ant-tree li .ant-tree-node-content-wrapper){
-    line-height: 40px;
-    height: 40px;
-  }
-  :deep(.ant-tree li) {
-    padding-left: 4px;
-  }
-  :deep(.ant-tree ul) {
-    padding-left: 10px;
-  }
-  :deep(.ant-tree-icon__customize){
-    display: none;
-  }
-}
-</style>
+<script setup>
+const props = defineProps({
+  // 树数据
+  // example: [{ title: '标题', key: '1', children: []}]
+  treeData: {
+    type: Array,
+    required: true
+  }
+})
+
+const emit = defineEmits(['onSelect'])
+
+function onSelect (keys, e) {
+  emit('onSelect', keys, e)
+}
+</script>
+
+<template>
+  <div class="tree_main">
+    <a-directory-tree
+      :tree-data="props.treeData"
+      @select="onSelect"
+      :default-selected-keys="props.treeData.length > 0 ? [props.treeData[0].key] : null"
+      :default-expand-all="true"
+    ></a-directory-tree>
+  </div>
+</template>
+
+<style lang="less" scoped>
+.tree_main {
+  :deep(.ant-tree li .ant-tree-node-content-wrapper){
+    color: #000000e0;
+  }
+  :deep(.ant-tree li span.ant-tree-switcher, .ant-tree li span.ant-tree-iconEle) {
+    color: #0000004d;
+    i {
+      font-size: 16px !important;
+      line-height: 40px;
+    }
+  }
+  :deep(.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper::before, .ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper::before){
+    height: 40px;
+    border-radius: 6px;
+  }
+  :deep(.ant-tree.ant-tree-directory > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before){
+    background: #e6f7ff;
+  }
+  :deep(.ant-tree.ant-tree-directory .ant-tree-child-tree > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before){
+    background: #e6f7ff;
+  }
+  :deep(.ant-tree.ant-tree-directory .ant-tree-child-tree > li.ant-tree-treenode-selected > span.ant-tree-switcher){
+    color: #0000004d;
+  }
+  :deep(.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper.ant-tree-node-selected, .ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper.ant-tree-node-selected){
+    color: #000000e0;
+  }
+  :deep(.ant-tree li .ant-tree-node-content-wrapper){
+    line-height: 40px;
+    height: 40px;
+  }
+  :deep(.ant-tree li) {
+    padding-left: 4px;
+  }
+  :deep(.ant-tree ul) {
+    padding-left: 10px;
+  }
+  :deep(.ant-tree-icon__customize){
+    display: none;
+  }
+}
+</style>

package/src/services/api/common.js

@@ -109,68 +109,108 @@ export function parseConfig (configContent, configType, serviceName = process.en
 /**
  * 通用执行业务逻辑
  */
-export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/logic/' + logicName, parameter)
+export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/logic/' + logicName, parameter)
 }
 
 /**
  * 通用查询
  */
-export function query (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.query, parameter, null)
+export function query (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.query, parameter, null)
 }
 
 /**
  * 通用表单查询
  */
-export function queryWithResource (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.queryWithResource, parameter, null)
+export function queryWithResource (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.queryWithResource, parameter, null)
 }
 
 /**
  * 通用新增/修改
  */
-export function addOrModify (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.addOrModify, parameter, null)
+export function addOrModify (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.addOrModify, parameter, null)
 }
 
 /**
  * 通用删除
  */
-export function remove (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.delete, parameter, null)
+export function remove (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.delete, parameter, null)
 }
 
 /**
  * 通用导入
  */
-export function importData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.importData, parameter, null)
+export function importData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.importData, parameter, null)
 }
 
 /**
  * 通用导出
  */
-export function exportData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.exportData, parameter, null)
+export function exportData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.exportData, parameter, null)
 }
 
 /**
  * 通用上传
  */
-export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, config) {
-  return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
+export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, config, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.upload, parameter, config)
 }
 
 /**
  * 通用导入模板下载
  */
-export function downloadImportExcel (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.downloadImportTemplate, parameter, null)
+export function downloadImportExcel (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.downloadImportTemplate, parameter, null)
 }
 
 // 通用下载
-export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
+export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
   const notificationKey = 'download'
   notification.open({
     key: notificationKey,
@@ -187,7 +227,7 @@ export function download (parameter, filename, serviceName = process.env.VUE_APP
       )
     }
   })
-  return post('/api/' + serviceName + '/' + commonApi.download, parameter, {
+  return post(apiPre + serviceName + '/' + commonApi.download, parameter, {
     responseType: 'blob'
   }).then(async (data) => {
     const isLogin = await blobValidate(data)
@@ -210,8 +250,12 @@ export function download (parameter, filename, serviceName = process.env.VUE_APP
 }
 
 // 文件删除
-export function fileDelete (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post('/api/' + serviceName + '/' + commonApi.fileEntity, parameter)
+export function fileDelete (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.fileEntity, parameter)
 }
 
 export { commonApi }