vue2-client 1.2.51 → 1.2.52

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

@@ -1,57 +1,72 @@
-import { manageApi, post } from '@vue2-client/services/api'
-
-const GetAppDataService = {
-  install (Vue) {
-    // 给vue增添对话框显示方法
-    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
-  },
-  async load () {
-    const params = {
-      orgList: []
-    }
-    await post(manageApi.getDictionaryValue, {}).then((res) => {
-      Object.assign(params, res)
-      const badgeItemArray = {}
-      for (const key of Object.keys(params)) {
-        badgeItemArray[key] = {}
-        for (const item of params[key]) {
-          if (item.status) {
-            badgeItemArray[key][item.value] = {
-              status: item.status,
-              text: item.text
-            }
-          }
-        }
-      }
-      // 追加参数
-      localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
-      localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
-    })
-  },
-  getDictionaryList (key) {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object[key]
-  },
-  getParam (key, value) {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    const result = object[key]
-    if (result && result.hasOwnProperty(value)) {
-      return result[value]
-    } else {
-      return null
-    }
-  },
-  getParams () {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object
-  },
-  getSingleValues () {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    return object
-  }
-}
-export default GetAppDataService
+import { manageApi, post } from '@vue2-client/services/api'
+import { handleTree } from '@vue2-client/utils/util'
+const GetAppDataService = {
+  install (Vue) {
+    // 给vue增添对话框显示方法
+    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
+  },
+  async load () {
+    const params = {
+      orgList: []
+    }
+    await post(manageApi.getDictionaryValue, {}).then((res) => {
+      Object.assign(params, res)
+      const badgeItemArray = {}
+      for (const key of Object.keys(params)) {
+        badgeItemArray[key] = {}
+        for (const item of params[key]) {
+          if (item.status) {
+            badgeItemArray[key][item.value] = {
+              status: item.status,
+              text: item.text
+            }
+          }
+        }
+      }
+      // 追加参数
+      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)
+    const object = JSON.parse(str)
+    return object[key]
+  },
+  getParam (key, value) {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    const object = JSON.parse(str)
+    const result = object[key]
+    if (result && result.hasOwnProperty(value)) {
+      return result[value]
+    } else {
+      return null
+    }
+  },
+  getParams () {
+    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
+    const object = JSON.parse(str)
+    return object
+  },
+  getSingleValues () {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    const object = JSON.parse(str)
+    return object
+  }
+}
+export default GetAppDataService

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/pages/resourceManage/orgListManage.vue

@@ -2,49 +2,49 @@
   <div id="orgListManage">
     <a-card :bordered="false">
       <!--<a-row :gutter="48">-->
-        <!--<a-col>-->
-          <!--<a-space>-->
-            <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
-              <!--<a-icon :style="iconStyle" type="plus"/>新增-->
-            <!--</a-button>-->
-            <!--<a-button-->
-              <!--v-if="!buttonState || buttonState.edit"-->
-              <!--:loading="editDataLoading"-->
-              <!--:disabled="!isModify"-->
-              <!--class="btn-success"-->
-              <!--type="dashed"-->
-              <!--@click="editItem">-->
-              <!--<a-icon :style="iconStyle" type="edit"/>修改-->
-            <!--</a-button>-->
-            <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
-              <!--<a-icon :style="iconStyle" type="delete"/>删除-->
-            <!--</a-button>-->
-          <!--</a-space>-->
-          <!--<span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">-->
-            <!--<a-button-group>-->
-              <!--<a-button @click="toggleIsFormShow">-->
-                <!--<a-icon :style="iconStyle" type="vertical-align-top"/>-->
-              <!--</a-button>-->
-              <!--<a-button @click="refresh(true)">-->
-                <!--<a-icon :style="iconStyle" type="reload" />-->
-              <!--</a-button>-->
-              <!--<a-button @click="showDrawer">-->
-                <!--<a-icon :style="iconStyle" type="table" />-->
-              <!--</a-button>-->
-              <!--<a-button @click="exports">-->
-                <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
-              <!--</a-button>-->
-            <!--</a-button-group>-->
-          <!--</span>-->
-        <!--</a-col>-->
+      <!--<a-col>-->
+      <!--<a-space>-->
+      <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
+      <!--<a-icon :style="iconStyle" type="plus"/>新增-->
+      <!--</a-button>-->
+      <!--<a-button-->
+      <!--v-if="!buttonState || buttonState.edit"-->
+      <!--:loading="editDataLoading"-->
+      <!--:disabled="!isModify"-->
+      <!--class="btn-success"-->
+      <!--type="dashed"-->
+      <!--@click="editItem">-->
+      <!--<a-icon :style="iconStyle" type="edit"/>修改-->
+      <!--</a-button>-->
+      <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
+      <!--<a-icon :style="iconStyle" type="delete"/>删除-->
+      <!--</a-button>-->
+      <!--</a-space>-->
+      <!--<span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">-->
+      <!--<a-button-group>-->
+      <!--<a-button @click="toggleIsFormShow">-->
+      <!--<a-icon :style="iconStyle" type="vertical-align-top"/>-->
+      <!--</a-button>-->
+      <!--<a-button @click="refresh(true)">-->
+      <!--<a-icon :style="iconStyle" type="reload" />-->
+      <!--</a-button>-->
+      <!--<a-button @click="showDrawer">-->
+      <!--<a-icon :style="iconStyle" type="table" />-->
+      <!--</a-button>-->
+      <!--<a-button @click="exports">-->
+      <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
+      <!--</a-button>-->
+      <!--</a-button-group>-->
+      <!--</span>-->
+      <!--</a-col>-->
       <!--</a-row>-->
       <a-table
-        rowKey="id"
-        size="middle"
-        bordered
-        :pagination="false"
         :columns="columns"
-        :data-source="funTree">
+        :data-source="funTree"
+        :pagination="false"
+        bordered
+        rowKey="id"
+        size="middle">
       </a-table>
     </a-card>
   </div>

package/src/router/async/config.async.js

@@ -1,26 +1,26 @@
-import routerMap from './router.map'
-import { parseRoutes } from '@vue2-client/utils/routerUtil'
-
-// 异步路由配置
-const routesConfig = [
-  'login',
-  'submitTicket',
-  'root',
-  {
-    router: 'exp404',
-    path: '*',
-    name: '404'
-  },
-  {
-    router: 'exp403',
-    path: '/403',
-    name: '403'
-  }
-]
-
-const options = {
-  mode: 'history',
-  routes: parseRoutes(routesConfig, routerMap)
-}
-
-export default options
+import routerMap from './router.map'
+import { parseRoutes } from '@vue2-client/utils/routerUtil'
+
+// 异步路由配置
+const routesConfig = [
+  'login',
+  'submitTicket',
+  'root',
+  {
+    router: 'exp404',
+    path: '*',
+    name: '404'
+  },
+  {
+    router: 'exp403',
+    path: '/403',
+    name: '403'
+  }
+]
+
+const options = {
+  mode: 'history',
+  routes: parseRoutes(routesConfig, routerMap)
+}
+
+export default options