将开源版本的修改打补丁应用到商业版

This commit is contained in:
wsm
2026-04-09 19:36:52 +08:00
parent d8e3a63df1
commit 7cf7a03983
105 changed files with 18321 additions and 2386 deletions
+21 -15
View File
@@ -34,10 +34,16 @@
<BasicDragVerify v-model:value="model[field]" />
</template>
<template #superQuery="{ model, field }">
<super-query :config="superQueryConfig" @search="(value)=>handleSuperQuery(value, model, field)"/>
<super-query :config="superQueryConfig" @search="(value) => handleSuperQuery(value, model, field)" />
</template>
<template #superQuery1="{ model, field }">
<super-query :config="superQueryConfig" @search="(value)=>handleSuperQuery(value, model, field)" :isCustomSave="true" :saveSearchData="saveSearchData" :save="handleSuperQuerySave"/>
<super-query
:config="superQueryConfig"
@search="(value) => handleSuperQuery(value, model, field)"
:isCustomSave="true"
:saveSearchData="saveSearchData"
:save="handleSuperQuerySave"
/>
</template>
</BasicForm>
</template>
@@ -80,19 +86,19 @@
function onSearch(value: string) {
keyword.value = value;
}
const superQueryConfig = {
name:{ title: "名称", view: "text", type: "string", order: 1 },
birthday:{ title: "生日", view: "date", type: "string", order: 2 },
age:{ title: "年龄", view: "number", type: "number", order: 4 },
sex:{ title: "性别", view: "list", type: "string", dictCode: "sex", order: 5 },
bpmStatus:{ title: "流程状态", view: "list_multi", type: "string", dictCode: "bpm_status", order: 6 },
}
function handleSuperQuery(value, model, field){
if(value){
let str = decodeURI(value.superQueryParams)
console.log(str)
model[field] = str
name: { title: '名称', view: 'text', type: 'string', order: 1 },
birthday: { title: '生日', view: 'date', type: 'string', order: 2 },
age: { title: '年龄', view: 'number', type: 'number', order: 4 },
sex: { title: '性别', view: 'list', type: 'string', dictCode: 'sex', order: 5 },
bpmStatus: { title: '流程状态', view: 'list_multi', type: 'string', dictCode: 'bpm_status', order: 6 },
};
function handleSuperQuery(value, model, field) {
if (value) {
let str = decodeURI(value.superQueryParams);
console.log(str);
model[field] = str;
}
}
const saveSearchData = ref([
@@ -122,7 +128,7 @@
}
}, 1e3);
});
}
};
return {
schemas,
formElRef,
+43 -19
View File
@@ -197,22 +197,6 @@ export const schemas: FormSchema[] = [
span: 12,
},
},
{
field: 'depart3',
component: 'JEllipsis',
label: '选中部门',
colProps: { span: 12 },
},
{
field: 'depart2',
component: 'JSelectDept',
label: '选择部门',
helpMessage: ['component模式'],
componentProps: { showButton: false },
colProps: {
span: 12,
},
},
{
field: 'depart2',
component: 'JEllipsis',
@@ -239,6 +223,27 @@ export const schemas: FormSchema[] = [
label: '选中用户',
colProps: { span: 12 },
},
{
field: 'szuser1',
component: 'SzSelectUser',
label: 'Sz用户选择组件',
helpMessage: ['component模式'],
componentProps: {
labelKey: 'realname',
rowKey: 'id',
showSelected: true,
userSecurityLevel: 3,
},
colProps: {
span: 12,
},
},
{
field: 'user2',
component: 'JEllipsis',
label: '选中用户',
colProps: { span: 12 },
},
{
field: 'user3',
component: 'JSelectUserByDept',
@@ -258,6 +263,25 @@ export const schemas: FormSchema[] = [
label: '选中用户',
colProps: { span: 12 },
},
{
field: 'szuser3',
component: 'SzSelectUserByDept',
label: 'Sz部门选择用户',
helpMessage: ['component模式'],
componentProps: {
labelKey: 'realname',
rowKey: 'username',
},
colProps: {
span: 12,
},
},
{
field: 'szuser3',
component: 'JEllipsis',
label: '选中用户',
colProps: { span: 12 },
},
{
field: 'user4',
component: 'JSelectUserByDepartment',
@@ -680,7 +704,7 @@ export const schemas: FormSchema[] = [
label: '选中值',
colProps: { span: 12 },
},
{
field: 'userSelect2',
component: 'UserSelect',
@@ -694,7 +718,7 @@ export const schemas: FormSchema[] = [
label: '选中值',
colProps: { span: 12 },
},
{
field: 'superQuery',
component: 'Input',
@@ -881,5 +905,5 @@ export const schemas: FormSchema[] = [
label: '选中值',
colProps: { span: 12 },
},
];