vue2-client 1.2.7 → 1.2.10

package/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**##1.2.9 - 1.2.10 -2022-03-24 @江超**
+- 功能新增：
+- [查询配置生成]：下拉框表单选择业务逻辑作为数据源时，可以选择数据源加载方式
+- [XFormItem]：当数据源加载方式为懒加载搜索时，将渲染一个可以根据关键词实时查询的选择框
+- 问题修复：
+- [查询配置生成]：修复修改已有查询配置时，显示状态不一致的问题
+- [指令详情页]：修复操作记录查询报错的问题
+
+**##1.2.8 -2022-03-24 @江超**
+- 问题修复：
+- [登录页面]：修复登录后欢迎提示出现undefined的问题
+- [查询配置生成]：修复修改表单查询方式下拉框报错的问题
+
 **##1.2.7 -2022-03-24 @江超**
 - 功能新增：
 - [系统设置]：新增 [工单提交] 功能（submitTicket），用户在操作业务时如发现系统异常，可使用该功能反馈问题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.7",
+  "version": "1.2.10",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -314,7 +314,7 @@
                       <a-popover slot="suffix" title="关于组别内顺序" placement="bottom">
                         <template slot="content">
                           <p>多个下拉框为一组时,按照此顺序判断页面如何展示以及下拉框得父子顺序</p>
-                          <p>只有顺序为1得数据字段才可以选择数据源类型</p>
+                          <p>只有顺序为1的数据字段才可以选择数据源类型</p>
                         </template>
                         <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
                       </a-popover>
@@ -397,6 +397,20 @@
                   </a-form-model-item>
                 </a-col>
               </a-row>
+              <a-form-model-item label="数据源加载方式" prop="selectLoadType" v-if="item.formType === 'select' && item.selectType === 'logic'">
+                <a-row :guttor="16">
+                  <a-col :span="8">
+                    <a-radio-group v-model="item.lazyLoad" default-value="false" button-style="solid">
+                      <a-radio-button value="true">
+                        懒加载搜索
+                      </a-radio-button>
+                      <a-radio-button value="false">
+                        一次性加载
+                      </a-radio-button>
+                    </a-radio-group>
+                  </a-col>
+                </a-row>
+              </a-form-model-item>
               <a-form-model-item label="表单校验类型" prop="rule">
                 <a-row :gutter="16">
                   <a-col :span="8" v-if="item.formType === 'input' || item.formType === 'textarea'">
@@ -420,7 +434,7 @@
                     </a-select>
                   </a-col>
                   <a-col :span="8">
-                    <a-radio-group v-model="item.rule.required" default-value="true" button-style="solid">
+                    <a-radio-group v-model="item.rule.required" default-value="false" button-style="solid">
                       <a-radio-button value="true">
                         必选项
                       </a-radio-button>
@@ -648,7 +662,9 @@ export default {
         key: '',
         title: '',
         slot: {},
-        rule: {},
+        rule: {
+          required: 'false'
+        },
         dataModeArray: []
       },
       itemMap: {},
@@ -804,11 +820,16 @@ export default {
           // 必选项兼容处理
           if (columnItem.rule && !isNaN(columnItem.rule.required)) {
             columnItem.rule.required = columnItem.rule.required.toString()
+          } else {
+            if (!columnItem.rule) {
+              columnItem.rule = {}
+            }
+            columnItem.rule.required = 'false'
           }
           // 下拉框数据源兼容处理
           if ((columnItem.formType === 'select' || columnItem.formType === 'cascader') && columnItem.selectKey) {
             // 数据源为logic
-            if (columnItem.selectKey instanceof String && columnItem.selectKey.startsWith('logic@')) {
+            if (columnItem.selectKey.toString().startsWith('logic@')) {
               columnItem.selectType = 'logic'
             } else if (columnItem.selectKey instanceof Array || this.isJSON(columnItem.selectKey)) {
               // 数据源为固定json集合
@@ -824,7 +845,9 @@ export default {
             key: '',
             title: '',
             slot: {},
-            rule: {},
+            rule: {
+              required: 'false'
+            },
             dataModeArray: []
           }, columnItem)
         }
@@ -836,6 +859,8 @@ export default {
               this.buttonStateData.push(buttonStateKey)
             }
           }
+        } else {
+          this.buttonStateData = ['add', 'edit', 'delete', 'export']
         }
       }
     }
@@ -968,14 +993,10 @@ export default {
           delete item.formType
         }
         // 校验类型
-        if (!item.rule.type) {
-          delete item.rule
+        if (item.rule.required) {
+          item.rule.required = item.rule.required.toString() === 'true'
         } else {
-          if (item.rule.required) {
-            item.rule.required = item.rule.required.toString() === 'true'
-          } else {
-            item.rule.required = true
-          }
+          item.rule.required = false
         }
         // 下拉框
         if ((item.formType === 'select' || (item.formType === 'selects' && item.groupIndex == '1') || item.formType === 'cascader') && item.selectKey) {
@@ -1056,7 +1077,9 @@ export default {
         key: '',
         title: '',
         slot: {},
-        rule: {},
+        rule: {
+          required: 'false'
+        },
         dataModeArray: []
       }
       this.$message.success('增加成功')
@@ -1130,7 +1153,9 @@ export default {
           key: '',
           title: '',
           slot: {},
-          rule: {},
+          rule: {
+            required: 'false'
+          },
           dataModeArray: []
         }
         this.dataModeArrayData = ['queryForm', 'table', 'addOrEditForm', 'sqlQueryItem', 'sqlQueryCondition']

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

@@ -81,12 +81,17 @@
                     <a-select v-model="item.formType" placeholder="表单类型，可选">
                       <a-select-option key="input">输入框</a-select-option>
                       <a-select-option key="select">选择框</a-select-option>
+                      <a-select-option key="checkbox">多选框</a-select-option>
+                      <a-select-option key="radio">单选框</a-select-option>
                       <a-select-option key="rangePicker">日期范围选择框</a-select-option>
                       <a-select-option key="monthPicker">月份选择框</a-select-option>
                       <a-select-option key="datePicker">单日选择框</a-select-option>
-                      <a-select-option key="cascader">级联选择框</a-select-option>
+                      <a-select-option key="cascader">级联选择框(单个下拉)</a-select-option>
+                      <a-select-option key="selects">级联选择框(多个下拉)</a-select-option>
                       <a-select-option key="textarea">文本域</a-select-option>
-                      <a-popover slot="suffixIcon" title="关于表单类型" placement="bottom">
+                      <a-select-option key="file">文件上传</a-select-option>
+                      <a-select-option key="image">图片上传</a-select-option>
+                      <a-popover slot="suffixIcon" title="关于表单类型" placement="right">
                         <template slot="content">
                           <p>预览设置的表单类型</p>
                           <a-input-group compact style="width: 400px;">
@@ -99,6 +104,16 @@
                             <a-select style="width: 80%" placeholder="请选择"/>
                           </a-input-group>
                           <br/>
+                          <a-input-group compact style="width: 400px;">
+                            <a-input value="多选框" style="width: 20%" readOnly/>
+                            <a-checkbox-group style="margin-left: 10px;margin-top: 5px; width: 70%" :options="['数据1','数据2']"/>
+                          </a-input-group>
+                          <br/>
+                          <a-input-group compact style="width: 400px;">
+                            <a-input value="单选框" style="width: 20%" readOnly/>
+                            <a-radio-group style="margin-left: 10px;margin-top: 5px; width: 70%" :options="[{label: '数据1', value: 'a'},{label: '数据2', value: 'b'}]" name="radioGroup" />
+                          </a-input-group>
+                          <br/>
                           <a-input-group compact style="width: 400px;">
                             <a-input value="日期范围选择框" style="width: 20%" readOnly/>
                             <a-range-picker style="width: 80%" :show-time="true" format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" />
@@ -118,9 +133,39 @@
                             <a-input value="级联选择框" style="width: 20%" readOnly/>
                             <a-cascader style="width: 80%" placeholder="请选择"/>
                           </a-input-group>
+                          <br/>
                           <a-input-group compact style="width: 400px;">
                             <a-input value="文本域" style="width: 20%" readOnly/>
-                            <a-textarea style="width: 80%" placeholder="请输入" :rows="4"/>
+                            <a-textarea style="width: 80%" placeholder="请输入" :rows="1"/>
+                          </a-input-group>
+                          <br/>
+                          <a-input-group compact style="width: 400px;">
+                            <a-input value="文件上传" style="width: 20%" readOnly/>
+                            <a-upload-dragger
+                              name="file"
+                              :multiple="true"
+                              style="margin-left: 5px; width: 75%"
+                              action="https://www.mocky.io/v2/5cc8019d300000980a055e76">
+                              <p class="ant-upload-drag-icon">
+                                <a-icon type="inbox" />
+                              </p>
+                              <p class="ant-upload-text">
+                                点击或拖动文件到该区域上传
+                              </p>
+                              <p class="ant-upload-hint">
+                                支持单个或多个文件
+                              </p>
+                            </a-upload-dragger>
+                          </a-input-group>
+                          <br/>
+                          <a-input-group compact style="width: 400px;">
+                            <a-input value="图片上传" style="width: 20%" readOnly/>
+                            <a-upload style="margin-left: 5px; width: 75%" list-type="picture-card" :file-list="[]">
+                              <a-icon type="plus" />
+                              <div class="ant-upload-text">
+                                Upload
+                              </div>
+                            </a-upload>
                           </a-input-group>
                         </template>
                         <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
@@ -129,14 +174,112 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :span="8">
-                  <a-form-model-item label="表单水印" prop="placeholder">
+                  <a-form-model-item
+                    label="表单水印"
+                    prop="placeholder"
+                    v-if="item.formType !== 'checkbox' && item.formType !== 'radio' && item.formType !== 'file' && item.formType !== 'image'">
                     <a-input v-model="item.placeholder" placeholder="表单水印（placeholder），可选" />
                   </a-form-model-item>
                 </a-col>
               </a-row>
+              <a-row :gutter="16" v-if="item.formType === 'file' || item.formType === 'image'">
+                <a-col :span="8">
+                  <a-form-model-item
+                    label="允许上传文件数量"
+                    prop="accept"
+                    v-if="item.formType === 'file' || item.formType === 'image'">
+                    <a-slider
+                      v-model="item.acceptCount"
+                      :min="1"
+                      :max="20"
+                      :marks="{ 1: '1', 3: '3', 5: '5', 10: '10', 15: '15', 20: '20'}"
+                      :default-value="3"
+                    />
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="8">
+                  <a-form-model-item
+                    label="文件上传模式"
+                    prop="resUploadMode"
+                    v-if="item.formType === 'file' || item.formType === 'image'">
+                    <a-select v-model="item.resUploadMode" placeholder="文件上传模式，默认为服务器" @change="changeFormType(item)">
+                      <a-select-option key="server">服务器</a-select-option>
+                      <a-select-option key="oss">腾讯云对象存储</a-select-option>
+                      <a-select-option key="base64" :disabled="item.formType === 'file'">Base64</a-select-option>
+                      <a-popover slot="suffixIcon" title="关于资源上传模式" placement="right">
+                        <template slot="content">
+                          <p>指定文件上传到服务器，对象存储还是以base64方式存储</p>
+                          <br/>
+                          <p><span style="font-weight: bold">服务器：</span>文件上传到服务器，数据库需存储文件于服务器的路径</p>
+                          <p><span style="font-weight: bold">对象存储：</span>文件上传到云对象存储，数据库需存储文件于对象存储的路径</p>
+                          <p><span style="font-weight: bold">base64：</span>文件以base64字符串方式存入数据库中（仅图片上传表单支持）</p>
+                        </template>
+                        <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+                      </a-popover>
+                    </a-select>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="8">
+                  <a-form-model-item
+                    label="允许上传文件类型"
+                    prop="accept"
+                    v-if="item.formType === 'file'">
+                    <a-input v-model="item.accept" placeholder="指定文件类型，默认不限制，可选">
+                      <a-popover slot="suffix" title="关于允许上传文件类型" placement="bottom">
+                        <template slot="content">
+                          <p>指定允许上传的文件类型扩展名，如：.doc,.docx等，详情请参考<a target="_blank" @click="visitAcceptFile">允许上传文件类型</a></p>
+                        </template>
+                        <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+                      </a-popover>
+                    </a-input>
+                  </a-form-model-item>
+                </a-col>
+                <!-- TODO 配置文件上传表单-所属模块 -->
+                <!-- TODO 配置文件上传表单-上传扩展目录Key -->
+              </a-row>
+              <a-row :gutter="16" v-if="item.formType === 'selects'">
+                <a-col :span="8">
+                  <a-form-model-item label="数据所属组别" prop="group">
+                    <a-select v-model="item.group" placeholder="请输入数据字段名" ref="group">
+                      <a-select-option v-for="i in groupArray" :key="i">{{ i }}</a-select-option>
+                      <a-popover slot="suffixIcon" title="关于所属组别" placement="bottom">
+                        <template slot="content">
+                          <p>多个下拉框时按照次组别归为一组</p>
+                        </template>
+                        <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+                      </a-popover>
+                    </a-select>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="8">
+                  <a-form-model-item label="组别内顺序" prop="groupIndex">
+                    <a-select v-model="item.groupIndex" placeholder="表单类型，可选">
+                      <template v-for="i in 5">
+                        <a-select-option :key="i">{{ i }}</a-select-option>
+                      </template>
+                      <a-popover slot="suffix" title="关于组别内顺序" placement="bottom">
+                        <template slot="content">
+                          <p>多个下拉框为一组时,按照此顺序判断页面如何展示以及下拉框得父子顺序</p>
+                          <p>只有顺序为1的数据字段才可以选择数据源类型</p>
+                        </template>
+                        <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
+                      </a-popover>
+                    </a-select>
+                  </a-form-model-item>
+                </a-col>
+                <a-col :span="8">
+                  <a-form-model-item label="增加组" prop="groupName">
+                    <a-input-search v-model="item.groupName" @search="addGroupName" placeholder="请输入数据字段名" ref="key">
+                      <a-button slot="enterButton">
+                        新增
+                      </a-button>
+                    </a-input-search>
+                  </a-form-model-item>
+                </a-col>
+              </a-row>
               <a-row :gutter="16">
                 <a-col :span="8">
-                  <a-form-model-item label="数据源类型" prop="selectType" v-if="item.formType === 'select' || item.formType === 'cascader'">
+                  <a-form-model-item label="数据源类型" prop="selectType" v-if="item.formType === 'select' || (item.formType === 'selects' && item.groupIndex == 1) || item.formType === 'cascader'">
                     <a-select v-model="item.selectType" placeholder="请选择数据源类型" @change="changeSelectKey(item)">
                       <a-select-option key="key">字典键</a-select-option>
                       <a-select-option key="fixArray">固定集合</a-select-option>
@@ -149,8 +292,11 @@
                           <p>设置下拉框或级联框的数据源</p>
                           <p>数据源类型分为三种，你可以根据需要选择</p>
                           <p>字典键：选项从字典表(t_dictionary)获取，你只需要选择字典键的名称即可</p>
-                          <p>业务逻辑名称：选项通过发起http请求调用指定的Logic接口获取</p>
+                          <p>业务逻辑名称：选项通过发起http请求调用指定的业务逻辑(Logic)接口获取</p>
                           <p>固定集合：选项为静态值，JSONArray格式</p>
+                          <p>当表单类型为 " 级联选择框(多个下拉) " 是数据模式为 [{lable,value,children[{lable,value,children[]},{lable,value,children[]}]}] 形式</p>
+                          <p>如：</p>
+                          <json-viewer :value="DemoJson" :expand-depth="parseInt('100')" style="overflow: auto;max-height: 440px"></json-viewer>
                         </template>
                         <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
                       </a-popover>
@@ -158,7 +304,7 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :span="8">
-                  <a-form-model-item label="数据源" prop="selectKey" v-if="(item.formType === 'select' || item.formType === 'cascader') && item.selectType">
+                  <a-form-model-item label="数据源" prop="selectKey" v-if="(item.formType === 'select' || (item.formType === 'selects' && item.groupIndex == 1) || item.formType === 'cascader') && item.selectType">
                     <a-select
                       show-search
                       v-model="item.selectKey"
@@ -180,9 +326,23 @@
                   </a-form-model-item>
                 </a-col>
               </a-row>
+              <a-form-model-item label="数据源加载方式" prop="selectLoadType" v-if="item.formType === 'select' && item.selectType === 'logic'">
+                <a-row :guttor="16">
+                  <a-col :span="8">
+                    <a-radio-group v-model="item.lazyLoad" default-value="false" button-style="solid">
+                      <a-radio-button value="true">
+                        懒加载搜索
+                      </a-radio-button>
+                      <a-radio-button value="false">
+                        一次性加载
+                      </a-radio-button>
+                    </a-radio-group>
+                  </a-col>
+                </a-row>
+              </a-form-model-item>
               <a-form-model-item label="表单校验类型" prop="rule">
                 <a-row :gutter="16">
-                  <a-col :span="8">
+                  <a-col :span="8" v-if="item.formType === 'input' || item.formType === 'textarea'">
                     <a-select v-model="item.rule.type" placeholder="校验类型，可选">
                       <a-select-option key="string">字符串</a-select-option>
                       <a-select-option key="number">数字</a-select-option>
@@ -203,7 +363,7 @@
                     </a-select>
                   </a-col>
                   <a-col :span="8">
-                    <a-radio-group v-model="item.rule.required" v-if="item.rule.type" default-value="true" button-style="solid">
+                    <a-radio-group v-model="item.rule.required" default-value="false" button-style="solid">
                       <a-radio-button value="true">
                         必选项
                       </a-radio-button>
@@ -238,10 +398,11 @@
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
 import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
+import { queryType } from '@/config/CreateQueryConfig'
 import { mapState } from 'vuex'
 import { post } from '@vue2-client/services/api/restTools'
 import { commonApi } from '@vue2-client/services/api/common'
-
+const DemoJson = [{ value: 'zhejiang', label: 'Zhejiang', children: [{ value: 'hangzhou', label: 'Hangzhou', children: [{ value: 'xihu', label: 'West Lake' }] }] }]
 export default {
   name: 'CreateSimpleFormQuery',
   components: {
@@ -250,6 +411,7 @@ export default {
   },
   data () {
     return {
+      DemoJson,
       // 页面宽度
       screenWidth: document.documentElement.clientWidth,
       // 效果预览模态框是否展示
@@ -269,11 +431,15 @@ export default {
       item: {
         key: '',
         title: '',
-        rule: {}
+        rule: {
+          required: 'false'
+        }
       },
       itemMap: {},
       selectIndex: null,
       selectType: undefined,
+      joinArray: [],
+      groupArray: ['默认组别'],
       rules: {
         group: [{ required: true, message: '请输入参数组名称', trigger: 'blur' }],
         describe: [{ required: true, message: '请输入参数组描述', trigger: 'blur' }]
@@ -293,7 +459,13 @@ export default {
     this.initView()
   },
   computed: {
-    ...mapState('setting', ['isMobile'])
+    ...mapState('setting', ['isMobile']),
+    queryTypeV () {
+      if (this.item.formType) {
+        return queryType.filter(item => item.match.includes(this.item.formType))
+      }
+      return queryType
+    }
   },
   props: {
     visible: {
@@ -322,11 +494,16 @@ export default {
           // 必选项兼容处理
           if (columnItem.rule && !isNaN(columnItem.rule.required)) {
             columnItem.rule.required = columnItem.rule.required.toString()
+          } else {
+            if (!columnItem.rule) {
+              columnItem.rule = {}
+            }
+            columnItem.rule.required = 'false'
           }
           // 下拉框数据源兼容处理
           if ((columnItem.formType === 'select' || columnItem.formType === 'cascader') && columnItem.selectKey) {
             // 数据源为logic
-            if (columnItem.selectKey instanceof String && columnItem.selectKey.startsWith('logic@')) {
+            if (columnItem.selectKey.toString().startsWith('logic@')) {
               columnItem.selectType = 'logic'
             } else if (columnItem.selectKey instanceof Array || this.isJSON(columnItem.selectKey)) {
               // 数据源为固定json集合
@@ -341,13 +518,22 @@ export default {
           this.itemMap[columnItem.key] = Object.assign({
             key: '',
             title: '',
-            rule: {}
+            rule: {
+              required: 'false'
+            }
           }, columnItem)
         }
       }
     }
   },
   methods: {
+    // 添加多个下拉框分组标识符
+    addGroupName (val) {
+      this.item.groupName = undefined
+      if (!this.groupArray.find(item => item === val)) {
+        this.groupArray.push(val)
+      }
+    },
     // 初始化组件
     initView () {
       this.result = {}
@@ -424,20 +610,19 @@ export default {
         delete item.formType
       }
       // 校验类型
-      if (!item.rule.type) {
-        delete item.rule
+      if (item.rule.required) {
+        item.rule.required = item.rule.required.toString() === 'true'
       } else {
-        if (item.rule.required) {
-          item.rule.required = item.rule.required.toString() === 'true'
-        } else {
-          item.rule.required = true
-        }
+        item.rule.required = false
       }
       // 下拉框
-      if ((item.formType === 'select' || item.formType === 'cascader') && item.selectKey) {
+      if ((item.formType === 'select' || (item.formType === 'selects' && item.groupIndex == '1') || item.formType === 'cascader') && item.selectKey) {
         // 数据源为logic
         if (item.selectType === 'logic') {
-          item.selectKey = 'logic@' + item.selectKey
+          // 如果已经有了 logic@ 将不再拼接
+          if (item.selectKey.substring(0, 6) !== 'logic@') {
+            item.selectKey = 'logic@' + item.selectKey
+          }
         } else if (item.selectType === 'fixArray') {
           // 数据源为固定json集合
           if (!this.isJSON(item.selectKey)) {
@@ -445,10 +630,17 @@ export default {
             return
           }
         }
-        delete item.selectType
+        if (item.formType !== 'selects') {
+          delete item.selectType
+        }
       } else {
+        if (item.formType !== 'selects') {
+          delete item.group
+          delete item.groupIndex
+        }
         delete item.selectType
         delete item.selectKey
+        delete item.selectKeyName
       }
       if (this.type === '新增') {
         this.form.column.push(item)
@@ -458,7 +650,9 @@ export default {
       this.item = {
         key: '',
         title: '',
-        rule: {}
+        rule: {
+          required: 'false'
+        }
       }
       this.$message.success('增加成功')
       this.dataColumnVisible = false
@@ -523,7 +717,9 @@ export default {
         this.item = {
           key: '',
           title: '',
-          rule: {}
+          rule: {
+            required: 'false'
+          }
         }
       }, 100)
     },
@@ -532,6 +728,9 @@ export default {
         item.slot.type = 'badge'
         item.slotKeyMap = item.selectKey
       }
+    },
+    visitAcceptFile () {
+      window.open('https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/input/file#attr-accept')
     }
   }
 }

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

@@ -44,6 +44,7 @@
       :label="attr.name"
       :prop="attr.model">
       <a-select
+        v-if="!attr.lazyLoad"
         v-model="form[attr.model]"
         :disabled="disabled"
         show-search
@@ -82,6 +83,22 @@
           </template>
         </template>
       </a-select>
+      <a-select
+        v-else
+        show-search
+        v-model="form[attr.model]"
+        :disabled="disabled"
+        @search="fetchFunction"
+        :placeholder="attr.placeholder ? attr.placeholder : '搜索' + attr.name"
+        :filter-option="filterOption"
+      >
+        <a-spin v-if="searching" slot="notFoundContent" size="small" />
+        <a-select-option
+          v-for="(item,index) in option"
+          :key="index"
+          :value="Object.keys(item)[0]">{{ item[Object.keys(item)[0]] }}
+        </a-select-option>
+      </a-select>
     </a-form-model-item>
   </x-form-col>
   <!-- TODO 多选框 -->
@@ -149,12 +166,19 @@
 <script>
 
 import { post } from '@vue2-client/services/api/restTools'
+import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
 
 export default {
   name: 'XFormItem',
   data () {
+    // 检索去抖
+    this.fetchFunction = debounce(this.fetchFunction, 800)
     return {
-      option: []
+      option: [],
+      // 最后检索版本
+      lastFetchId: 0,
+      // 检索中
+      searching: false
     }
   },
   props: {
@@ -192,15 +216,37 @@ export default {
     }
   },
   created () {
-    if (this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
-      const logicName = this.attr.keyName
-      const logic = logicName.substring(6)
-      post('/webmeterapi/' + logic, {}).then(res => {
+    if (!this.attr.lazyLoad && this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
+      this.getData({}, res => {
         this.option = res
       })
     }
   },
   methods: {
+    // 懒加载检索方法
+    fetchFunction (value) {
+      this.lastFetchId += 1
+      const fetchId = this.lastFetchId
+      this.option = []
+      this.searching = true
+      this.getData({
+        word: value
+      }, res => {
+        if (fetchId !== this.lastFetchId) {
+          return
+        }
+        this.option = res
+        this.searching = false
+      })
+    },
+    // 获取数据
+    getData (value, callback) {
+      const logicName = this.attr.keyName
+      const logic = logicName.substring(6)
+      post('/webmeterapi/' + logic, value).then(res => {
+        callback(res)
+      })
+    },
     filterOption (input, option) {
       if (option.componentOptions.children[0].text) {
         return (

package/src/base-client/components/iot/InstructDetailsView/InstructDetailsView.vue

@@ -121,7 +121,7 @@
             :json-data="showColumns"
             :queryParamsName="queryParamsName"
             @loadData="loadData"
-            :form="form"
+            :fixedQueryForm="form"
           />
           <div v-else-if="operationActiveTabKey === '3'" class="no-data"><a-icon type="frown-o"/>暂无数据</div>
         </a-card>
@@ -188,8 +188,7 @@ export default {
       loaded: false,
       // 查询操作日志表单
       form: {
-        f_data_id: this.instructid,
-        f_org_name: this.selectOrgName
+        r_f_data_id: this.instructid
       },
       operationTabList: [
         {

package/src/config/CreateQueryConfig.js

@@ -0,0 +1,40 @@
+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'
+    }
+  ]
+}

package/src/pages/login/Login.vue

@@ -61,8 +61,8 @@ import { mapMutations } from 'vuex'
 import JSEncrypt from 'jsencrypt'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import Vue from 'vue'
-import Mock from 'mockjs'
 import { positions } from '@vue2-client/mock/common'
+import { timeFix } from '@vue2-client/utils/util'
 const { homePage, ticketPage } = require('@vue2-client/config')
 // import { router } from '@vue2-client/mock/user/routes'
 
@@ -128,7 +128,7 @@ export default {
             } else {
               this.$router.push(homePage).catch(() => {})
             }
-            this.$message.success(Mock.mock('@TIMEFIX').CN + '，欢迎回来', 3)
+            this.$message.success(timeFix().CN + '，欢迎回来', 3)
           })
         })
       } else {

package/src/utils/util.js

@@ -1,5 +1,29 @@
 import enquireJs from 'enquire.js'
 
+const timeList = [
+  {
+    CN: '早上好',
+    HK: '早晨啊',
+    US: 'Good morning'
+  }, {
+    CN: '上午好',
+    HK: '上午好',
+    US: 'Good morning'
+  }, {
+    CN: '中午好',
+    HK: '中午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '下午好',
+    HK: '下午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '晚上好',
+    HK: '晚上好',
+    US: 'Good evening'
+  }
+]
+
 export function isDef (v) {
   return v !== undefined && v !== null
 }
@@ -43,6 +67,13 @@ export function timeCompare (date1, date2) {
   return date11.time > date22.time ? 1 : -1
 }
 
+export function timeFix () {
+  const time = new Date()
+  const hour = time.getHours()
+  return hour < 9
+    ? timeList[0] : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
+}
+
 /**
  * Remove an item from an array.
  */
@@ -81,16 +112,15 @@ export function showXml (str) {
 
   // 把注释编码
   text = text.replace(/\n/g, '\r').replace(/<!--(.+?)-->/g, function ($0, text) {
-    var ret = '<!--' + escape(text) + '-->'
-    return ret
+    return '<!--' + escape(text) + '-->'
   }).replace(/\r/g, '\n')
 
   // 调整格式
-  const rgx = /\n(<(([^?]).+?)(?:\s|\s*?>|\s*?(\/)>)(?:.*?(?:(?:(\/)>)|(?:<(\/)\2>)))?)/mg
+  const rgx = /\n(<(([^?]).+?)(?:\s|\s*?>|\s*?(\/)>)(?:.*?(?:(\/)>|<(\/)\2>))?)/mg
   const nodeStack = []
   const output = text.replace(rgx, function ($0, all, name, isBegin, isCloseFull1, isCloseFull2, isFull1, isFull2) {
     const isClosed = (isCloseFull1 === '/') || (isCloseFull2 === '/') || (isFull1 === '/') || (isFull2 === '/')
-    let prefix = ''
+    let prefix
     if (isBegin === '!') {
       prefix = getPrefix(nodeStack.length)
     } else {