diff --git a/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts b/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts
index 5ceefecc..0595145c 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/form/FormField.ts
@@ -179,7 +179,8 @@ export const getDefaultValue = (field) => {
field.type === 'w-user-select' ||
field.type === 'w-org-select' ||
field.type === 'w-grid-select' ||
- field.type === 'w-role-select') &&
+ field.type === 'w-role-select' ||
+ field.type === 'w-db-table-select') &&
field.multiple
) {
return [];
diff --git a/io.sc.platform.core.frontend/src/platform/components/form/FormGroup.vue b/io.sc.platform.core.frontend/src/platform/components/form/FormGroup.vue
index 1e437097..0bb46acd 100644
--- a/io.sc.platform.core.frontend/src/platform/components/form/FormGroup.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/form/FormGroup.vue
@@ -229,6 +229,20 @@ const formElementDivStyle = (field: any) => {
if (props.layout === Constant.FORM_GROUP_LAYOUT.FORM) {
styleStr += jsonStyle2String(form.getFieldStyle(field));
}
+ if (!getShow(field)) {
+ styleStr += ';display: none;';
+ }
return styleStr;
};
+
+const getShow = (field: any) => {
+ if (!Tools.isEmpty(field.showIf)) {
+ if (typeof field.showIf === 'boolean') {
+ return field.showIf;
+ } else if (typeof field.showIf === 'function') {
+ return field.showIf({ value: form.data[field.name], form: form.instance }) || false;
+ }
+ }
+ return true;
+};
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts
index 06be3631..c691c102 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts
@@ -46,7 +46,7 @@ export class Init {
primaryKey: { type: String, default: 'id' }, // 数据主键（常规表格模式时，该字段可用作内置的编辑删除等功能对应的后端API入参，如：继承RestCrudController的update所需的入参。树形表格模式时，该字段为构建树数据的主键）
foreignKey: { type: String, default: 'parent' }, // 数据外键（常规表格模式时，该字段暂时无用，将来可用作多个表格的数据关系字段。树形表格模式时，该字段为构建树数据的关系字段）
refreshData: { type: Boolean, default: false }, // 新增、删除、修改成功后是否刷新数据列表，默认不刷新但是新增修改后台必须返回对应的行数据对象，删除则必须返回删除的记录集primaryKey集合。
- dbClickOperation: { type: String, default: 'view' }, // 默认的双击操作：可填写内置或自定义按钮name，执行的操作为按钮对应的click，固定值提供：expand(展开双击的行)、none(双击不执行任何动作)
+ dbClickOperation: { type: String, default: 'none' }, // 默认的双击操作：可填写内置或自定义按钮name，执行的操作为按钮对应的click，固定值提供：expand(展开双击的行)、none(双击不执行任何动作)
separator: { type: String, default: 'cell' }, // 表格分割线，支持：horizontal、vertical、cell、none
hideHeader: { type: Boolean, default: false }, // 隐藏表头
hideBottom: { type: Boolean, default: false }, // 隐藏底部
diff --git a/io.sc.platform.core.frontend/src/platform/components/index.ts b/io.sc.platform.core.frontend/src/platform/components/index.ts
index 7ac20c83..be9258af 100644
--- a/io.sc.platform.core.frontend/src/platform/components/index.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/index.ts
@@ -23,6 +23,7 @@ import WGridSelect from './select/WGridSelect.vue';
import WUserSelect from './select/WUserSelect.vue';
import WOrgSelect from './select/WOrgSelect.vue';
import WRoleSelect from './select/WRoleSelect.vue';
+import WDbTableSelect from './select/WDbTableSelect.vue';
import WDate from './date/WDate.vue';
import WDateRange from './date/WDateRange.vue';
import WCheckbox from './checkbox/WCheckbox.vue';
@@ -92,6 +93,7 @@ export default {
app.component('WUserSelect', WUserSelect);
app.component('WOrgSelect', WOrgSelect);
app.component('WRoleSelect', WRoleSelect);
+ app.component('WDbTableSelect', WDbTableSelect);
app.component('WDate', WDate);
app.component('WDateRange', WDateRange);
app.component('WCheckbox', WCheckbox);
@@ -157,6 +159,7 @@ export {
WUserSelect,
WOrgSelect,
WRoleSelect,
+ WDbTableSelect,
WLabel,
WRadio,
WExtRadio,
diff --git a/io.sc.platform.core.frontend/src/platform/components/select/WDbTableSelect.vue b/io.sc.platform.core.frontend/src/platform/components/select/WDbTableSelect.vue
new file mode 100644
index 00000000..85e30490
--- /dev/null
+++ b/io.sc.platform.core.frontend/src/platform/components/select/WDbTableSelect.vue
@@ -0,0 +1,507 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ modelValue?.length }}
+
+
+
+
+
+
+ {{ modelValue }}
+