vue2-client 1.2.49 → 1.2.52

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

@@ -1,5 +1,5 @@
 import { manageApi, post } from '@vue2-client/services/api'
-
+import { handleTree } from '@vue2-client/utils/util'
 const GetAppDataService = {
   install (Vue) {
     // 给vue增添对话框显示方法
@@ -27,6 +27,21 @@ const GetAppDataService = {
       localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
       localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
     })
+    // 获取省市区数据
+    await post(manageApi.getDivisionsOhChina, {}).then((res) => {
+      // 追加参数
+      localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify(res))
+    })
+  },
+  // 返回树形省市区
+  getDivisionsOhChinaForTree () {
+    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
+    return handleTree(JSON.parse(str), 'code', 'parentcode')
+  },
+  // 返回列表省市区
+  getDivisionsOhChinaForList () {
+    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
+    return JSON.parse(str)
   },
   getDictionaryList (key) {
     const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)

package/src/base-client/plugins/compatible/LoginServiceOA.js

@@ -0,0 +1,19 @@
+import { get } from '@vue2-client/services/api'
+import Vue from 'vue'
+
+async function loginStart (name, password) {
+  const resource = await get(`/rs/user/${name}/${password}/newoa`, {})
+  console.log('登陆获取', resource)
+  Vue.$login.f = resource
+  const login = {
+    f: Vue.$login.f,
+    jwt: Vue.$login.f.id,
+    r: Vue.$login.r
+  }
+  Vue.$store.commit('account/setLogin', login)
+  return resource
+}
+
+export {
+  loginStart
+}

package/src/config/CreateQueryConfig.js

@@ -1,80 +1,298 @@
-module.exports = {
-  // 文件上传类型
-  fileType: [
-    {
-      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,'
-    },
-    {
-      label: '其他文本',
-      accept: '.json,.txt,'
-    },
-    {
-      label: '无限制',
-      accept: '*'
-    },
-  ],
-  // 查询方式
-  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 = {
+  // 数据模式类型
+  dataModeType: [
+    {
+      label: '渲染查询表单项',
+      value: 'queryForm',
+      noMatch: ['file', 'image', 'textarea']
+    },
+    {
+      label: '渲染表格列',
+      value: 'table',
+      noMatch: ['file', 'image']
+    },
+    {
+      label: '渲染新增/修改表单项',
+      value: 'addOrEditForm',
+      noMatch: []
+    },
+    {
+      label: 'SQL生成查询项',
+      value: 'sqlQueryItem',
+      noMatch: ['file']
+    },
+    {
+      label: 'SQL生成查询表达式',
+      value: 'sqlQueryCondition',
+      noMatch: ['file', 'image', 'textarea']
+    }
+  ],
+  // 表单类型
+  formType: [
+    {
+      label: '输入框', key: 'input'
+    },
+    {
+      label: '选择框', key: 'select'
+    },
+    {
+      label: '级联选择框', key: 'selects'
+    },
+    {
+      label: '多选框', key: 'checkbox'
+    },
+    {
+      label: '地点搜索框', key: 'addressSearch'
+    },
+    {
+      label: '省市区选择框', key: 'citySelect'
+    },
+    {
+      label: '单选框', key: 'radio'
+    },
+    {
+      label: '日期范围选择框', key: 'rangePicker'
+    },
+    {
+      label: '月份选择框', key: 'monthPicker'
+    },
+    {
+      label: '单日选择框', key: 'datePicker'
+    },
+    {
+      label: '文本域', key: 'textarea'
+    },
+    {
+      label: '文件上传', key: 'file'
+    },
+    {
+      label: '图片上传', key: 'image'
+    },
+  ],
+  // 文件上传类型
+  fileType: [
+    {
+      label: '无限制',
+      accept: '*'
+    },
+    {
+      label: 'word文档',
+      accept: '.doc,.docx,'
+    },
+    {
+      label: 'excel表格',
+      accept: '.xls,.xlsx,'
+    },
+    {
+      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,'
+    },
+    {
+      label: '文本/JSON',
+      accept: '.json,.txt,'
+    }
+  ],
+  // 表单校验类型
+  formRuleType: [
+    {
+      label: '字符串', key: 'string'
+    },
+    {
+      label: '数字', key: 'number'
+    },
+    {
+      label: '布尔值', key: 'boolean'
+    },
+    {
+      label: '正则表达式', key: 'regexp'
+    },
+    {
+      label: '整数', key: 'integer'
+    },
+    {
+      label: '小数', key: 'float'
+    },
+    {
+      label: '数组或集合', key: 'array'
+    },
+    {
+      label: '邮箱', key: 'email'
+    }
+  ],
+  // 作用域插槽类型
+  slotType: [
+    {
+      label: '不设置',
+      key: 'default',
+      match: ['input', 'select', 'selects', 'checkbox', 'radio', 'addressSearch', 'citySelect']
+    },
+    {
+      label: '文本溢出省略',
+      key: 'ellipsis',
+      match: ['input', 'citySelect', 'addressSearch']
+    },
+    {
+      label: '多彩徽标',
+      key: 'badge',
+      match: ['select', 'selects', 'citySelect', 'addressSearch']
+    },
+    {
+      label: '日期格式化',
+      key: 'date',
+      match: ['rangePicker']
+    },
+    {
+      label: '日期时间格式化',
+      key: 'dateTime',
+      match: ['rangePicker']
+    },
+    {
+      label: '操作列',
+      key: 'action',
+      match: [
+        'input'
+      ]
+    },
+  ],
+  // 查询方式
+  queryType: [
+    {
+      label: '相等[=]',
+      key: '=',
+      match: ['input', 'select', 'radio', 'monthPicker', 'datePicker', 'selects', 'addressSearch', 'citySelect']
+    },
+    {
+      label: '不相等[!=]',
+      key: '!=',
+      match: ['input']
+    },
+    {
+      label: '全模糊[like]',
+      key: 'LIKE',
+      match: ['input']
+    },
+    {
+      label: '左模糊[left like]',
+      key: 'LEFT_LIKE',
+      match: ['input']
+    },
+    {
+      label: '右模糊[right like]',
+      key: 'RIGHT_LIKE',
+      match: ['input']
+    },
+    {
+      label: '大于[>]',
+      key: '>',
+      match: ['input', 'radio', 'monthPicker', 'datePicker']
+    },
+    {
+      label: '大于等于[>=]',
+      key: '>=',
+      match: ['input', 'radio', 'monthPicker', 'datePicker']
+    },
+    {
+      label: '小于[<]',
+      key: '<',
+      match: ['input', 'radio', 'monthPicker', 'datePicker']
+    },
+    {
+      label: '小于等于[<=]',
+      key: '<=',
+      match: ['input', 'radio', 'monthPicker', 'datePicker']
+    },
+    {
+      label: '包含[in]',
+      key: 'IN',
+      match: ['checkbox']
+    },
+    {
+      label: '不包含[not in]',
+      key: 'NOT_IN',
+      match: ['checkbox']
+    },
+    {
+      label: '之间[between]',
+      key: 'BETWEEN',
+      match: ['rangePicker']
+    }
+  ],
+  // 新增/修改场景类型
+  addOrEditType: [
+    {
+      label: '新增和修改',
+      key: 'all',
+      match: ['all']
+    },
+    {
+      label: '仅支持新增',
+      key: 'add',
+      match: ['all']
+    },
+    {
+      label: '仅支持修改',
+      key: 'edit',
+      match: ['all']
+    },
+    {
+      label: '静默新增（不生成表单）',
+      key: 'silenceAdd',
+      match: ['input', 'rangePicker']
+    },
+    {
+      label: '版本号',
+      key: 'version',
+      match: ['input']
+    }
+  ],
+  // 字段用途类型
+  silencePurposeType: [
+    {
+      label: '创建时间',
+      key: 'createTime'
+    },
+    {
+      label: '创建/操作人',
+      key: 'operator'
+    },
+    {
+      label: '组织机构ID',
+      key: 'orgId'
+    },
+    {
+      label: '自定义',
+      key: 'customize'
+    }
+  ],
+  // 数据源类型
+  selectDataType: [
+    {
+      label: '字典键',
+      key: 'key'
+    },
+    {
+      label: '固定集合',
+      key: 'fixArray'
+    },
+    {
+      label: '业务逻辑',
+      key: 'logic'
+    }
+  ]
+}

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

@@ -34,6 +34,6 @@ module.exports = {
   ],
   // 旧系统路径
   iframeSrc: '../singlepage/page.html',
-  // 兼容V2版本系统 true:启用, false:禁用
-  compatibleV2: false
+  // 兼容旧版本 V3(最新V3产品)  OA(公司OA)
+  compatible: 'V3'
 }

package/src/layouts/header/HeaderNotice.vue

@@ -1,96 +1,96 @@
-<template>
-  <a-dropdown :trigger="['click']" v-model="show">
-    <div slot="overlay">
-      <a-spin :spinning="loading">
-        <a-tabs class="dropdown-tabs" :tabBarStyle="{textAlign: 'center'}" :style="{width: '297px'}">
-          <a-tab-pane tab="通知" key="1">
-            <a-list>
-              <a-list-item :key="item.id" class="tab-pane" v-for=" item in exception">
-                <a-list-item-meta :title="'设备号'+ item.e_f_device_id" :description="item.e_f_error_msg" @click="read(item)">
-                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
-                </a-list-item-meta>
-              </a-list-item>
-            </a-list>
-          </a-tab-pane>
-          <a-tab-pane tab="消息" key="2">
-            <a-list class="tab-pane"></a-list>
-          </a-tab-pane>
-          <a-tab-pane tab="待办" key="3">
-            <a-list class="tab-pane"></a-list>
-          </a-tab-pane>
-        </a-tabs>
-      </a-spin>
-    </div>
-    <span @click="fetchNotice" class="header-notice">
-      <a-badge class="notice-badge" :count=" exception.length">
-        <a-icon :class="['header-notice-icon']" type="bell" />
-      </a-badge>
-    </span>
-  </a-dropdown>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-export default {
-  name: 'HeaderNotice',
-  data () {
-    return {
-      loading: false,
-      show: false,
-      exception: []
-    }
-  },
-  computed: {
-  },
-  created () {
-  },
-  methods: {
-    read (item) {
-      post('/webmeterapi/saveSingleTable', { data: { tablename: 't_iot_device_exception', param: { id: item.e_id, f_is_read: 1 } } }).then(res => {
-        this.refresh()
-      })
-    },
-    refresh () {
-      post('/webmeterapi/commonQuery', { queryParamsName: 'deviceExceptionQueryParams', conditionParams: { e_f_is_read: 0 }, pageNo: 1, pageSize: 999999 }).then(res => {
-        this.exception = res.data
-      })
-    },
-    fetchNotice () {
-      if (this.loading) {
-        this.loading = false
-        return
-      }
-      this.loadding = true
-      setTimeout(() => {
-        this.loadding = false
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .header-notice{
-    display: inline-block;
-    transition: all 0.3s;
-    span {
-      vertical-align: initial;
-    }
-    .notice-badge{
-      color: inherit;
-      .header-notice-icon{
-        font-size: 16px;
-        padding: 4px;
-      }
-    }
-  }
-  .dropdown-tabs{
-    background-color: @base-bg-color;
-    box-shadow: 0 2px 8px @shadow-color;
-    border-radius: 4px;
-    .tab-pane{
-      padding: 0 24px 12px;
-      min-height: 250px;
-    }
-  }
-</style>
+<template>
+  <a-dropdown :trigger="['click']" v-model="show">
+    <div slot="overlay">
+      <a-spin :spinning="loading">
+        <a-tabs class="dropdown-tabs" :tabBarStyle="{textAlign: 'center'}" :style="{width: '297px'}">
+          <a-tab-pane tab="通知" key="1">
+            <a-list>
+              <a-list-item :key="item.id" class="tab-pane" v-for=" item in exception">
+                <a-list-item-meta :title="'设备号'+ item.e_f_device_id" :description="item.e_f_error_msg" @click="read(item)">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+            </a-list>
+          </a-tab-pane>
+          <a-tab-pane tab="消息" key="2">
+            <a-list class="tab-pane"></a-list>
+          </a-tab-pane>
+          <a-tab-pane tab="待办" key="3">
+            <a-list class="tab-pane"></a-list>
+          </a-tab-pane>
+        </a-tabs>
+      </a-spin>
+    </div>
+    <span @click="fetchNotice" class="header-notice">
+      <a-badge class="notice-badge" :count=" exception.length">
+        <a-icon :class="['header-notice-icon']" type="bell" />
+      </a-badge>
+    </span>
+  </a-dropdown>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+export default {
+  name: 'HeaderNotice',
+  data () {
+    return {
+      loading: false,
+      show: false,
+      exception: []
+    }
+  },
+  computed: {
+  },
+  created () {
+  },
+  methods: {
+    read (item) {
+      post('/webmeterapi/saveSingleTable', { data: { tablename: 't_iot_device_exception', param: { id: item.e_id, f_is_read: 1 } } }).then(res => {
+        this.refresh()
+      })
+    },
+    refresh () {
+      post('/webmeterapi/commonQuery', { queryParamsName: 'deviceExceptionQueryParams', conditionParams: { e_f_is_read: 0 }, pageNo: 1, pageSize: 999999 }).then(res => {
+        this.exception = res.data
+      })
+    },
+    fetchNotice () {
+      if (this.loading) {
+        this.loading = false
+        return
+      }
+      this.loadding = true
+      setTimeout(() => {
+        this.loadding = false
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .header-notice{
+    display: inline-block;
+    transition: all 0.3s;
+    span {
+      vertical-align: initial;
+    }
+    .notice-badge{
+      color: inherit;
+      .header-notice-icon{
+        font-size: 16px;
+        padding: 4px;
+      }
+    }
+  }
+  .dropdown-tabs{
+    background-color: @base-bg-color;
+    box-shadow: 0 2px 8px @shadow-color;
+    border-radius: 4px;
+    .tab-pane{
+      padding: 0 24px 12px;
+      min-height: 250px;
+    }
+  }
+</style>

package/src/layouts/tabs/TabsView.vue

@@ -367,9 +367,6 @@ export default {
         width: 1400px;
         margin: 0 auto;
       }
-      .ant-card:only-of-type {
-        min-height: calc(100vh - 64px - 56px - 16px);
-      }
     }
   }
 </style>