vue2-client 1.2.50 → 1.2.53

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/services/api/manage.js

@@ -1,14 +1,16 @@
-const manageApi = {
-  // 查询：获取燃气公司列表
-  orgList: '/webmeterapi/foreignaidGetOrgList',
-  // 查询：获取客户列表
-  customerList: '/webmeterapi/foreignaidGetCustomerList',
-  // 查询：检查链接有效性
-  checkUrlWork: '/webmeterapi/foreignaidCheckUrl',
-  // 操作：客户数据
-  doCustomerInfo: '/webmeterapi/foreignaidDoCustomerInfo',
-  // 查询：获取字典键列表
-  getDictionaryValue: '/webmeterapi/getDictionaryValue'
-}
-
-export { manageApi }
+const manageApi = {
+  // 查询：获取燃气公司列表
+  orgList: '/webmeterapi/foreignaidGetOrgList',
+  // 查询：获取客户列表
+  customerList: '/webmeterapi/foreignaidGetCustomerList',
+  // 查询：检查链接有效性
+  checkUrlWork: '/webmeterapi/foreignaidCheckUrl',
+  // 操作：客户数据
+  doCustomerInfo: '/webmeterapi/foreignaidDoCustomerInfo',
+  // 查询：获取字典键列表
+  getDictionaryValue: '/webmeterapi/getDictionaryValue',
+  // 查询：获取省市区街道三级分类
+  getDivisionsOhChina: '/webmeterapi/getDivisionsOhChina'
+}
+
+export { manageApi }

package/src/services/api/restTools.js

@@ -1,24 +1,24 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-export { get, post }
+import { METHOD, request } from '@vue2-client/utils/request'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+export { get, post }

package/src/utils/map-utils.js

@@ -1,28 +1,28 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap () {
-  if (!Amap) {
-    Amap = await AMapLoader.load({
-      key: '4889f1e58df01cb40415536c8907bf64', // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '1.4.2', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.ToolBar', 'AMap.Geolocation', 'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.Autocomplete'] // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-    })
-  }
-  return Amap
-}
-async function GetLocation (address) {
-  return new Promise(async (resolve, reject) => {
-    new (await GetGDMap()).Geocoder({
-      radius: 500 // 范围，默认：500
-    }).getLocation(address, function (status, result) {
-      console.log(result)
-      if (status === 'complete' && result.geocodes.length) {
-        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-      } else {
-        // eslint-disable-next-line prefer-promise-reject-errors
-        reject('根据经纬度查询地址失败')
-      }
-    })
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap () {
+  if (!Amap) {
+    Amap = await AMapLoader.load({
+      key: '4889f1e58df01cb40415536c8907bf64', // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '1.4.2', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.ToolBar', 'AMap.Geolocation', 'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.Autocomplete'] // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    })
+  }
+  return Amap
+}
+async function GetLocation (address) {
+  return new Promise(async (resolve, reject) => {
+    new (await GetGDMap()).Geocoder({
+      radius: 500 // 范围，默认：500
+    }).getLocation(address, function (status, result) {
+      console.log(result)
+      if (status === 'complete' && result.geocodes.length) {
+        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+      } else {
+        // eslint-disable-next-line prefer-promise-reject-errors
+        reject('根据经纬度查询地址失败')
+      }
+    })
+  })
+}
+export { GetGDMap, GetLocation }