From a0a366923d2b3d603e09828278318a1e69ba4f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Sat, 11 Jun 2022 14:49:16 +0800
Subject: [PATCH 1/5] feat: api

---
 src/api/search/config.js | 35 +++++++++++++++++++++++++++++++++++
 src/api/search/system.js | 35 +++++++++++++++++++++++++++++++++++
 vite.config.js           |  2 +-
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 src/api/search/config.js
 create mode 100644 src/api/search/system.js

diff --git a/src/api/search/config.js b/src/api/search/config.js
new file mode 100644
index 0000000..069204f
--- /dev/null
+++ b/src/api/search/config.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request.js';
+export const search = (params) => {
+    return request({
+        url: '/search/admin/searchConfig',
+        method: 'get',
+        params,
+    });
+};
+export const detail = (id) => {
+    return request({
+        url: '/search/admin/searchConfig/' + id,
+        method: 'get',
+    });
+};
+export const create = (data) => {
+    return request({
+        url: '/search/admin/searchConfig',
+        method: 'post',
+        data,
+    });
+};
+export const update = (data) => {
+    return request({
+        url: '/search/admin/searchConfig',
+        method: 'put',
+        data,
+    });
+};
+export const remove = (id) => {
+    return request({
+        url: '/search/admin/searchConfig',
+        method: 'delete',
+        params: { id },
+    });
+};
diff --git a/src/api/search/system.js b/src/api/search/system.js
new file mode 100644
index 0000000..c47358c
--- /dev/null
+++ b/src/api/search/system.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request.js';
+export const search = (params) => {
+    return request({
+        url: '/search/admin/systemConfig',
+        method: 'get',
+        params,
+    });
+};
+export const detail = (id) => {
+    return request({
+        url: '/search/admin/systemConfig/' + id,
+        method: 'get',
+    });
+};
+export const create = (data) => {
+    return request({
+        url: '/search/admin/systemConfig',
+        method: 'post',
+        data,
+    });
+};
+export const update = (data) => {
+    return request({
+        url: '/search/admin/systemConfig',
+        method: 'put',
+        data,
+    });
+};
+export const remove = (id) => {
+    return request({
+        url: '/search/admin/systemConfig',
+        method: 'delete',
+        params: { id },
+    });
+};
diff --git a/vite.config.js b/vite.config.js
index 611fffc..0ea91a2 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -22,7 +22,7 @@ export default (configEnv) => {
                 '/api': {
                     // target: 'http://192.168.10.109:8090/', // 显雨
                     // target: 'http://192.168.10.5:4500', // 高玉
-                    // target: 'http://192.168.10.67:8090', // 罗战
+                    // target: 'http://192.168.10.87:8090', // 罗战
                     // target: 'http://192.168.10.93:8090', // 周渺
                     // target: 'http://192.168.10.124:8090', // 舒梦娇
                     target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址

From f282e344fc9b1ba20e6abb312fd8b48673842618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Sat, 11 Jun 2022 16:10:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/extra/ElTooltip.vue       |  16 +
 src/store/modules/search/searchSystem.js |  78 +++++
 src/views/search/config/index.vue        | 247 ++++++++++++++
 src/views/search/system/index.vue        | 389 +++++++++++++++++++++++
 4 files changed, 730 insertions(+)
 create mode 100644 src/components/extra/ElTooltip.vue
 create mode 100644 src/store/modules/search/searchSystem.js
 create mode 100644 src/views/search/config/index.vue
 create mode 100644 src/views/search/system/index.vue

diff --git a/src/components/extra/ElTooltip.vue b/src/components/extra/ElTooltip.vue
new file mode 100644
index 0000000..27068e6
--- /dev/null
+++ b/src/components/extra/ElTooltip.vue
@@ -0,0 +1,16 @@
+<template>
+    <component :is="render" />
+</template>
+<script setup lang="jsx">
+    import { ElTooltip } from 'element-plus/es/components/tooltip/index';
+    import 'element-plus/es/components/tooltip/style/css';
+    import ElIcon from './ElIcon.vue';
+    const props = defineProps({});
+    const attrs = useAttrs();
+    const slots = {
+        default: () => <ElIcon name="information" style="position: relative;top: 2px;margin-left: 5px;" />,
+        ...useSlots(),
+    };
+    const render = () => <ElTooltip {...props} {...attrs} v-slots={slots} />;
+</script>
+<style lang="less" scoped></style>
diff --git a/src/store/modules/search/searchSystem.js b/src/store/modules/search/searchSystem.js
new file mode 100644
index 0000000..d45d247
--- /dev/null
+++ b/src/store/modules/search/searchSystem.js
@@ -0,0 +1,78 @@
+import * as api from '@/api/system/notify.js';
+import { ElMessage, ElMessageBox } from '@/plugins/element-plus';
+const state = () => ({
+    code: 'SearchSystem',
+    condition: {},
+    list: [],
+    total: 0,
+    opts: {
+        init: false,
+    },
+});
+const getters = {};
+const mutations = {
+    setCode: (state, data) => (state.code = data),
+    setCondition: (state, data) => (state.condition = data),
+    setList: (state, data) => (state.list = data),
+    setTotal: (state, data) => (state.total = data),
+    setOpts: (state, data) => (state.opts = data),
+};
+const actions = {
+    search: async ({ state, commit, rootGetters }) => {
+        let data = { ...state.condition };
+        let res = await api.search({ ...rootGetters['local/page'](state.code), ...data });
+        commit('setList', res?.records || []);
+        commit('setTotal', res?.total || 0);
+        if (!res) {
+            ElMessage.error('查询失败');
+        }
+        return res;
+    },
+    load: async ({ commit }) => {
+        commit('setOpts', {
+            init: true,
+        });
+    },
+    detail: async (context, id) => {
+        let res = await api.detail(id);
+        if (!res) {
+            ElMessage.error('加载详情失败');
+        }
+        return res;
+    },
+    save: async ({ dispatch }, data) => {
+        let save = data.id ? api.update : api.create;
+        let res = await save(data);
+        if (res) {
+            ElMessage.success('保存成功');
+            dispatch('search');
+        } else {
+            ElMessage.error('保存失败');
+        }
+        return res;
+    },
+    remove: async ({ dispatch }, idList) => {
+        if (!idList.length) {
+            ElMessage.warning('请选择要删除的数据');
+        } else {
+            try {
+                await ElMessageBox.confirm('数据删除后无法恢复，确定要删除吗?', '危险操作');
+                let res = await api.remove(idList.join(','));
+                if (res) {
+                    ElMessage.success('删除成功');
+                    dispatch('search');
+                } else {
+                    ElMessage.error('删除失败');
+                }
+            } catch (e) {
+                console.info('取消删除', e);
+            }
+        }
+    },
+};
+export default {
+    state,
+    getters,
+    mutations,
+    actions,
+};
diff --git a/src/views/search/config/index.vue b/src/views/search/config/index.vue
new file mode 100644
index 0000000..08614ff
--- /dev/null
+++ b/src/views/search/config/index.vue
@@ -0,0 +1,247 @@
+<template>
+    <div class="list-container">
+        <table-list
+            v-loading="loading"
+            :code="code"
+            :config="config"
+            :data="list"
+            :operation="['create', 'search', 'remove']"
+            :reset="handleReset"
+            title="客服"
+            :total="total"
+            @create="handleCreate()"
+            @remove="handleRemove"
+            @search="handleSearch"
+        >
+            <template #search>
+                <el-form inline>
+                    <el-form-item label="所属店铺" prop="storeId">
+                        <el-select
+                            v-model="state.condition.storeId"
+                            :config="{ label: 'name', value: 'id' }"
+                            :opts="opts.store"
+                        />
+                    </el-form-item>
+                    <el-form-item label="客服ID" prop="waiterId">
+                        <el-input v-model="state.condition.waiterId" />
+                    </el-form-item>
+                    <el-form-item label="客服昵称" prop="waiterNickname">
+                        <el-input v-model="state.condition.waiterNickname" />
+                    </el-form-item>
+                </el-form>
+            </template>
+        </table-list>
+        <el-dialog v-model="formState.formVisible" :title="formState.form.id ? '编辑' : '添加' + '店铺'" width="480px">
+            <el-form
+                ref="refsForm"
+                v-loading="formState.submitting"
+                label-width="100px"
+                :model="formState.form"
+                :rules="formState.rules"
+            >
+                <el-form-item label="所属店铺" prop="storeId">
+                    <el-select
+                        v-model="formState.form.storeId"
+                        :config="{ label: 'name', value: 'id' }"
+                        :disabled="formState.form.id"
+                        :opts="opts.store"
+                    />
+                </el-form-item>
+                <el-form-item label="客服类型" prop="type">
+                    <el-input v-model="formState.form.type" maxlength="20" />
+                </el-form-item>
+                <el-form-item label="客服头像" prop="waiterAvatar">
+                    <el-upload-image v-model="formState.form.waiterAvatar" config-id="im/" />
+                </el-form-item>
+                <el-form-item label="客服ID" prop="waiterId">
+                    <el-input v-model="formState.form.waiterId" :disabled="!!formState.form.id" maxlength="20" />
+                </el-form-item>
+                <el-form-item label="客服昵称" prop="waiterNickname">
+                    <el-input v-model="formState.form.waiterNickname" maxlength="20" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <el-button @click="formState.formVisible = false">取消</el-button>
+                <el-button :loading="formState.submitting" type="primary" @click="handleSave">保存</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="jsx">
+    import ElButton from '@/components/extra/ElButton.vue';
+    import ElImage from '@/components/extra/ElImage.vue';
+    const store = useStore();
+    const route = useRoute();
+    const { proxy } = getCurrentInstance();
+    const loading = ref(false);
+    const code = computed(() => store.state.chatWaiter.code);
+    const list = computed(() => store.state.chatWaiter.list);
+    const total = computed(() => store.state.chatWaiter.total);
+    const opts = computed(() => store.state.chatWaiter.opts);
+    if (!unref(opts).init) {
+        store.dispatch('chatWaiter/load');
+    }
+    const state = reactive({
+        condition: {
+            storeId: null,
+            waiterId: null,
+            waiterNickname: null,
+        },
+    });
+    const handleReset = () => {
+        state.condition = {
+            storeId: unref(opts).store?.[0]?.id,
+            waiterId: null,
+            waiterNickname: null,
+        };
+    };
+    const handleSearch = async () => {
+        if (state.condition.storeId) {
+            loading.value = true;
+            await store.dispatch('chatWaiter/search');
+            loading.value = false;
+        } else {
+            store.commit('chatWaiter/setList', []);
+            store.commit('chatWaiter/setTotal', 0);
+        }
+    };
+    watch(
+        () => unref(opts).store,
+        (value) => {
+            if (!state.condition.storeId) {
+                state.condition.storeId = value[0]?.id;
+            }
+        }
+    );
+    watch(
+        () => state.condition,
+        (value) => {
+            store.commit('chatWaiter/setCondition', _.cloneDeep(value));
+        },
+        { immediate: true, deep: true }
+    );
+    watch(
+        () => state.condition.storeId,
+        () => {
+            handleSearch();
+        }
+    );
+    onActivated(() => {
+        let storeId = route.query.storeId;
+        if (storeId) {
+            state.condition.storeId = +storeId;
+        } else {
+            handleSearch();
+        }
+    });
+
+    /* 表单 */
+    const refsForm = ref(null);
+    const formState = reactive({
+        formVisible: false,
+        submitting: false,
+        form: {
+            id: null,
+            storeId: null,
+            type: null,
+            waiterAvatar: null,
+            waiterId: null,
+            waiterNickname: null,
+        },
+        rules: {
+            storeId: [{ required: true, message: '所属店铺不能为空' }],
+            type: [{ required: true, message: '客服类型不能为空' }],
+            waiterAvatar: [{ required: true, message: '客服头像不能为空' }],
+            waiterId: [{ required: true, message: '客服ID不能为空' }],
+            waiterNickname: [{ required: true, message: '客服昵称不能为空' }],
+        },
+    });
+    // 添加/编辑
+    const handleCreate = (row) => {
+        Object.assign(
+            formState.form,
+            row || {
+                id: null,
+                storeId: null,
+                type: null,
+                waiterAvatar: null,
+                waiterId: null,
+                waiterNickname: null,
+            }
+        );
+        if (!formState.form.storeId) {
+            formState.form.storeId = state.condition.storeId;
+        }
+        formState.formVisible = true;
+    };
+    // 保存
+    const handleSave = async () => {
+        formState.submitting = true;
+        try {
+            await proxy.$validate(refsForm);
+            let data = _.cloneDeep(formState.form);
+            await store.dispatch('chatWaiter/save', data);
+            formState.formVisible = false;
+        } catch (e) {
+            console.info('取消保存', e);
+        }
+        formState.submitting = false;
+    };
+    const handleRemove = async (rows) => {
+        store.dispatch('chatWaiter/remove', {
+            storeId: state.condition.storeId,
+            waiterIds: rows.map((item) => item.waiterId),
+        });
+    };
+    const config = reactive({
+        // 表格列配置
+        columns: [
+            {
+                type: 'selection',
+                width: 60,
+            },
+            {
+                label: '所属店铺',
+                width: 160,
+                slots: {
+                    default: ({ row }) => proxy.$dict(unref(opts).store, row.storeId, { label: 'name', value: 'id' }),
+                },
+            },
+            {
+                label: '客服头像',
+                width: 160,
+                slots: {
+                    default: ({ row }) => <ElImage src={row.waiterAvatar} alt={row.waiterNickname} />,
+                },
+            },
+            {
+                label: '客服ID',
+                prop: 'waiterId',
+            },
+            {
+                label: '客服昵称',
+                prop: 'waiterNickname',
+            },
+            {
+                label: '操作',
+                fixed: 'right',
+                slots: {
+                    default: ({ row }) => (
+                        <div>
+                            <ElButton type="text" onClick={() => handleCreate(row)}>
+                                编辑
+                            </ElButton>
+                            <ElButton type="text" onClick={() => handleRemove([row])}>
+                                删除
+                            </ElButton>
+                        </div>
+                    ),
+                },
+                width: 120,
+            },
+        ],
+    });
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/search/system/index.vue b/src/views/search/system/index.vue
new file mode 100644
index 0000000..fa0b63d
--- /dev/null
+++ b/src/views/search/system/index.vue
@@ -0,0 +1,389 @@
+<template>
+    <div class="list-container">
+        <table-list
+            v-loading="loading"
+            :code="code"
+            :config="config"
+            :data="list"
+            :operation="['create', 'search', 'remove']"
+            :reset="handleReset"
+            title="系统配置"
+            :total="total"
+            @create="handleCreate()"
+            @remove="handleRemove"
+            @search="handleSearch"
+        >
+            <template #search>
+                <el-form inline label-width="100px">
+                    <el-form-item label="主键" prop="id">
+                        <el-input v-model="state.condition.id" />
+                    </el-form-item>
+                    <el-form-item label="系统ID" prop="systemId">
+                        <el-input v-model="state.condition.systemId" />
+                    </el-form-item>
+                    <el-form-item label="作者" prop="author">
+                        <el-input v-model="state.condition.author" />
+                    </el-form-item>
+                    <el-form-item label="数据库名称" prop="databaseName">
+                        <el-input v-model="state.condition.databaseName" />
+                    </el-form-item>
+                    <el-form-item prop="documentIdExp">
+                        <template #label>
+                            <span>ES文档ID</span>
+                            <el-tooltip
+                                content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
+                                placement="top"
+                            />
+                        </template>
+                        <el-input v-model="state.condition.documentIdExp" />
+                    </el-form-item>
+                    <el-form-item prop="order">
+                        <template #label>
+                            <span>排序</span>
+                            <el-tooltip
+                                content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
+                                placement="top"
+                            />
+                        </template>
+                        <el-input v-model="state.condition.order" />
+                    </el-form-item>
+                    <el-form-item label="搜索码" prop="searchCode">
+                        <el-input v-model="state.condition.searchCode" />
+                    </el-form-item>
+                    <el-form-item prop="searchFiled">
+                        <template #label>
+                            <span>搜索字段</span>
+                            <el-tooltip
+                                content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
+                                placement="top"
+                            />
+                        </template>
+                        <el-input v-model="state.condition.searchFiled" />
+                    </el-form-item>
+                    <el-form-item label="搜索名" prop="searchName">
+                        <el-input v-model="state.condition.searchName" />
+                    </el-form-item>
+                    <el-form-item prop="syncCron">
+                        <template #label>
+                            <span>同步频率</span>
+                            <el-tooltip
+                                content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
+                                placement="top"
+                            />
+                        </template>
+                        <el-input v-model="state.condition.syncCron" />
+                    </el-form-item>
+                </el-form>
+            </template>
+        </table-list>
+        <el-dialog v-model="formState.formVisible" :title="formState.form.id ? '编辑' : '添加' + '系统'" width="480px">
+            <el-form
+                ref="refsForm"
+                v-loading="formState.submitting"
+                label-width="100px"
+                :model="formState.form"
+                :rules="formState.rules"
+            >
+                <el-form-item label="主键" prop="id">
+                    <el-input v-model="formState.form.id" />
+                </el-form-item>
+                <el-form-item label="系统ID" prop="systemId">
+                    <el-input v-model="formState.form.systemId" />
+                </el-form-item>
+                <el-form-item label="作者" prop="author">
+                    <el-input v-model="formState.form.author" />
+                </el-form-item>
+                <el-form-item label="数据库名称" prop="databaseName">
+                    <el-input v-model="formState.form.databaseName" />
+                </el-form-item>
+                <el-form-item prop="documentIdExp">
+                    <template #label>
+                        <span>ES文档ID</span>
+                        <el-tooltip
+                            content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
+                            placement="top"
+                        />
+                    </template>
+                    <el-input v-model="formState.form.documentIdExp" />
+                </el-form-item>
+                <el-form-item prop="order">
+                    <template #label>
+                        <span>排序</span>
+                        <el-tooltip
+                            content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
+                            placement="top"
+                        />
+                    </template>
+                    <el-input v-model="formState.form.order" />
+                </el-form-item>
+                <el-form-item label="搜索码" prop="searchCode">
+                    <el-input v-model="formState.form.searchCode" />
+                </el-form-item>
+                <el-form-item prop="searchFiled">
+                    <template #label>
+                        <span>搜索字段</span>
+                        <el-tooltip
+                            content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
+                            placement="top"
+                        />
+                    </template>
+                    <el-input v-model="formState.form.searchFiled" />
+                </el-form-item>
+                <el-form-item label="搜索名" prop="searchName">
+                    <el-input v-model="formState.form.searchName" />
+                </el-form-item>
+                <el-form-item prop="syncCron">
+                    <template #label>
+                        <span>同步频率</span>
+                        <el-tooltip
+                            content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
+                            placement="top"
+                        />
+                    </template>
+                    <el-input v-model="formState.form.syncCron" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <el-button @click="formState.formVisible = false">取消</el-button>
+                <el-button :loading="formState.submitting" type="primary" @click="handleSave">保存</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="jsx">
+    import ElButton from '@/components/extra/ElButton.vue';
+    import ElTooltip from '@/components/extra/ElTooltip.vue';
+    const store = useStore();
+    const { proxy } = getCurrentInstance();
+    const loading = ref(false);
+    const code = computed(() => store.state.searchSystem.code);
+    const list = computed(() => store.state.searchSystem.list);
+    const total = computed(() => store.state.searchSystem.total);
+    const opts = computed(() => store.state.searchSystem.opts);
+    if (!unref(opts).init) {
+        store.dispatch('searchSystem/load');
+    }
+    const state = reactive({
+        condition: {
+            author: null,
+            databaseName: null,
+            documentIdExp: null,
+            id: null,
+            order: null,
+            searchCode: null,
+            searchFiled: null,
+            searchName: null,
+            syncCron: null,
+            systemId: null,
+        },
+    });
+    watch(
+        () => state.condition,
+        (value) => {
+            store.commit('searchSystem/setCondition', _.cloneDeep(value));
+        },
+        { immediate: true, deep: true }
+    );
+    const handleReset = () => {
+        state.condition = {
+            author: null,
+            databaseName: null,
+            documentIdExp: null,
+            id: null,
+            order: null,
+            searchCode: null,
+            searchFiled: null,
+            searchName: null,
+            syncCron: null,
+            systemId: null,
+        };
+    };
+    const handleSearch = async () => {
+        loading.value = true;
+        await store.dispatch('searchSystem/search');
+        loading.value = false;
+    };
+    onActivated(handleSearch);
+
+    /* 表单 */
+    const refsForm = ref(null);
+    const formState = reactive({
+        formVisible: false,
+        submitting: false,
+        form: {
+            author: null,
+            databaseName: null,
+            documentIdExp: null,
+            id: null,
+            order: null,
+            searchCode: null,
+            searchFiled: null,
+            searchName: null,
+            syncCron: null,
+            systemId: null,
+        },
+        rules: {
+            author: [{ required: true, message: '作者不能为空' }],
+            databaseName: [{ required: true, message: '数据库名称不能为空' }],
+            documentIdExp: [{ required: true, message: 'ES文档ID不能为空' }],
+            order: [{ required: true, message: '排序不能为空' }],
+            searchCode: [{ required: true, message: '搜索码不能为空' }],
+            searchFiled: [{ required: true, message: '搜索字段不能为空' }],
+            searchName: [{ required: true, message: '搜索名不能为空' }],
+            syncCron: [{ required: true, message: '同步频率不能为空' }],
+            systemId: [{ required: true, message: '系统ID不能为空' }],
+        },
+    });
+    // 添加/编辑
+    const handleCreate = (row) => {
+        Object.assign(
+            formState.form,
+            row || {
+                author: null,
+                databaseName: null,
+                documentIdExp: null,
+                id: null,
+                order: null,
+                searchCode: null,
+                searchFiled: null,
+                searchName: null,
+                syncCron: null,
+                systemId: null,
+            }
+        );
+        formState.formVisible = true;
+    };
+    // 保存
+    const handleSave = async () => {
+        formState.submitting = true;
+        try {
+            await proxy.$validate(refsForm);
+            let data = _.cloneDeep(formState.form);
+            await store.dispatch('searchSystem/save', data);
+            formState.formVisible = false;
+        } catch (e) {
+            console.info('取消保存', e);
+        }
+        formState.submitting = false;
+    };
+    const handleRemove = async (rows) => {
+        store.dispatch(
+            'searchSystem/remove',
+            rows.map((item) => item.id)
+        );
+    };
+    const config = reactive({
+        columns: [
+            {
+                type: 'selection',
+                width: 60,
+            },
+            {
+                label: '主键',
+                prop: 'id',
+                width: 100,
+            },
+            {
+                label: '系统ID',
+                prop: 'systemId',
+            },
+            {
+                label: '作者',
+                prop: 'author',
+            },
+            {
+                label: '数据库名称',
+                prop: 'databaseName',
+                minWidth: 120,
+            },
+            {
+                prop: 'documentIdExp',
+                minWidth: 120,
+                slots: {
+                    header: () => (
+                        <p>
+                            <span>ES文档ID</span>
+                            <ElTooltip
+                                content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
+                                placement="top"
+                            />
+                        </p>
+                    ),
+                },
+            },
+            {
+                prop: 'order',
+                width: 100,
+                slots: {
+                    header: () => (
+                        <p>
+                            <span>排序</span>
+                            <ElTooltip
+                                content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
+                                placement="top"
+                            />
+                        </p>
+                    ),
+                },
+            },
+            {
+                label: '搜索码',
+                prop: 'searchCode',
+            },
+            {
+                prop: 'searchFiled',
+                minWidth: 120,
+                slots: {
+                    header: () => (
+                        <p>
+                            <span>搜索字段</span>
+                            <ElTooltip
+                                content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
+                                placement="top"
+                            />
+                        </p>
+                    ),
+                },
+            },
+            {
+                label: '搜索名',
+                prop: 'searchName',
+            },
+            {
+                prop: 'syncCron',
+                minWidth: 120,
+                slots: {
+                    header: () => (
+                        <p>
+                            <span>同步频率</span>
+                            <ElTooltip
+                                content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
+                                placement="top"
+                            />
+                        </p>
+                    ),
+                },
+            },
+            {
+                label: '操作',
+                fixed: 'right',
+                width: 120,
+                slots: {
+                    default: ({ row }) => (
+                        <div>
+                            <ElButton type="text" onClick={() => handleCreate(row)}>
+                                编辑
+                            </ElButton>
+                            <ElButton type="text" onClick={() => handleRemove([row])}>
+                                删除
+                            </ElButton>
+                        </div>
+                    ),
+                },
+            },
+        ],
+    });
+</script>
+
+<style lang="less" scoped></style>

From 8edf39fe4f4f3244513f8369b61f6d7adc635d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Sat, 11 Jun 2022 16:23:53 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/sales/category.js      |   7 +-
 src/store/modules/sales/orderShip.js     |   5 +-
 src/store/modules/search/searchConfig.js |  79 +++++
 src/store/modules/search/searchSystem.js |   9 +-
 src/store/modules/system/customer.js     |  12 +-
 src/store/modules/system/notify.js       |   3 +-
 src/views/search/config/index.vue        | 247 ---------------
 src/views/search/search/index.vue        | 386 +++++++++++++++++++++++
 src/views/search/system/index.vue        | 228 ++++---------
 9 files changed, 540 insertions(+), 436 deletions(-)
 create mode 100644 src/store/modules/search/searchConfig.js
 delete mode 100644 src/views/search/config/index.vue
 create mode 100644 src/views/search/search/index.vue

diff --git a/src/store/modules/sales/category.js b/src/store/modules/sales/category.js
index 57b9eb1..c3fcb62 100644
--- a/src/store/modules/sales/category.js
+++ b/src/store/modules/sales/category.js
@@ -34,13 +34,10 @@ const actions = {
         }
         return res;
     },
-    load: async ({ commit }) => {
+    load: async ({ state, commit }) => {
         commit('setOpts', {
+            ...state.opts,
             init: true,
-            visible: [
-                { label: '显示', value: true },
-                { label: '隐藏', value: false },
-            ],
         });
     },
     detail: async ({ state, dispatch }, id) => {
diff --git a/src/store/modules/sales/orderShip.js b/src/store/modules/sales/orderShip.js
index 35989a6..ff458b7 100644
--- a/src/store/modules/sales/orderShip.js
+++ b/src/store/modules/sales/orderShip.js
@@ -11,7 +11,7 @@ const state = () => ({
     summary: [],
     opts: {
         init: false,
-        company: [{ label: '顺丰', value: 'sf' }],
+        company: [],
     },
 });
 const getters = {};
@@ -31,8 +31,9 @@ const actions = {
         }
         return res;
     },
-    load: async ({ commit }) => {
+    load: async ({ state, commit }) => {
         commit('setOpts', {
+            ...state.opts,
             init: true,
             company: await api.searchShip(),
         });
diff --git a/src/store/modules/search/searchConfig.js b/src/store/modules/search/searchConfig.js
new file mode 100644
index 0000000..ce103e4
--- /dev/null
+++ b/src/store/modules/search/searchConfig.js
@@ -0,0 +1,79 @@
+import * as api from '@/api/system/notify.js';
+import { ElMessage, ElMessageBox } from '@/plugins/element-plus';
+const state = () => ({
+    code: 'SearchConfig',
+    condition: {},
+    list: [],
+    total: 0,
+    opts: {
+        init: false,
+    },
+});
+const getters = {};
+const mutations = {
+    setCode: (state, data) => (state.code = data),
+    setCondition: (state, data) => (state.condition = data),
+    setList: (state, data) => (state.list = data),
+    setTotal: (state, data) => (state.total = data),
+    setOpts: (state, data) => (state.opts = data),
+};
+const actions = {
+    search: async ({ state, commit, rootGetters }) => {
+        let data = { ...state.condition };
+        let res = await api.search({ ...rootGetters['local/page'](state.code), ...data });
+        commit('setList', res?.records || []);
+        commit('setTotal', res?.total || 0);
+        if (!res) {
+            ElMessage.error('查询失败');
+        }
+        return res;
+    },
+    load: async ({ state, commit }) => {
+        commit('setOpts', {
+            ...state.opts,
+            init: true,
+        });
+    },
+    detail: async (context, id) => {
+        let res = await api.detail(id);
+        if (!res) {
+            ElMessage.error('加载详情失败');
+        }
+        return res;
+    },
+    save: async ({ dispatch }, data) => {
+        let save = data.id ? api.update : api.create;
+        let res = await save(data);
+        if (res) {
+            ElMessage.success('保存成功');
+            dispatch('search');
+        } else {
+            ElMessage.error('保存失败');
+        }
+        return res;
+    },
+    remove: async ({ dispatch }, idList) => {
+        if (!idList.length) {
+            ElMessage.warning('请选择要删除的数据');
+        } else {
+            try {
+                await ElMessageBox.confirm('数据删除后无法恢复，确定要删除吗?', '危险操作');
+                let res = await api.remove(idList.join(','));
+                if (res) {
+                    ElMessage.success('删除成功');
+                    dispatch('search');
+                } else {
+                    ElMessage.error('删除失败');
+                }
+            } catch (e) {
+                console.info('取消删除', e);
+            }
+        }
+    },
+};
+export default {
+    state,
+    getters,
+    mutations,
+    actions,
+};
diff --git a/src/store/modules/search/searchSystem.js b/src/store/modules/search/searchSystem.js
index d45d247..1ace0e9 100644
--- a/src/store/modules/search/searchSystem.js
+++ b/src/store/modules/search/searchSystem.js
@@ -7,6 +7,12 @@ const state = () => ({
     total: 0,
     opts: {
         init: false,
+        type: [
+            {
+                label: 'MySQL',
+                value: 1,
+            },
+        ],
     },
 });
 const getters = {};
@@ -28,8 +34,9 @@ const actions = {
         }
         return res;
     },
-    load: async ({ commit }) => {
+    load: async ({ state, commit }) => {
         commit('setOpts', {
+            ...state.opts,
             init: true,
         });
     },
diff --git a/src/store/modules/system/customer.js b/src/store/modules/system/customer.js
index f39bdc7..dfabe3b 100644
--- a/src/store/modules/system/customer.js
+++ b/src/store/modules/system/customer.js
@@ -7,7 +7,10 @@ const state = () => ({
     total: 0,
     opts: {
         init: false,
-        gender: [],
+        gender: [
+            { label: '男', value: 1 },
+            { label: '女', value: 2 },
+        ],
     },
 });
 const getters = {};
@@ -36,13 +39,10 @@ const actions = {
         }
         return res;
     },
-    load: async ({ commit }) => {
+    load: async ({ state, commit }) => {
         commit('setOpts', {
+            ...state.opts,
             init: true,
-            gender: [
-                { label: '男', value: 1 },
-                { label: '女', value: 2 },
-            ],
         });
     },
     enable: async ({ dispatch }, data) => {
diff --git a/src/store/modules/system/notify.js b/src/store/modules/system/notify.js
index 535c033..284c8b7 100644
--- a/src/store/modules/system/notify.js
+++ b/src/store/modules/system/notify.js
@@ -33,8 +33,9 @@ const actions = {
         }
         return res;
     },
-    load: async ({ commit }) => {
+    load: async ({ state, commit }) => {
         commit('setOpts', {
+            ...state.opts,
             init: true,
         });
     },
diff --git a/src/views/search/config/index.vue b/src/views/search/config/index.vue
deleted file mode 100644
index 08614ff..0000000
--- a/src/views/search/config/index.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<template>
-    <div class="list-container">
-        <table-list
-            v-loading="loading"
-            :code="code"
-            :config="config"
-            :data="list"
-            :operation="['create', 'search', 'remove']"
-            :reset="handleReset"
-            title="客服"
-            :total="total"
-            @create="handleCreate()"
-            @remove="handleRemove"
-            @search="handleSearch"
-        >
-            <template #search>
-                <el-form inline>
-                    <el-form-item label="所属店铺" prop="storeId">
-                        <el-select
-                            v-model="state.condition.storeId"
-                            :config="{ label: 'name', value: 'id' }"
-                            :opts="opts.store"
-                        />
-                    </el-form-item>
-                    <el-form-item label="客服ID" prop="waiterId">
-                        <el-input v-model="state.condition.waiterId" />
-                    </el-form-item>
-                    <el-form-item label="客服昵称" prop="waiterNickname">
-                        <el-input v-model="state.condition.waiterNickname" />
-                    </el-form-item>
-                </el-form>
-            </template>
-        </table-list>
-        <el-dialog v-model="formState.formVisible" :title="formState.form.id ? '编辑' : '添加' + '店铺'" width="480px">
-            <el-form
-                ref="refsForm"
-                v-loading="formState.submitting"
-                label-width="100px"
-                :model="formState.form"
-                :rules="formState.rules"
-            >
-                <el-form-item label="所属店铺" prop="storeId">
-                    <el-select
-                        v-model="formState.form.storeId"
-                        :config="{ label: 'name', value: 'id' }"
-                        :disabled="formState.form.id"
-                        :opts="opts.store"
-                    />
-                </el-form-item>
-                <el-form-item label="客服类型" prop="type">
-                    <el-input v-model="formState.form.type" maxlength="20" />
-                </el-form-item>
-                <el-form-item label="客服头像" prop="waiterAvatar">
-                    <el-upload-image v-model="formState.form.waiterAvatar" config-id="im/" />
-                </el-form-item>
-                <el-form-item label="客服ID" prop="waiterId">
-                    <el-input v-model="formState.form.waiterId" :disabled="!!formState.form.id" maxlength="20" />
-                </el-form-item>
-                <el-form-item label="客服昵称" prop="waiterNickname">
-                    <el-input v-model="formState.form.waiterNickname" maxlength="20" />
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <el-button @click="formState.formVisible = false">取消</el-button>
-                <el-button :loading="formState.submitting" type="primary" @click="handleSave">保存</el-button>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-
-<script setup lang="jsx">
-    import ElButton from '@/components/extra/ElButton.vue';
-    import ElImage from '@/components/extra/ElImage.vue';
-    const store = useStore();
-    const route = useRoute();
-    const { proxy } = getCurrentInstance();
-    const loading = ref(false);
-    const code = computed(() => store.state.chatWaiter.code);
-    const list = computed(() => store.state.chatWaiter.list);
-    const total = computed(() => store.state.chatWaiter.total);
-    const opts = computed(() => store.state.chatWaiter.opts);
-    if (!unref(opts).init) {
-        store.dispatch('chatWaiter/load');
-    }
-    const state = reactive({
-        condition: {
-            storeId: null,
-            waiterId: null,
-            waiterNickname: null,
-        },
-    });
-    const handleReset = () => {
-        state.condition = {
-            storeId: unref(opts).store?.[0]?.id,
-            waiterId: null,
-            waiterNickname: null,
-        };
-    };
-    const handleSearch = async () => {
-        if (state.condition.storeId) {
-            loading.value = true;
-            await store.dispatch('chatWaiter/search');
-            loading.value = false;
-        } else {
-            store.commit('chatWaiter/setList', []);
-            store.commit('chatWaiter/setTotal', 0);
-        }
-    };
-    watch(
-        () => unref(opts).store,
-        (value) => {
-            if (!state.condition.storeId) {
-                state.condition.storeId = value[0]?.id;
-            }
-        }
-    );
-    watch(
-        () => state.condition,
-        (value) => {
-            store.commit('chatWaiter/setCondition', _.cloneDeep(value));
-        },
-        { immediate: true, deep: true }
-    );
-    watch(
-        () => state.condition.storeId,
-        () => {
-            handleSearch();
-        }
-    );
-    onActivated(() => {
-        let storeId = route.query.storeId;
-        if (storeId) {
-            state.condition.storeId = +storeId;
-        } else {
-            handleSearch();
-        }
-    });
-
-    /* 表单 */
-    const refsForm = ref(null);
-    const formState = reactive({
-        formVisible: false,
-        submitting: false,
-        form: {
-            id: null,
-            storeId: null,
-            type: null,
-            waiterAvatar: null,
-            waiterId: null,
-            waiterNickname: null,
-        },
-        rules: {
-            storeId: [{ required: true, message: '所属店铺不能为空' }],
-            type: [{ required: true, message: '客服类型不能为空' }],
-            waiterAvatar: [{ required: true, message: '客服头像不能为空' }],
-            waiterId: [{ required: true, message: '客服ID不能为空' }],
-            waiterNickname: [{ required: true, message: '客服昵称不能为空' }],
-        },
-    });
-    // 添加/编辑
-    const handleCreate = (row) => {
-        Object.assign(
-            formState.form,
-            row || {
-                id: null,
-                storeId: null,
-                type: null,
-                waiterAvatar: null,
-                waiterId: null,
-                waiterNickname: null,
-            }
-        );
-        if (!formState.form.storeId) {
-            formState.form.storeId = state.condition.storeId;
-        }
-        formState.formVisible = true;
-    };
-    // 保存
-    const handleSave = async () => {
-        formState.submitting = true;
-        try {
-            await proxy.$validate(refsForm);
-            let data = _.cloneDeep(formState.form);
-            await store.dispatch('chatWaiter/save', data);
-            formState.formVisible = false;
-        } catch (e) {
-            console.info('取消保存', e);
-        }
-        formState.submitting = false;
-    };
-    const handleRemove = async (rows) => {
-        store.dispatch('chatWaiter/remove', {
-            storeId: state.condition.storeId,
-            waiterIds: rows.map((item) => item.waiterId),
-        });
-    };
-    const config = reactive({
-        // 表格列配置
-        columns: [
-            {
-                type: 'selection',
-                width: 60,
-            },
-            {
-                label: '所属店铺',
-                width: 160,
-                slots: {
-                    default: ({ row }) => proxy.$dict(unref(opts).store, row.storeId, { label: 'name', value: 'id' }),
-                },
-            },
-            {
-                label: '客服头像',
-                width: 160,
-                slots: {
-                    default: ({ row }) => <ElImage src={row.waiterAvatar} alt={row.waiterNickname} />,
-                },
-            },
-            {
-                label: '客服ID',
-                prop: 'waiterId',
-            },
-            {
-                label: '客服昵称',
-                prop: 'waiterNickname',
-            },
-            {
-                label: '操作',
-                fixed: 'right',
-                slots: {
-                    default: ({ row }) => (
-                        <div>
-                            <ElButton type="text" onClick={() => handleCreate(row)}>
-                                编辑
-                            </ElButton>
-                            <ElButton type="text" onClick={() => handleRemove([row])}>
-                                删除
-                            </ElButton>
-                        </div>
-                    ),
-                },
-                width: 120,
-            },
-        ],
-    });
-</script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/search/search/index.vue b/src/views/search/search/index.vue
new file mode 100644
index 0000000..0584b6c
--- /dev/null
+++ b/src/views/search/search/index.vue
@@ -0,0 +1,386 @@
+<template>
+    <div class="list-container">
+        <table-list
+            v-loading="loading"
+            :code="code"
+            :config="config"
+            :data="list"
+            :operation="['create', 'search', 'remove']"
+            :reset="handleReset"
+            title="搜索配置"
+            :total="total"
+            @create="handleCreate()"
+            @remove="handleRemove"
+            @search="handleSearch"
+        >
+            <template #search>
+                <el-form inline label-width="100px">
+                    <el-form-item label="主键" prop="id">
+                        <el-input v-model="state.condition.id" />
+                    </el-form-item>
+                    <el-form-item label="系统ID" prop="systemId">
+                        <el-input v-model="state.condition.systemId" />
+                    </el-form-item>
+                    <el-form-item label="作者" prop="author">
+                        <el-input v-model="state.condition.author" />
+                    </el-form-item>
+                    <el-form-item label="数据库名称" prop="databaseName">
+                        <el-input v-model="state.condition.databaseName" />
+                    </el-form-item>
+                    <el-form-item prop="documentIdExp">
+                        <template #label>
+                            <span>ES文档ID</span>
+                            <el-tooltip
+                                content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
+                                placement="top"
+                            />
+                        </template>
+                        <el-input v-model="state.condition.documentIdExp" />
+                    </el-form-item>
+                    <el-form-item prop="order">
+                        <template #label>
+                            <span>排序</span>
+                            <el-tooltip
+                                content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
+                                placement="top"
+                            />
+                        </template>
+                        <el-input v-model="state.condition.order" />
+                    </el-form-item>
+                    <el-form-item label="搜索码" prop="searchCode">
+                        <el-input v-model="state.condition.searchCode" />
+                    </el-form-item>
+                    <el-form-item prop="searchFiled">
+                        <template #label>
+                            <span>搜索字段</span>
+                            <el-tooltip
+                                content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
+                                placement="top"
+                            />
+                        </template>
+                        <el-input v-model="state.condition.searchFiled" />
+                    </el-form-item>
+                    <el-form-item label="搜索名" prop="searchName">
+                        <el-input v-model="state.condition.searchName" />
+                    </el-form-item>
+                    <el-form-item prop="syncCron">
+                        <template #label>
+                            <span>同步频率</span>
+                            <el-tooltip
+                                content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
+                                placement="top"
+                            />
+                        </template>
+                        <el-input v-model="state.condition.syncCron" />
+                    </el-form-item>
+                </el-form>
+            </template>
+        </table-list>
+        <el-dialog v-model="formState.formVisible" :title="formState.form.id ? '编辑' : '添加' + '系统'" width="480px">
+            <el-form
+                ref="refsForm"
+                v-loading="formState.submitting"
+                label-width="100px"
+                :model="formState.form"
+                :rules="formState.rules"
+            >
+                <el-form-item label="系统ID" prop="systemId">
+                    <el-input v-model="formState.form.systemId" />
+                </el-form-item>
+                <el-form-item label="作者" prop="author">
+                    <el-input v-model="formState.form.author" />
+                </el-form-item>
+                <el-form-item label="数据库名称" prop="databaseName">
+                    <el-input v-model="formState.form.databaseName" />
+                </el-form-item>
+                <el-form-item prop="documentIdExp">
+                    <template #label>
+                        <span>ES文档ID</span>
+                        <el-tooltip
+                            content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
+                            placement="top"
+                        />
+                    </template>
+                    <el-input v-model="formState.form.documentIdExp" />
+                </el-form-item>
+                <el-form-item label="搜索码" prop="searchCode">
+                    <el-input v-model="formState.form.searchCode" />
+                </el-form-item>
+                <el-form-item prop="searchFiled">
+                    <template #label>
+                        <span>搜索字段</span>
+                        <el-tooltip
+                            content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
+                            placement="top"
+                        />
+                    </template>
+                    <el-input v-model="formState.form.searchFiled" />
+                </el-form-item>
+                <el-form-item label="搜索名" prop="searchName">
+                    <el-input v-model="formState.form.searchName" />
+                </el-form-item>
+                <el-form-item prop="syncCron">
+                    <template #label>
+                        <span>同步频率</span>
+                        <el-tooltip
+                            content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
+                            placement="top"
+                        />
+                    </template>
+                    <el-input v-model="formState.form.syncCron" />
+                </el-form-item>
+                <el-form-item prop="order">
+                    <template #label>
+                        <span>排序</span>
+                        <el-tooltip
+                            content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
+                            placement="top"
+                        />
+                    </template>
+                    <el-input v-model="formState.form.order" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <el-button @click="formState.formVisible = false">取消</el-button>
+                <el-button :loading="formState.submitting" type="primary" @click="handleSave">保存</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="jsx">
+    import ElButton from '@/components/extra/ElButton.vue';
+    import ElTooltip from '@/components/extra/ElTooltip.vue';
+    const store = useStore();
+    const { proxy } = getCurrentInstance();
+    const loading = ref(false);
+    const code = computed(() => store.state.searchConfig.code);
+    const list = computed(() => store.state.searchConfig.list);
+    const total = computed(() => store.state.searchConfig.total);
+    const opts = computed(() => store.state.searchConfig.opts);
+    if (!unref(opts).init) {
+        store.dispatch('searchConfig/load');
+    }
+    const state = reactive({
+        condition: {
+            author: null,
+            databaseName: null,
+            documentIdExp: null,
+            id: null,
+            order: null,
+            searchCode: null,
+            searchFiled: null,
+            searchName: null,
+            syncCron: null,
+            systemId: null,
+        },
+    });
+    watch(
+        () => state.condition,
+        (value) => {
+            store.commit('searchConfig/setCondition', _.cloneDeep(value));
+        },
+        { immediate: true, deep: true }
+    );
+    const handleReset = () => {
+        state.condition = {
+            author: null,
+            databaseName: null,
+            documentIdExp: null,
+            id: null,
+            order: null,
+            searchCode: null,
+            searchFiled: null,
+            searchName: null,
+            syncCron: null,
+            systemId: null,
+        };
+    };
+    const handleSearch = async () => {
+        loading.value = true;
+        await store.dispatch('searchConfig/search');
+        loading.value = false;
+    };
+    onActivated(handleSearch);
+
+    /* 表单 */
+    const refsForm = ref(null);
+    const formState = reactive({
+        formVisible: false,
+        submitting: false,
+        form: {
+            author: null,
+            databaseName: null,
+            documentIdExp: null,
+            id: null,
+            order: null,
+            searchCode: null,
+            searchFiled: null,
+            searchName: null,
+            syncCron: null,
+            systemId: null,
+        },
+        rules: {
+            author: [{ required: true, message: '作者不能为空' }],
+            databaseName: [{ required: true, message: '数据库名称不能为空' }],
+            documentIdExp: [{ required: true, message: 'ES文档ID不能为空' }],
+            order: [{ required: true, message: '排序不能为空' }],
+            searchCode: [{ required: true, message: '搜索码不能为空' }],
+            searchFiled: [{ required: true, message: '搜索字段不能为空' }],
+            searchName: [{ required: true, message: '搜索名不能为空' }],
+            syncCron: [{ required: true, message: '同步频率不能为空' }],
+            systemId: [{ required: true, message: '系统ID不能为空' }],
+        },
+    });
+    // 添加/编辑
+    const handleCreate = (row) => {
+        Object.assign(
+            formState.form,
+            row || {
+                author: null,
+                databaseName: null,
+                documentIdExp: null,
+                id: null,
+                order: null,
+                searchCode: null,
+                searchFiled: null,
+                searchName: null,
+                syncCron: null,
+                systemId: null,
+            }
+        );
+        formState.formVisible = true;
+    };
+    // 保存
+    const handleSave = async () => {
+        formState.submitting = true;
+        try {
+            await proxy.$validate(refsForm);
+            let data = _.cloneDeep(formState.form);
+            await store.dispatch('searchConfig/save', data);
+            formState.formVisible = false;
+        } catch (e) {
+            console.info('取消保存', e);
+        }
+        formState.submitting = false;
+    };
+    const handleRemove = async (rows) => {
+        store.dispatch(
+            'searchConfig/remove',
+            rows.map((item) => item.id)
+        );
+    };
+    const config = reactive({
+        columns: [
+            {
+                type: 'selection',
+                width: 60,
+            },
+            {
+                label: '主键',
+                prop: 'id',
+                width: 100,
+            },
+            {
+                label: '系统ID',
+                prop: 'systemId',
+            },
+            {
+                label: '作者',
+                prop: 'author',
+            },
+            {
+                label: '数据库名称',
+                prop: 'databaseName',
+                minWidth: 120,
+            },
+            {
+                prop: 'documentIdExp',
+                minWidth: 120,
+                slots: {
+                    header: () => (
+                        <p>
+                            <span>ES文档ID</span>
+                            <ElTooltip
+                                content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
+                                placement="top"
+                            />
+                        </p>
+                    ),
+                },
+            },
+            {
+                prop: 'order',
+                width: 100,
+                slots: {
+                    header: () => (
+                        <p>
+                            <span>排序</span>
+                            <ElTooltip
+                                content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
+                                placement="top"
+                            />
+                        </p>
+                    ),
+                },
+            },
+            {
+                label: '搜索码',
+                prop: 'searchCode',
+            },
+            {
+                prop: 'searchFiled',
+                minWidth: 120,
+                slots: {
+                    header: () => (
+                        <p>
+                            <span>搜索字段</span>
+                            <ElTooltip
+                                content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
+                                placement="top"
+                            />
+                        </p>
+                    ),
+                },
+            },
+            {
+                label: '搜索名',
+                prop: 'searchName',
+            },
+            {
+                prop: 'syncCron',
+                minWidth: 120,
+                slots: {
+                    header: () => (
+                        <p>
+                            <span>同步频率</span>
+                            <ElTooltip
+                                content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
+                                placement="top"
+                            />
+                        </p>
+                    ),
+                },
+            },
+            {
+                label: '操作',
+                fixed: 'right',
+                width: 120,
+                slots: {
+                    default: ({ row }) => (
+                        <div>
+                            <ElButton type="text" onClick={() => handleCreate(row)}>
+                                编辑
+                            </ElButton>
+                            <ElButton type="text" onClick={() => handleRemove([row])}>
+                                删除
+                            </ElButton>
+                        </div>
+                    ),
+                },
+            },
+        ],
+    });
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/search/system/index.vue b/src/views/search/system/index.vue
index fa0b63d..73dc77b 100644
--- a/src/views/search/system/index.vue
+++ b/src/views/search/system/index.vue
@@ -14,28 +14,25 @@
             @search="handleSearch"
         >
             <template #search>
-                <el-form inline label-width="100px">
+                <el-form inline label-width="110px">
                     <el-form-item label="主键" prop="id">
                         <el-input v-model="state.condition.id" />
                     </el-form-item>
-                    <el-form-item label="系统ID" prop="systemId">
-                        <el-input v-model="state.condition.systemId" />
+                    <el-form-item label="系统编码" prop="systemCode">
+                        <el-input v-model="state.condition.systemCode" />
                     </el-form-item>
-                    <el-form-item label="作者" prop="author">
-                        <el-input v-model="state.condition.author" />
+                    <el-form-item label="系统名称" prop="systemName">
+                        <el-input v-model="state.condition.systemName" />
                     </el-form-item>
-                    <el-form-item label="数据库名称" prop="databaseName">
-                        <el-input v-model="state.condition.databaseName" />
+                    <el-form-item label="数据库类型" prop="databaseType">
+                        <el-select v-model="state.condition.databaseType" :opts="opts.type" />
                     </el-form-item>
-                    <el-form-item prop="documentIdExp">
+                    <el-form-item prop="datasource">
                         <template #label>
-                            <span>ES文档ID</span>
-                            <el-tooltip
-                                content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
-                                placement="top"
-                            />
+                            <span>数据库配置</span>
+                            <el-tooltip content="格式：“ip:port”" placement="top" />
                         </template>
-                        <el-input v-model="state.condition.documentIdExp" />
+                        <el-input v-model="state.condition.datasource" />
                     </el-form-item>
                     <el-form-item prop="order">
                         <template #label>
@@ -47,32 +44,6 @@
                         </template>
                         <el-input v-model="state.condition.order" />
                     </el-form-item>
-                    <el-form-item label="搜索码" prop="searchCode">
-                        <el-input v-model="state.condition.searchCode" />
-                    </el-form-item>
-                    <el-form-item prop="searchFiled">
-                        <template #label>
-                            <span>搜索字段</span>
-                            <el-tooltip
-                                content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
-                                placement="top"
-                            />
-                        </template>
-                        <el-input v-model="state.condition.searchFiled" />
-                    </el-form-item>
-                    <el-form-item label="搜索名" prop="searchName">
-                        <el-input v-model="state.condition.searchName" />
-                    </el-form-item>
-                    <el-form-item prop="syncCron">
-                        <template #label>
-                            <span>同步频率</span>
-                            <el-tooltip
-                                content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
-                                placement="top"
-                            />
-                        </template>
-                        <el-input v-model="state.condition.syncCron" />
-                    </el-form-item>
                 </el-form>
             </template>
         </table-list>
@@ -80,31 +51,25 @@
             <el-form
                 ref="refsForm"
                 v-loading="formState.submitting"
-                label-width="100px"
+                label-width="120px"
                 :model="formState.form"
                 :rules="formState.rules"
             >
-                <el-form-item label="主键" prop="id">
-                    <el-input v-model="formState.form.id" />
-                </el-form-item>
-                <el-form-item label="系统ID" prop="systemId">
-                    <el-input v-model="formState.form.systemId" />
+                <el-form-item label="系统编码" prop="systemCode">
+                    <el-input v-model="formState.form.systemCode" />
                 </el-form-item>
-                <el-form-item label="作者" prop="author">
-                    <el-input v-model="formState.form.author" />
+                <el-form-item label="系统名称" prop="systemName">
+                    <el-input v-model="formState.form.systemName" />
                 </el-form-item>
-                <el-form-item label="数据库名称" prop="databaseName">
-                    <el-input v-model="formState.form.databaseName" />
+                <el-form-item label="数据库类型" prop="databaseType">
+                    <el-select v-model="formState.form.databaseType" :opts="opts.type" />
                 </el-form-item>
-                <el-form-item prop="documentIdExp">
+                <el-form-item prop="datasource">
                     <template #label>
-                        <span>ES文档ID</span>
-                        <el-tooltip
-                            content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
-                            placement="top"
-                        />
+                        <span>数据库配置</span>
+                        <el-tooltip content="格式：“ip:port”" placement="top" />
                     </template>
-                    <el-input v-model="formState.form.documentIdExp" />
+                    <el-input v-model="formState.form.datasource" />
                 </el-form-item>
                 <el-form-item prop="order">
                     <template #label>
@@ -116,32 +81,6 @@
                     </template>
                     <el-input v-model="formState.form.order" />
                 </el-form-item>
-                <el-form-item label="搜索码" prop="searchCode">
-                    <el-input v-model="formState.form.searchCode" />
-                </el-form-item>
-                <el-form-item prop="searchFiled">
-                    <template #label>
-                        <span>搜索字段</span>
-                        <el-tooltip
-                            content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
-                            placement="top"
-                        />
-                    </template>
-                    <el-input v-model="formState.form.searchFiled" />
-                </el-form-item>
-                <el-form-item label="搜索名" prop="searchName">
-                    <el-input v-model="formState.form.searchName" />
-                </el-form-item>
-                <el-form-item prop="syncCron">
-                    <template #label>
-                        <span>同步频率</span>
-                        <el-tooltip
-                            content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
-                            placement="top"
-                        />
-                    </template>
-                    <el-input v-model="formState.form.syncCron" />
-                </el-form-item>
             </el-form>
             <template #footer>
                 <el-button @click="formState.formVisible = false">取消</el-button>
@@ -166,16 +105,12 @@
     }
     const state = reactive({
         condition: {
-            author: null,
-            databaseName: null,
-            documentIdExp: null,
             id: null,
+            databaseType: null,
+            datasource: null,
             order: null,
-            searchCode: null,
-            searchFiled: null,
-            searchName: null,
-            syncCron: null,
-            systemId: null,
+            systemCode: null,
+            systemName: null,
         },
     });
     watch(
@@ -187,16 +122,12 @@
     );
     const handleReset = () => {
         state.condition = {
-            author: null,
-            databaseName: null,
-            documentIdExp: null,
             id: null,
+            databaseType: null,
+            datasource: null,
             order: null,
-            searchCode: null,
-            searchFiled: null,
-            searchName: null,
-            syncCron: null,
-            systemId: null,
+            systemCode: null,
+            systemName: null,
         };
     };
     const handleSearch = async () => {
@@ -212,27 +143,19 @@
         formVisible: false,
         submitting: false,
         form: {
-            author: null,
-            databaseName: null,
-            documentIdExp: null,
             id: null,
+            databaseType: null,
+            datasource: null,
             order: null,
-            searchCode: null,
-            searchFiled: null,
-            searchName: null,
-            syncCron: null,
-            systemId: null,
+            systemCode: null,
+            systemName: null,
         },
         rules: {
-            author: [{ required: true, message: '作者不能为空' }],
-            databaseName: [{ required: true, message: '数据库名称不能为空' }],
-            documentIdExp: [{ required: true, message: 'ES文档ID不能为空' }],
+            databaseType: [{ required: true, message: '数据库类型不能为空' }],
+            datasource: [{ required: true, message: '数据库配置不能为空' }],
             order: [{ required: true, message: '排序不能为空' }],
-            searchCode: [{ required: true, message: '搜索码不能为空' }],
-            searchFiled: [{ required: true, message: '搜索字段不能为空' }],
-            searchName: [{ required: true, message: '搜索名不能为空' }],
-            syncCron: [{ required: true, message: '同步频率不能为空' }],
-            systemId: [{ required: true, message: '系统ID不能为空' }],
+            systemCode: [{ required: true, message: '系统编码不能为空' }],
+            systemName: [{ required: true, message: '系统名称不能为空' }],
         },
     });
     // 添加/编辑
@@ -240,16 +163,12 @@
         Object.assign(
             formState.form,
             row || {
-                author: null,
-                databaseName: null,
-                documentIdExp: null,
                 id: null,
+                databaseType: null,
+                datasource: null,
                 order: null,
-                searchCode: null,
-                searchFiled: null,
-                searchName: null,
-                syncCron: null,
-                systemId: null,
+                systemCode: null,
+                systemName: null,
             }
         );
         formState.formVisible = true;
@@ -285,29 +204,28 @@
                 width: 100,
             },
             {
-                label: '系统ID',
-                prop: 'systemId',
+                label: '系统编码',
+                prop: 'systemCode',
             },
             {
-                label: '作者',
-                prop: 'author',
+                label: '系统名称',
+                prop: 'systemName',
             },
             {
-                label: '数据库名称',
-                prop: 'databaseName',
-                minWidth: 120,
+                label: '数据库类型',
+                width: 100,
+                slots: {
+                    default: ({ row }) => proxy.$dict(unref(opts).type, row.databaseType),
+                },
             },
             {
-                prop: 'documentIdExp',
+                prop: 'datasource',
                 minWidth: 120,
                 slots: {
                     header: () => (
                         <p>
-                            <span>ES文档ID</span>
-                            <ElTooltip
-                                content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
-                                placement="top"
-                            />
+                            <span>数据库配置</span>
+                            <ElTooltip content="格式：“ip:port”" placement="top" />
                         </p>
                     ),
                 },
@@ -327,44 +245,6 @@
                     ),
                 },
             },
-            {
-                label: '搜索码',
-                prop: 'searchCode',
-            },
-            {
-                prop: 'searchFiled',
-                minWidth: 120,
-                slots: {
-                    header: () => (
-                        <p>
-                            <span>搜索字段</span>
-                            <ElTooltip
-                                content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
-                                placement="top"
-                            />
-                        </p>
-                    ),
-                },
-            },
-            {
-                label: '搜索名',
-                prop: 'searchName',
-            },
-            {
-                prop: 'syncCron',
-                minWidth: 120,
-                slots: {
-                    header: () => (
-                        <p>
-                            <span>同步频率</span>
-                            <ElTooltip
-                                content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
-                                placement="top"
-                            />
-                        </p>
-                    ),
-                },
-            },
             {
                 label: '操作',
                 fixed: 'right',

From d20aa839ae3dfb0f2aafa75a99573792ea3f4a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Sat, 11 Jun 2022 17:46:27 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/search/searchConfig.js      |  5 +-
 src/store/modules/search/searchSystem.js      |  2 +-
 src/views/search/{search => config}/index.vue | 65 ++++++++-----------
 src/views/search/system/index.vue             | 35 ++--------
 vite.config.js                                |  4 +-
 5 files changed, 37 insertions(+), 74 deletions(-)
 rename src/views/search/{search => config}/index.vue (90%)

diff --git a/src/store/modules/search/searchConfig.js b/src/store/modules/search/searchConfig.js
index ce103e4..595ccef 100644
--- a/src/store/modules/search/searchConfig.js
+++ b/src/store/modules/search/searchConfig.js
@@ -1,4 +1,5 @@
-import * as api from '@/api/system/notify.js';
+import * as api from '@/api/search/config.js';
+import * as systemAPI from '@/api/search/system.js';
 import { ElMessage, ElMessageBox } from '@/plugins/element-plus';
 const state = () => ({
     code: 'SearchConfig',
@@ -7,6 +8,7 @@ const state = () => ({
     total: 0,
     opts: {
         init: false,
+        system: [],
     },
 });
 const getters = {};
@@ -32,6 +34,7 @@ const actions = {
         commit('setOpts', {
             ...state.opts,
             init: true,
+            system: (await systemAPI.search({ pageIndex: 1, length: 99999 }))?.records || [],
         });
     },
     detail: async (context, id) => {
diff --git a/src/store/modules/search/searchSystem.js b/src/store/modules/search/searchSystem.js
index 1ace0e9..df1e3ff 100644
--- a/src/store/modules/search/searchSystem.js
+++ b/src/store/modules/search/searchSystem.js
@@ -1,4 +1,4 @@
-import * as api from '@/api/system/notify.js';
+import * as api from '@/api/search/system.js';
 import { ElMessage, ElMessageBox } from '@/plugins/element-plus';
 const state = () => ({
     code: 'SearchSystem',
diff --git a/src/views/search/search/index.vue b/src/views/search/config/index.vue
similarity index 90%
rename from src/views/search/search/index.vue
rename to src/views/search/config/index.vue
index 0584b6c..2015d39 100644
--- a/src/views/search/search/index.vue
+++ b/src/views/search/config/index.vue
@@ -15,12 +15,16 @@
         >
             <template #search>
                 <el-form inline label-width="100px">
+                    <el-form-item label="所属系统" prop="systemId">
+                        <el-select
+                            v-model="state.condition.systemId"
+                            :config="{ label: 'systemName', value: 'id' }"
+                            :opts="opts.system"
+                        />
+                    </el-form-item>
                     <el-form-item label="主键" prop="id">
                         <el-input v-model="state.condition.id" />
                     </el-form-item>
-                    <el-form-item label="系统ID" prop="systemId">
-                        <el-input v-model="state.condition.systemId" />
-                    </el-form-item>
                     <el-form-item label="作者" prop="author">
                         <el-input v-model="state.condition.author" />
                     </el-form-item>
@@ -84,8 +88,12 @@
                 :model="formState.form"
                 :rules="formState.rules"
             >
-                <el-form-item label="系统ID" prop="systemId">
-                    <el-input v-model="formState.form.systemId" />
+                <el-form-item label="所属系统" prop="systemId">
+                    <el-select
+                        v-model="formState.form.systemId"
+                        :config="{ label: 'systemName', value: 'id' }"
+                        :opts="opts.system"
+                    />
                 </el-form-item>
                 <el-form-item label="作者" prop="author">
                     <el-input v-model="formState.form.author" />
@@ -129,16 +137,6 @@
                     </template>
                     <el-input v-model="formState.form.syncCron" />
                 </el-form-item>
-                <el-form-item prop="order">
-                    <template #label>
-                        <span>排序</span>
-                        <el-tooltip
-                            content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
-                            placement="top"
-                        />
-                    </template>
-                    <el-input v-model="formState.form.order" />
-                </el-form-item>
             </el-form>
             <template #footer>
                 <el-button @click="formState.formVisible = false">取消</el-button>
@@ -213,7 +211,6 @@
             databaseName: null,
             documentIdExp: null,
             id: null,
-            order: null,
             searchCode: null,
             searchFiled: null,
             searchName: null,
@@ -224,7 +221,6 @@
             author: [{ required: true, message: '作者不能为空' }],
             databaseName: [{ required: true, message: '数据库名称不能为空' }],
             documentIdExp: [{ required: true, message: 'ES文档ID不能为空' }],
-            order: [{ required: true, message: '排序不能为空' }],
             searchCode: [{ required: true, message: '搜索码不能为空' }],
             searchFiled: [{ required: true, message: '搜索字段不能为空' }],
             searchName: [{ required: true, message: '搜索名不能为空' }],
@@ -241,7 +237,6 @@
                 databaseName: null,
                 documentIdExp: null,
                 id: null,
-                order: null,
                 searchCode: null,
                 searchFiled: null,
                 searchName: null,
@@ -257,8 +252,10 @@
         try {
             await proxy.$validate(refsForm);
             let data = _.cloneDeep(formState.form);
-            await store.dispatch('searchConfig/save', data);
-            formState.formVisible = false;
+            let res = await store.dispatch('searchConfig/save', data);
+            if (res) {
+                formState.formVisible = false;
+            }
         } catch (e) {
             console.info('取消保存', e);
         }
@@ -276,15 +273,20 @@
                 type: 'selection',
                 width: 60,
             },
+            {
+                label: '所属系统',
+                prop: 'systemId',
+                minWidth: 120,
+                slots: {
+                    default: ({ row }) =>
+                        proxy.$dict(unref(opts).system, row.systemId, { label: 'systemName', value: 'id' }),
+                },
+            },
             {
                 label: '主键',
                 prop: 'id',
                 width: 100,
             },
-            {
-                label: '系统ID',
-                prop: 'systemId',
-            },
             {
                 label: '作者',
                 prop: 'author',
@@ -309,21 +311,6 @@
                     ),
                 },
             },
-            {
-                prop: 'order',
-                width: 100,
-                slots: {
-                    header: () => (
-                        <p>
-                            <span>排序</span>
-                            <ElTooltip
-                                content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
-                                placement="top"
-                            />
-                        </p>
-                    ),
-                },
-            },
             {
                 label: '搜索码',
                 prop: 'searchCode',
diff --git a/src/views/search/system/index.vue b/src/views/search/system/index.vue
index 73dc77b..38dc4e3 100644
--- a/src/views/search/system/index.vue
+++ b/src/views/search/system/index.vue
@@ -71,16 +71,6 @@
                     </template>
                     <el-input v-model="formState.form.datasource" />
                 </el-form-item>
-                <el-form-item prop="order">
-                    <template #label>
-                        <span>排序</span>
-                        <el-tooltip
-                            content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
-                            placement="top"
-                        />
-                    </template>
-                    <el-input v-model="formState.form.order" />
-                </el-form-item>
             </el-form>
             <template #footer>
                 <el-button @click="formState.formVisible = false">取消</el-button>
@@ -108,7 +98,6 @@
             id: null,
             databaseType: null,
             datasource: null,
-            order: null,
             systemCode: null,
             systemName: null,
         },
@@ -125,7 +114,6 @@
             id: null,
             databaseType: null,
             datasource: null,
-            order: null,
             systemCode: null,
             systemName: null,
         };
@@ -146,14 +134,12 @@
             id: null,
             databaseType: null,
             datasource: null,
-            order: null,
             systemCode: null,
             systemName: null,
         },
         rules: {
             databaseType: [{ required: true, message: '数据库类型不能为空' }],
             datasource: [{ required: true, message: '数据库配置不能为空' }],
-            order: [{ required: true, message: '排序不能为空' }],
             systemCode: [{ required: true, message: '系统编码不能为空' }],
             systemName: [{ required: true, message: '系统名称不能为空' }],
         },
@@ -179,8 +165,10 @@
         try {
             await proxy.$validate(refsForm);
             let data = _.cloneDeep(formState.form);
-            await store.dispatch('searchSystem/save', data);
-            formState.formVisible = false;
+            let res = await store.dispatch('searchSystem/save', data);
+            if (res) {
+                formState.formVisible = false;
+            }
         } catch (e) {
             console.info('取消保存', e);
         }
@@ -230,21 +218,6 @@
                     ),
                 },
             },
-            {
-                prop: 'order',
-                width: 100,
-                slots: {
-                    header: () => (
-                        <p>
-                            <span>排序</span>
-                            <ElTooltip
-                                content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
-                                placement="top"
-                            />
-                        </p>
-                    ),
-                },
-            },
             {
                 label: '操作',
                 fixed: 'right',
diff --git a/vite.config.js b/vite.config.js
index 0ea91a2..9cd46bf 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -22,10 +22,10 @@ export default (configEnv) => {
                 '/api': {
                     // target: 'http://192.168.10.109:8090/', // 显雨
                     // target: 'http://192.168.10.5:4500', // 高玉
-                    // target: 'http://192.168.10.87:8090', // 罗战
+                    target: 'http://192.168.10.87:8090', // 罗战
                     // target: 'http://192.168.10.93:8090', // 周渺
                     // target: 'http://192.168.10.124:8090', // 舒梦娇
-                    target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
+                    // target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
                     // target: 'https://you-gateway.mashibing.com', // 生产环境
                     changeOrigin: true,
                     rewrite: (path) => path.replace(/^\/api/, ''),

From da6caa5cd6937a9fb87a7f4cd507701368fe8aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Sat, 11 Jun 2022 17:51:52 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/search/config/index.vue | 147 +++++++-----------------------
 src/views/search/system/index.vue |  59 +-----------
 2 files changed, 39 insertions(+), 167 deletions(-)

diff --git a/src/views/search/config/index.vue b/src/views/search/config/index.vue
index 2015d39..40167e0 100644
--- a/src/views/search/config/index.vue
+++ b/src/views/search/config/index.vue
@@ -22,61 +22,6 @@
                             :opts="opts.system"
                         />
                     </el-form-item>
-                    <el-form-item label="主键" prop="id">
-                        <el-input v-model="state.condition.id" />
-                    </el-form-item>
-                    <el-form-item label="作者" prop="author">
-                        <el-input v-model="state.condition.author" />
-                    </el-form-item>
-                    <el-form-item label="数据库名称" prop="databaseName">
-                        <el-input v-model="state.condition.databaseName" />
-                    </el-form-item>
-                    <el-form-item prop="documentIdExp">
-                        <template #label>
-                            <span>ES文档ID</span>
-                            <el-tooltip
-                                content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
-                                placement="top"
-                            />
-                        </template>
-                        <el-input v-model="state.condition.documentIdExp" />
-                    </el-form-item>
-                    <el-form-item prop="order">
-                        <template #label>
-                            <span>排序</span>
-                            <el-tooltip
-                                content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
-                                placement="top"
-                            />
-                        </template>
-                        <el-input v-model="state.condition.order" />
-                    </el-form-item>
-                    <el-form-item label="搜索码" prop="searchCode">
-                        <el-input v-model="state.condition.searchCode" />
-                    </el-form-item>
-                    <el-form-item prop="searchFiled">
-                        <template #label>
-                            <span>搜索字段</span>
-                            <el-tooltip
-                                content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
-                                placement="top"
-                            />
-                        </template>
-                        <el-input v-model="state.condition.searchFiled" />
-                    </el-form-item>
-                    <el-form-item label="搜索名" prop="searchName">
-                        <el-input v-model="state.condition.searchName" />
-                    </el-form-item>
-                    <el-form-item prop="syncCron">
-                        <template #label>
-                            <span>同步频率</span>
-                            <el-tooltip
-                                content="同步数据到ES的频率（cron表达式），示例：‘* */30 * * * ?’（每30分钟同步一次）"
-                                placement="top"
-                            />
-                        </template>
-                        <el-input v-model="state.condition.syncCron" />
-                    </el-form-item>
                 </el-form>
             </template>
         </table-list>
@@ -95,37 +40,34 @@
                         :opts="opts.system"
                     />
                 </el-form-item>
-                <el-form-item label="作者" prop="author">
-                    <el-input v-model="formState.form.author" />
+                <el-form-item label="搜索码" prop="searchCode">
+                    <el-input v-model="formState.form.searchCode" />
                 </el-form-item>
-                <el-form-item label="数据库名称" prop="databaseName">
-                    <el-input v-model="formState.form.databaseName" />
+                <el-form-item label="搜索名" prop="searchName">
+                    <el-input v-model="formState.form.searchName" />
                 </el-form-item>
-                <el-form-item prop="documentIdExp">
+                <el-form-item prop="searchFiled">
                     <template #label>
-                        <span>ES文档ID</span>
+                        <span>搜索字段</span>
                         <el-tooltip
-                            content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
+                            content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
                             placement="top"
                         />
                     </template>
-                    <el-input v-model="formState.form.documentIdExp" />
+                    <el-input v-model="formState.form.searchFiled" />
                 </el-form-item>
-                <el-form-item label="搜索码" prop="searchCode">
-                    <el-input v-model="formState.form.searchCode" />
+                <el-form-item label="数据库名称" prop="databaseName">
+                    <el-input v-model="formState.form.databaseName" />
                 </el-form-item>
-                <el-form-item prop="searchFiled">
+                <el-form-item prop="documentIdExp">
                     <template #label>
-                        <span>搜索字段</span>
+                        <span>ES文档ID</span>
                         <el-tooltip
-                            content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
+                            content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
                             placement="top"
                         />
                     </template>
-                    <el-input v-model="formState.form.searchFiled" />
-                </el-form-item>
-                <el-form-item label="搜索名" prop="searchName">
-                    <el-input v-model="formState.form.searchName" />
+                    <el-input v-model="formState.form.documentIdExp" />
                 </el-form-item>
                 <el-form-item prop="syncCron">
                     <template #label>
@@ -137,6 +79,9 @@
                     </template>
                     <el-input v-model="formState.form.syncCron" />
                 </el-form-item>
+                <el-form-item label="作者" prop="author">
+                    <el-input v-model="formState.form.author" />
+                </el-form-item>
             </el-form>
             <template #footer>
                 <el-button @click="formState.formVisible = false">取消</el-button>
@@ -161,15 +106,6 @@
     }
     const state = reactive({
         condition: {
-            author: null,
-            databaseName: null,
-            documentIdExp: null,
-            id: null,
-            order: null,
-            searchCode: null,
-            searchFiled: null,
-            searchName: null,
-            syncCron: null,
             systemId: null,
         },
     });
@@ -182,15 +118,6 @@
     );
     const handleReset = () => {
         state.condition = {
-            author: null,
-            databaseName: null,
-            documentIdExp: null,
-            id: null,
-            order: null,
-            searchCode: null,
-            searchFiled: null,
-            searchName: null,
-            syncCron: null,
             systemId: null,
         };
     };
@@ -283,57 +210,49 @@
                 },
             },
             {
-                label: '主键',
-                prop: 'id',
-                width: 100,
-            },
-            {
-                label: '作者',
-                prop: 'author',
+                label: '搜索码',
+                prop: 'searchCode',
             },
             {
-                label: '数据库名称',
-                prop: 'databaseName',
-                minWidth: 120,
+                label: '搜索名',
+                prop: 'searchName',
             },
             {
-                prop: 'documentIdExp',
+                prop: 'searchFiled',
                 minWidth: 120,
                 slots: {
                     header: () => (
                         <p>
-                            <span>ES文档ID</span>
+                            <span>搜索字段</span>
                             <ElTooltip
-                                content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
+                                content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
                                 placement="top"
                             />
                         </p>
                     ),
                 },
             },
+
             {
-                label: '搜索码',
-                prop: 'searchCode',
+                label: '数据库名称',
+                prop: 'databaseName',
+                minWidth: 120,
             },
             {
-                prop: 'searchFiled',
+                prop: 'documentIdExp',
                 minWidth: 120,
                 slots: {
                     header: () => (
                         <p>
-                            <span>搜索字段</span>
+                            <span>ES文档ID</span>
                             <ElTooltip
-                                content="搜索字段配置，格式“字段名/搜索类型”，搜索类型即ES中字段的分词器类型，模糊搜索standard，拼音搜索pinyin，全词匹配搜索keyword"
+                                content="数据导入ES后，作为ES文档id的字段，使用占位符形式，如:${offer_id}+${offer_sub_id}（连表查询一对多时要注意是多个表的主键连接才能确定唯一性）"
                                 placement="top"
                             />
                         </p>
                     ),
                 },
             },
-            {
-                label: '搜索名',
-                prop: 'searchName',
-            },
             {
                 prop: 'syncCron',
                 minWidth: 120,
@@ -349,6 +268,10 @@
                     ),
                 },
             },
+            {
+                label: '作者',
+                prop: 'author',
+            },
             {
                 label: '操作',
                 fixed: 'right',
diff --git a/src/views/search/system/index.vue b/src/views/search/system/index.vue
index 38dc4e3..66b3bdc 100644
--- a/src/views/search/system/index.vue
+++ b/src/views/search/system/index.vue
@@ -5,48 +5,14 @@
             :code="code"
             :config="config"
             :data="list"
-            :operation="['create', 'search', 'remove']"
+            :operation="['create', 'remove']"
             :reset="handleReset"
             title="系统配置"
             :total="total"
             @create="handleCreate()"
             @remove="handleRemove"
             @search="handleSearch"
-        >
-            <template #search>
-                <el-form inline label-width="110px">
-                    <el-form-item label="主键" prop="id">
-                        <el-input v-model="state.condition.id" />
-                    </el-form-item>
-                    <el-form-item label="系统编码" prop="systemCode">
-                        <el-input v-model="state.condition.systemCode" />
-                    </el-form-item>
-                    <el-form-item label="系统名称" prop="systemName">
-                        <el-input v-model="state.condition.systemName" />
-                    </el-form-item>
-                    <el-form-item label="数据库类型" prop="databaseType">
-                        <el-select v-model="state.condition.databaseType" :opts="opts.type" />
-                    </el-form-item>
-                    <el-form-item prop="datasource">
-                        <template #label>
-                            <span>数据库配置</span>
-                            <el-tooltip content="格式：“ip:port”" placement="top" />
-                        </template>
-                        <el-input v-model="state.condition.datasource" />
-                    </el-form-item>
-                    <el-form-item prop="order">
-                        <template #label>
-                            <span>排序</span>
-                            <el-tooltip
-                                content="在字段名后加“:asc或:desc”指定升序（降序），多个字段使用逗号分隔，省略排序默认使用升序"
-                                placement="top"
-                            />
-                        </template>
-                        <el-input v-model="state.condition.order" />
-                    </el-form-item>
-                </el-form>
-            </template>
-        </table-list>
+        />
         <el-dialog v-model="formState.formVisible" :title="formState.form.id ? '编辑' : '添加' + '系统'" width="480px">
             <el-form
                 ref="refsForm"
@@ -94,13 +60,7 @@
         store.dispatch('searchSystem/load');
     }
     const state = reactive({
-        condition: {
-            id: null,
-            databaseType: null,
-            datasource: null,
-            systemCode: null,
-            systemName: null,
-        },
+        condition: {},
     });
     watch(
         () => state.condition,
@@ -110,13 +70,7 @@
         { immediate: true, deep: true }
     );
     const handleReset = () => {
-        state.condition = {
-            id: null,
-            databaseType: null,
-            datasource: null,
-            systemCode: null,
-            systemName: null,
-        };
+        state.condition = {};
     };
     const handleSearch = async () => {
         loading.value = true;
@@ -186,11 +140,6 @@
                 type: 'selection',
                 width: 60,
             },
-            {
-                label: '主键',
-                prop: 'id',
-                width: 100,
-            },
             {
                 label: '系统编码',
                 prop: 'systemCode',