vue2-client 1.2.25 → 1.2.28-test

package/src/base-client/plugins/AppData.js

@@ -1,5 +1,4 @@
-import { post } from '@vue2-client/services/api/restTools'
-import { manageApi } from '@vue2-client/services/api/manage'
+import { manageApi, post } from '@vue2-client/services/api'
 
 const GetAppDataService = {
   install (Vue) {

package/src/base-client/plugins/GetLoginInfoService.js

@@ -1,17 +1,6 @@
 import Vue from 'vue'
-import { SEARCH } from '@vue2-client/services/api'
-import { post } from '@vue2-client/services/api/restTools'
-
-const loginGen = async function (response) {
-  Vue.$login.f = response
-  await Promise.all([Vue.$appdata.load(), getGasman(), getLic(), getViewDetails()])
-  const login = {
-    f: Vue.$login.f,
-    jwt: Vue.$login.f.id,
-    r: Vue.$login.r
-  }
-  Vue.$store.commit('account/setLogin', login)
-}
+import { SEARCH } from '@vue2-client/services/apiService'
+import { post } from '@vue2-client/services/api'
 
 /**
  * 获取片区
@@ -107,7 +96,47 @@ async function getResourceFunction () {
     console.log('获取资源功能异常', error)
   }
 }
+/**
+ * 获取组织管理数据
+ * @returns {Promise<void>}
+ */
+async function getOrganization () {
+  try {
+    const resourceFunction = await post(SEARCH, {
+      source: 'tool.getFullTree(this.getRights().where(row.getType() == $organization$||row.getType() == $zone$))',
+      userid: Vue.$login.f.id
+    }, { resolveMsg: null, rejectMsg: null })
+    return resourceFunction
+  } catch (error) {
+    console.log('获取组织管理数据异常', error)
+  }
+}
+/**
+ * 完整资源树筛选指定名称的资源
+ * @param fun 要筛选的资源树
+ * @param name 筛选的资源名称
+ * @returns {*}
+ */
+function searchFun (fun, name) {
+  if (fun.length > 0) {
+    if (fun[0].name == name) {
+      return fun[0].children
+    } else {
+      return searchFun(fun[0].children, name)
+    }
+  }
+}
 
+const loginGen = async function (response) {
+  Vue.$login.f = response
+  await Promise.all([Vue.$appdata.load(), getGasman(), getLic(), getViewDetails()])
+  const login = {
+    f: Vue.$login.f,
+    jwt: Vue.$login.f.id,
+    r: Vue.$login.r
+  }
+  Vue.$store.commit('account/setLogin', login)
+}
 const GetLoginInfoService = {
   install (Vue) {
     // 给vue增添对话框显示方法
@@ -217,5 +246,7 @@ const GetLoginInfoService = {
 
 export default GetLoginInfoService
 export {
-  getResourceFunction
+  getResourceFunction,
+  getOrganization,
+  searchFun
 }

package/src/components/exception/ExceptionPage.vue

@@ -7,7 +7,7 @@
       <h1>{{ config[type].title }}</h1>
       <div class="desc">{{ config[type].desc }}</div>
       <div class="action">
-        <a-button type="primary" @click="backHome">返回首页</a-button>
+        <!--<a-button type="primary" @click="backHome">返回首页</a-button>-->
       </div>
     </div>
   </div>

package/src/config/CreateQueryConfig.js

@@ -1,40 +1,72 @@
-module.exports = {
-  queryType: [
-    {
-      label: '相等(=)', key: '=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '不相等(!=)', key: '!=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '全模糊(like)', key: 'LIKE', match: 'input;select;radio;cascader;selects'
-    },
-    {
-      label: '左模糊(left like)', key: 'LEFT_LIKE', match: 'input;select;radio;cascader;selects'
-    },
-    {
-      label: '右模糊(right like)', key: 'RIGHT_LIKE', match: 'input;select;radio;cascader;selects'
-    },
-    {
-      label: '大于(>)', key: '>', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '大于等于(>=)', key: '>=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '小于(<)', key: '<', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '小于等于(<=)', key: '<=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '包含(in)', key: 'IN', match: 'checkbox;select;cascader;selects'
-    },
-    {
-      label: '不包含(not in)', key: 'NOT_IN', match: 'checkbox;select;cascader;selects'
-    },
-    {
-      label: '之间(between)', key: 'BETWEEN', match: 'rangePicker'
-    }
-  ]
-}
+module.exports = {
+  // 文件上传类型
+  file_ype: [
+    {
+      label: 'word文档',
+      accept: '.doc,.docx,'
+    },
+    {
+      label: 'excel表格',
+      accept: '.xlsx,.xls,'
+    },
+    {
+      label: 'ppt幻灯片',
+      accept: '.ppt,.pptx,'
+    },
+    {
+      label: '图片',
+      accept: '.jpg,.jpeg,.ico,.gif,svg,.webp,.png,.bmp,.pjpeg,'
+    },
+    {
+      label: '视频',
+      accept: '.mp4,.mov,.m4v,.wmv,.asf,.asx,.rm,.rmvb,.3gp,.avi,.mkv,'
+    },
+    {
+      label: '音频',
+      accept: '.mp3,.cda,.wav,.aif,.aiff,.ape,.ra,'
+    },
+    {
+      label: '压缩包 ',
+      accept: '.zip,.rar,.7z,'
+    },
+  ],
+  // 查询方式
+  queryType: [
+    {
+      label: '相等(=)', key: '=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '不相等(!=)', key: '!=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '全模糊(like)', key: 'LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '左模糊(left like)', key: 'LEFT_LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '右模糊(right like)', key: 'RIGHT_LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '大于(>)', key: '>', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '大于等于(>=)', key: '>=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '小于(<)', key: '<', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '小于等于(<=)', key: '<=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '包含(in)', key: 'IN', match: 'checkbox;select;cascader;selects'
+    },
+    {
+      label: '不包含(not in)', key: 'NOT_IN', match: 'checkbox;select;cascader;selects'
+    },
+    {
+      label: '之间(between)', key: 'BETWEEN', match: 'rangePicker'
+    }
+  ]
+}

package/src/layouts/ComponentLayoutOne.vue

@@ -35,7 +35,6 @@
 </script>
 
 <style lang="less">
-  @import '~ant-design-vue/../../src/theme/index';
   #ComponentLayoutOne {
     .ant-layout-sider {
       .ant-layout-sider-zero-width-trigger {

package/src/layouts/SinglePageView.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import PageToggleTransition from '../components/transition/PageToggleTransition'
+import PageToggleTransition from '@vue2-client/components/transition/PageToggleTransition'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import { mapState, mapMutations } from 'vuex'
 

package/src/layouts/header/HeaderNotice.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { post } from '@vue2-client/services/api/restTools'
+import { post } from '@vue2-client/services/api'
 export default {
   name: 'HeaderNotice',
   data () {

package/src/pages/report/ReportTableHome.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-  import { post } from '@vue2-client/services/api/restTools'
+  import { post } from '@vue2-client/services/api'
   import ReportTable from '@vue2-client/pages/report/ReportTable'
   export default {
     name: 'ReportTableHome',