优化mb-search

修复代码生成查询列字典类型
修改mb-table：where属性 type -> component

data/magic-api/api/系统管理/配置中心/列表.ms

@@ -5,7 +5,7 @@
   "groupId" : "0295f2b4af9145f5a0ea29fa4b797214",
   "name" : "列表",
   "createTime" : null,
-  "updateTime" : 1653129241574,
+  "updateTime" : 1653634268957,
   "lock" : null,
   "createBy" : null,
   "updateBy" : null,
@@ -110,6 +110,7 @@ return db.page("""
     select id,configure_condition,configure_key,configure_value,configure_name,configure_type,configure_desc_ribe,remarks,create_date from sys_configure
     where is_del = 0
     ?{configureCondition, and configure_condition like concat('%',#{configureCondition},'%')}
-    ?{configureKey, and configure_key = #{configureKey}}
+    ?{configureKey, and configure_key like concat('%',#{configureKey},'%')}
+    ?{configureValue, and configure_value like concat('%',#{configureValue},'%')}
     order by create_date desc
 """)

magic-boot-ui/src/components/magic/data/mb-search.vue

@@ -3,22 +3,12 @@
     <el-form :inline="true" @keyup.enter="search">
       <span v-for="(it, i) in where">
         <el-form-item v-if="it && it.label" :label="it.label" :key="i">
-          <el-input v-if="!it.type || it.type == 'input'" @input="input(it.input)" v-model="it.value" :placeholder="it.placeholder || ('请输入' + it.label)" style="width: 200px;" class="filter-item" />
+          <component
-          <mb-select v-else-if="it.type == 'select'" v-model="it.value" :placeholder="'请选择' + it.label" v-bind="it.props" />
+              :is="!it.component ? 'mb-input' : it.component.startsWith('el-') || $global.dynamicComponentNames.indexOf(it.component) != -1 ? it.component : 'mb-' + it.component"
-          <el-date-picker
-            v-else-if="it.type == 'date' || it.type == 'datetime' || it.type == 'daterange' || it.type == 'datetimerange'"
               v-model="it.value"
-            align="right"
+              :item-label="it.label"
-            :format="it.type.startsWith('datetime') ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'"
+              v-bind="it.props"
-            :value-format="it.type.startsWith('datetime') ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'"
+          />
-            :type="it.type"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            :placeholder="it.type.startsWith('datetime') ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'"
-          >
-          </el-date-picker>
-          <mb-inputrange v-model="it.value" v-else-if="it.type == 'inputrange'" />
-          <component v-else :is="it.type" v-model="it.value" v-bind="it.props" />
         </el-form-item>
       </span>
       <el-form-item>

magic-boot-ui/src/components/magic/form/mb-select.vue

@@ -105,12 +105,10 @@ onMounted(() => {
 })
 
 function setValue(value){
-  if(value){
   if(props.multiple && props.join){
-      selectValue.value = value.split(',')
+    selectValue.value = value ? value.split(',') : []
   }else{
-      selectValue.value = value.toString()
+    selectValue.value = value ? value.toString() : ''
-    }
   }
 }
 

magic-boot-ui/src/scripts/gen/gen-mb-list.js

@@ -30,9 +30,17 @@ function gen(groupPath, data){
     for(var i in data){
         var d = data[i]
         if(d.query){
+            var props = ''
+            if(d.dictType){
+                props = `,
+                    props: {
+                        type: '${d.dictType}'
+                    }`
+            }
             html += `
                 ${d.columnName}: {
-                    label: '${d.columnComment}'
+                    label: '${d.columnComment}',
+                    ${d.component}${props}
                 },`
         }
     }

magic-boot-ui/src/views/examples/test-mb-list.vue

@@ -40,7 +40,7 @@ const listOptions = reactive({
         label: '姓名/昵称',
       },
       roleId: {
-        type: 'select',
+        component: 'select',
         label: '角色',
         props: {
           url: '/system/role/all',

magic-boot-ui/src/views/lowcode/code-gen-list.vue

@@ -33,9 +33,12 @@
           label: '描述'
         },
         createDate: {
+          component: 'date',
           label: '创建时间',
+          props: {
             type: 'daterange'
           }
+        }
       },
       cols: [
         {

magic-boot-ui/src/views/system/configure/configure-list.vue

@@ -92,14 +92,13 @@ const tableOptions = reactive({
   page: true,
   where: {
     configureCondition: {
-      type: 'input',
+      label: '查询条件'
-      label: '条件',
-      value: ''
     },
     configureKey: {
-      type: 'input',
+      label: '配置键值'
-      label: '键值',
+    },
-      value: ''
+    configureValue: {
+      label: '配置数据'
     }
   },
   cols: [

magic-boot-ui/src/views/system/dict/dict-items.vue

@@ -63,21 +63,17 @@ const tableOptions = reactive({
   page: true,
   where: {
     label: {
-      type: 'input',
+      label: '标签'
-      label: '标签',
-      value: ''
     },
     value: {
-      type: 'input',
+      label: '值'
-      label: '值',
-      value: ''
     },
     dictId: props.dictId
   },
   cols: [
     {
       field: 'label',
-      label: '类型'
+      label: '标签'
     },
     {
       field: 'value',

magic-boot-ui/src/views/system/dict/dict-list.vue

@@ -63,14 +63,11 @@ const tableOptions = reactive({
   page: true,
   where: {
     type: {
-      type: 'input',
+      label: '类型'
-      label: '类型',
-      value: ''
     },
     dictType: {
-      type: 'select',
+      component: 'select',
       label: '字典类型',
-      value: '',
       props: {
         'all-option': true,
         type: 'dict_type'

magic-boot-ui/src/views/system/monitor/login-log.vue

@@ -12,9 +12,11 @@
     url: '/system/log/login/list',
     where: {
       createDate: {
-        type: 'datetimerange',
+        component: 'date',
         label: '创建时间',
-        value: ''
+        props: {
+          type: 'datetimerange'
+        }
       }
     },
     cols: [

magic-boot-ui/src/views/system/monitor/oper-log.vue

@@ -30,12 +30,15 @@
         label: '路径'
       },
       costTime: {
-        label: '耗时区间',
+        component: 'inputrange',
-        type: 'inputrange'
+        label: '耗时区间'
       },
       createDate: {
-        type: 'datetimerange',
+        component: 'date',
-        label: '创建时间'
+        label: '创建时间',
+        props: {
+          type: 'datetimerange'
+        }
       }
     },
     cols: [

magic-boot-ui/src/views/system/role/role-list.vue

@@ -92,9 +92,7 @@ const tableOptions = reactive({
   url: '/system/role/list',
   where: {
     name: {
-      type: 'input',
+      label: '角色名称'
-      label: '角色名称',
-      value: ''
     }
   },
   cols: [

magic-boot-ui/src/views/system/user/user-list.vue

@@ -115,19 +115,14 @@ const tableOptions = reactive({
   selection: true,
   where: {
     username: {
-      type: 'input',
+      label: '登录名称'
-      label: '登录名称',
-      value: ''
     },
     name: {
-      type: 'input',
+      label: '姓名/昵称'
-      label: '姓名/昵称',
-      value: ''
     },
     roleId: {
-      type: 'select',
+      component: 'select',
       label: '角色',
-      value: '',
       props: {
         url: '/system/role/all',
         multiple: true