vue2-client 1.7.1 → 1.7.3

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -401,8 +401,8 @@ export default {
         const value = newVal[this.attr.model]
         const isEmpty = !value || !value.toString()
         // 查询表单点击重置按钮时清空树形选择框选中状态
-        if (this.attr.type === 'treeSelect' && isEmpty) {
-          this.$refs.xTreeSelect.setValue(undefined)
+        if (this.$refs.XTreeSelect && this.attr.type === 'treeSelect' && isEmpty) {
+            this.$refs.xTreeSelect.setValue(undefined)
         }
       },
       deep: true

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

@@ -50,7 +50,7 @@ import XForm from '@vue2-client/base-client/components/common/XForm'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
 import XTable from '@vue2-client/base-client/components/common/XTable'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
-import { addOrModify, getConfigUrl } from '@vue2-client/services/api/common'
+import { addOrModify, getConfigUrl, parseConfigUrl } from '@vue2-client/services/api/common'
 import { indexedDB } from '@vue2-client/utils/indexedDB'
 import { mapState } from 'vuex'
 import { post } from '@vue2-client/services/api/restTools'
@@ -186,8 +186,11 @@ export default {
     },
     getColumnsJsonBySource () {
       this.loading = true
-      const url = getConfigUrl(this.serviceName)
-      post(url, { queryObject: this.queryParamsJson }).then(res => {
+      const url = parseConfigUrl(this.serviceName)
+      post(url, {
+        configType: 'CRUD_FORM',
+        configContent: this.queryParamsJson
+      }).then(res => {
         this.updateComponents(res, true)
       })
     },
@@ -213,11 +216,11 @@ export default {
           title: this.title,
           viewMode: this.viewMode,
           isTableTemp: this.isTableTemp,
-          serviceName: res.serviceName
+          serviceName: this.serviceName
         })
         this.$refs.xForm.init({
           formItems: res.formJson,
-          serviceName: res.serviceName,
+          serviceName: this.serviceName,
           getDataParams: this.getDataParams
         })
       }
@@ -249,7 +252,7 @@ export default {
         businessType: res.businessType,
         operator: res.currUserName
       }
-      addOrModify(requestParameters, res.serviceName).then(data => {
+      addOrModify(requestParameters, this.serviceName).then(data => {
         this.$message.success(res.businessType + '成功！')
         this.refreshTable(res.businessType === '新增')
         // commit
@@ -289,7 +292,7 @@ export default {
         formItems: res.formJson,
         viewMode: this.viewMode,
         isTableTemp: this.isTableTemp,
-        serviceName: res.serviceName,
+        serviceName: this.serviceName,
         fixedAddForm: this.fixedAddForm,
         getDataParams: this.getDataParams
       })
@@ -307,7 +310,7 @@ export default {
         formItems: res.formJson,
         viewMode: this.viewMode,
         isTableTemp: this.isTableTemp,
-        serviceName: res.serviceName,
+        serviceName: this.serviceName,
         fixedAddForm: this.fixedAddForm,
         getDataParams: this.getDataParams,
         modifyModelData: modifyModelData

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

@@ -363,7 +363,7 @@ export default {
             queryParams: that.queryParams,
             form: conditionParams
           }, that.serviceName).then(res => {
-            window.open('/res/excel/export/' + res.value)
+            window.open('/res/excel/export/' + res)
           })
         },
         onCancel () {}

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

@@ -0,0 +1,41 @@
+import XForm from './common/XForm'
+import XAddForm from './common/XAddForm'
+import XAddNativeForm from './common/XAddNativeForm'
+import XFormCol from './common/XFormCol'
+import XTable from './common/XTable'
+import XTreeOne from './common/XTreeOne'
+import XImportExcel from './common/XImportExcel'
+import XDataDrawer from './common/XDataDrawer'
+import XCard from './common/XCard'
+import XBadge from './common/XBadge'
+import Upload from './common/Upload'
+import JSONToTree from './common/JSONToTree'
+import FormGroupEdit from './common/FormGroupEdit'
+import FormGroupQuery from './common/FormGroupQuery'
+import AddressSearchCombobox from './common/AddressSearchCombobox'
+import AmapMarker from './common/AmapMarker'
+import CreateQuery from './common/CreateQuery'
+import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
+import PersonSetting from './common/PersonSetting'
+
+export default {
+  XForm,
+  XAddForm,
+  XAddNativeForm,
+  XFormCol,
+  XTable,
+  XTreeOne,
+  XImportExcel,
+  XDataDrawer,
+  XCard,
+  XBadge,
+  Upload,
+  JSONToTree,
+  FormGroupEdit,
+  FormGroupQuery,
+  AddressSearchCombobox,
+  AmapMarker,
+  CreateQuery,
+  CreateSimpleFormQuery,
+  PersonSetting
+}

package/src/components/menu/SideMenu.vue

@@ -8,8 +8,14 @@
     :trigger="null">
     <div :class="['logo', theme]">
       <router-link to="/dashboard/workplace">
-        <img :src="logoSrc" alt="logo">
-        <h1 :style="{ fontWeight: 'bold', fontSize: systemNameFontSize }">{{ systemName }}</h1>
+        <a-row type="flex" align="middle" style="height: 64px;word-wrap: break-word;word-break:break-all;">
+          <a-col :span="4">
+            <img :src="logoSrc" alt="logo">
+          </a-col>
+          <a-col :span="20" style="line-height: 18px;" v-show="!collapsed">
+            <span style="vertical-align: middle" :style="{ fontWeight: 'bold', fontSize: systemNameFontSizeMain, color: 'white' }">{{ systemName }}</span>
+          </a-col>
+        </a-row>
       </router-link>
     </div>
     <i-menu :theme="theme" :collapsed="collapsed" :options="menuData" @select="onSelect" class="menu"/>
@@ -47,6 +53,13 @@ export default {
     sideTheme () {
       return this.theme === 'light' ? this.theme : 'dark'
     },
+    systemNameFontSizeMain () {
+      let systemNameFontSize = this.systemNameFontSize
+      if (this.systemName.length > 15) {
+        systemNameFontSize = '18px'
+      }
+      return systemNameFontSize
+    },
     ...mapState('setting', ['isMobile', 'systemName', 'logoSrc', 'systemNameFontSize'])
   },
   methods: {

package/src/config/default/setting.config.js

@@ -40,7 +40,7 @@ module.exports = {
   // 兼容旧版本 V3(最新V3产品)  OA(公司OA)
   compatible: 'V3',
   // 路由资源名称
-  routeName: '智慧燃气',
+  routeName: '物联网设备采集',
   // 自定义组件集合 格式为组件名: 组件路径（不需要带@/）
   customizeComponent: {},
   // 自定义默认头像路径

package/src/lib.js

@@ -0,0 +1 @@
+console.log('进入模块')

package/src/pages/CreateQueryPage.vue

@@ -2,24 +2,34 @@
   <div>
     <create-query
       :visible.sync="visible"
-      @saveQueryParams="saveQueryParams"
+      :to-edit-json="toEditJson"
     />
     <create-simple-form-query
       :visible.sync="createSimpleFormVisible"
-      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
+      :to-edit-json="toEditSimpleFormJson"
     />
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具
+    <a-modal
+      :visible="importJsonVisible"
+      title="导入JSON配置"
+      @cancel="importJsonVisible = false"
+      @ok="importJsonHandleOk"
+    >
+      <a-textarea v-model="importEditJson" placeholder="输入现有的JSON配置"/>
+    </a-modal>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">创建查询配置
     </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="openImportView(1)">导入已有查询配置
+    </a-button>
+    <br/>
     <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">
-      打开基础表单配置生成工具
+      创建简易表单配置
+    </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="openImportView(2)">导入已有简易表单配置
     </a-button>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="searchReport">请求数据</a-button>
-    <!--    <webmeter-analysis-view/>-->
   </div>
 </template>
 
 <script>
-import { post } from '@vue2-client/services/api/restTools'
 import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
 import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
 
@@ -32,7 +42,12 @@ export default {
   data () {
     return {
       visible: false,
-      createSimpleFormVisible: false
+      createSimpleFormVisible: false,
+      toEditJson: undefined,
+      toEditSimpleFormJson: undefined,
+      importJsonVisible: false,
+      type: undefined,
+      importEditJson: ''
     }
   },
   methods: {
@@ -42,41 +57,24 @@ export default {
     showSimpleFormQueryParamsDrawer () {
       this.createSimpleFormVisible = true
     },
-    // 查询report
-    searchReport (source) {
-      return post('/rs/report/saleMonthReport', {
-        'data': {
-          'condition': ' 1=1 ',
-          'startDate': '2022-11-21 00:00:00',
-          'endDate': '2022-11-21 23:59:59',
-          'f_orgid': 'f_orgid in (21142)'
-        }
-      }).then(res => {
-        this.$message.success(res)
-      }, err => {
-        console.error(err)
-      })
+    openImportView (type) {
+      this.type = type
+      this.importJsonVisible = true
     },
-    // 存储查询配置信息
-    saveQueryParams (source) {
-      return post('/api/system/logic/addOrEditQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存查询配置成功')
-      }, err => {
-        console.error(err)
-      })
+    importJsonHandleOk () {
+      try {
+        if (this.type === 1) {
+          this.toEditJson = JSON.parse(this.importEditJson)
+          this.showDrawer()
+        } else {
+          this.toEditSimpleFormJson = JSON.parse(this.importEditJson)
+          this.showSimpleFormQueryParamsDrawer()
+        }
+      } catch (e) {
+        this.$message.warn('操作失败，输入配置不是JSON格式')
+      }
+      this.importJsonVisible = false
     },
-    // 存储基础表单配置信息
-    saveSimpleFormQueryParams (source) {
-      return post('/api/system/logic/addOrEditSimpleFormQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存基础表单配置成功')
-      }, err => {
-        console.error(err)
-      })
-    }
   }
 }
 </script>

package/src/router/async/router.map.js

@@ -31,6 +31,8 @@ routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog
 routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
 // 系统设置
 routerResource.settings = () => import('@vue2-client/pages/system/settings')
+// 查询配置生成工具
+routerResource.createQuery = () => import('@vue2-client/pages/CreateQueryPage')
 
 // 基础路由组件注册
 const routerMap = {

package/src/services/api/common.js

@@ -9,6 +9,8 @@ import { post } from '@vue2-client/services/api/restTools'
 const commonApi = {
   // 获取表格列配置
   getConfig: 'logic/getLiuliConfiguration',
+  // 配置解析
+  parseConfig: 'logic/parseConfig',
   // 通用查询
   query: 'logic/commonQuery',
   // 表单查询
@@ -35,6 +37,10 @@ export function getConfigUrl (serviceName = 'system') {
   return '/api/' + serviceName + '/' + commonApi.getConfig
 }
 
+export function parseConfigUrl (serviceName = 'system') {
+  return '/api/' + serviceName + '/' + commonApi.parseConfig
+}
+
 /**
  * 带缓存查询的表格配置文件查询
  * @param queryParamsName 配置名称

package/vue.config.js

@@ -30,7 +30,7 @@ module.exports = {
         changeOrigin: true
       },
       '/api': {
-        pathRewrite: { '^/api/af-system/': '/rs/' },
+        pathRewrite: { '^/api/system/': '/rs/', '^/api/af-system/': '/rs/' },
         // pathRewrite: { '^/api': '/' },
         target: local,
         changeOrigin: true