Commit 8a3e167f by 张恒

refactor(jcsj/cjfa): 重构采集方案编码字段配置

- 将编码字段从普通输入框改为自动生成编码组件
- 更新表单配置中的编码字段类型为AutoCodeRule组件
- 调整表格列配置中编码字段的显示和排序设置
- 修改工作流权限配置中的编码字段为禁用状态
- 移除多余的数据字段配置项
- 重新排列接口模型中字段的顺序
parent b75adc77
...@@ -19,13 +19,13 @@ export interface MesCollectionSchemePageParams extends BasicPageParams { ...@@ -19,13 +19,13 @@ export interface MesCollectionSchemePageParams extends BasicPageParams {
export interface MesCollectionSchemePageModel { export interface MesCollectionSchemePageModel {
id: string; id: string;
code: string;
name: string; name: string;
contentType: string; contentType: string;
note: string; note: string;
code: string;
} }
/** /**
......
...@@ -4,7 +4,7 @@ import { BasicColumn } from '/@/components/Table'; ...@@ -4,7 +4,7 @@ import { BasicColumn } from '/@/components/Table';
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'code', field: 'code',
label: '编码', label: '编码组件',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
...@@ -40,8 +40,8 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -40,8 +40,8 @@ export const searchFormSchema: FormSchema[] = [
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'code', dataIndex: 'name',
title: '编码', title: '名称',
componentType: 'input', componentType: 'input',
fixed: false, fixed: false,
...@@ -53,22 +53,22 @@ export const columns: BasicColumn[] = [ ...@@ -53,22 +53,22 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'name', dataIndex: 'contentType',
title: '名称', title: '采集内容',
componentType: 'input', componentType: 'select',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: undefined,
}, },
{ {
resizable: true, resizable: true,
dataIndex: 'contentType', dataIndex: 'note',
title: '采集内容', title: '备注',
componentType: 'select', componentType: 'textarea',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -79,9 +79,9 @@ export const columns: BasicColumn[] = [ ...@@ -79,9 +79,9 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'note', dataIndex: 'code',
title: '备注', title: '编码组件',
componentType: 'textarea', componentType: 'auto-code',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -173,34 +173,24 @@ export const formProps: FormProps = { ...@@ -173,34 +173,24 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: 'f36220ef903049439746ecf6ba9e3762', key: 'a111bc49789444e690cf3a43f4fb81cb',
field: 'code', field: 'code',
label: '编码', label: '编码组件',
type: 'input', type: 'auto-code',
component: 'Input', component: 'AutoCodeRule',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '',
placeholder: '自动生成', placeholder: '自动生成',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true, showLabel: true,
autoCodeRule: 'CJFA',
required: false, required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true, isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
...@@ -530,15 +520,8 @@ export const formProps: FormProps = { ...@@ -530,15 +520,8 @@ export const formProps: FormProps = {
name: 'contentType', name: 'contentType',
value: value:
'{"bindField":"content_type","fieldKey":"58bb5935bfbc4bf8a6c6d2b9b68c9013"}', '{"bindField":"content_type","fieldKey":"58bb5935bfbc4bf8a6c6d2b9b68c9013"}',
description: null,
required: true, required: true,
dataType: 'String', dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'data', bindType: 'data',
}, },
], ],
...@@ -607,44 +590,28 @@ export const formProps: FormProps = { ...@@ -607,44 +590,28 @@ export const formProps: FormProps = {
key: 'b2f7b13aa68f433ea4f7a2003d01e3ef', key: 'b2f7b13aa68f433ea4f7a2003d01e3ef',
name: '编码', name: '编码',
bindField: 'code', bindField: 'code',
width: null,
minWidth: null,
maxWidth: null,
resizable: false, resizable: false,
unit: null,
isEdit: true, isEdit: true,
}, },
{ {
key: '0f1a47a5a2aa40cfb4c9b1002c9ea4e2', key: '0f1a47a5a2aa40cfb4c9b1002c9ea4e2',
name: '名称', name: '名称',
bindField: 'name', bindField: 'name',
width: null,
minWidth: null,
maxWidth: null,
resizable: false, resizable: false,
unit: null,
isEdit: true, isEdit: true,
}, },
{ {
key: '86f3efc523aa4e559d09e31e8e1501e4', key: '86f3efc523aa4e559d09e31e8e1501e4',
name: '备注', name: '备注',
bindField: 'note', bindField: 'note',
width: null,
minWidth: null,
maxWidth: null,
resizable: false, resizable: false,
unit: null,
isEdit: true, isEdit: true,
}, },
{ {
key: '8ad391c032064da98fb6abd39e5276ee', key: '8ad391c032064da98fb6abd39e5276ee',
name: '采集id', name: '采集id',
bindField: 'scheme_id', bindField: 'scheme_id',
width: null,
minWidth: null,
maxWidth: null,
resizable: false, resizable: false,
unit: null,
isEdit: false, isEdit: false,
}, },
], ],
......
...@@ -3,18 +3,17 @@ export const permissionList = [ ...@@ -3,18 +3,17 @@ export const permissionList = [
required: false, required: false,
view: true, view: true,
edit: false, edit: false,
disabled: false, disabled: true,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '编码', fieldName: '编码组件',
fieldId: 'code', fieldId: 'code',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'auto-code',
key: 'f36220ef903049439746ecf6ba9e3762', key: 'a111bc49789444e690cf3a43f4fb81cb',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: true, required: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment