diff --git a/src/api/DesignForm/fieldUnit.ts b/src/api/DesignForm/fieldUnit.ts index 70aedaf..903c2bf 100644 --- a/src/api/DesignForm/fieldUnit.ts +++ b/src/api/DesignForm/fieldUnit.ts @@ -4,3 +4,4 @@ export const orgUnit = ["org"] export const choiceUnit = ["radio"] export const switchUnit = ["switch"] export const checkboxUnit = ["checkbox"] +export const orgDeptUnit = ["deptOrg"] diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index f75a530..7ae3608 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -25,6 +25,7 @@ import { switchUnit, orgUnit, checkboxUnit, + orgDeptUnit, } from "@/api/DesignForm/fieldUnit"; import type { FormInstance, FormRules, ElNotification } from "element-plus"; import { gainFormPageListCont } from "@/api/DesignForm/requestapi"; @@ -183,6 +184,9 @@ const unitIsShow = (val: tableButton, unitName: string) => { case "checkbox": return checkboxUnit.includes(unitName); break; + case "deptOrg": + return orgDeptUnit.includes(unitName); + break; default: if (val.fieldClass != "datePicker" && val.fieldClass != "timePicker") { return inputUnit.includes(unitName); @@ -1005,7 +1009,18 @@ const transformOption = (val: string | number, type?: string) => { v-if="unitIsShow(item, 'org')" > + + +
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index ce7c2da..f3180a3 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -499,7 +499,7 @@ const attrList = computed(() => { value: config.append, placeholder: "文本后缀", path: "config.append", - vShow: ["input", "password"], + vShow: ["input", "password", "digitpage"], }, // { // label: '状态打开时的值', diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue index 32a75f9..d42b723 100644 --- a/src/components/DesignForm/tableListPage/index.vue +++ b/src/components/DesignForm/tableListPage/index.vue @@ -25,6 +25,7 @@ import { switchUnit, orgUnit, checkboxUnit, + orgDeptUnit, } from "@/api/DesignForm/fieldUnit"; import type { FormInstance, FormRules, ElNotification } from "element-plus"; import { gainFormPageListCont } from "@/api/DesignForm/requestapi"; @@ -179,6 +180,9 @@ const unitIsShow = (val: tableButton, unitName: string) => { case "checkbox": return checkboxUnit.includes(unitName); break; + case "deptOrg": + return orgDeptUnit.includes(unitName); + break; default: if (val.fieldClass != "datePicker" && val.fieldClass != "timePicker") { return inputUnit.includes(unitName); @@ -989,6 +993,10 @@ const diGuiJilian = (val: any, options: any[]) => { v-if="unitIsShow(item, 'org')" > +
diff --git a/src/widget/index.ts b/src/widget/index.ts index e8747f0..e8bcec8 100644 --- a/src/widget/index.ts +++ b/src/widget/index.ts @@ -22,6 +22,7 @@ import FounderTime from './systemunit/founderTime.vue' import EditTime from './systemunit/editTime.vue' import OwnerPage from './systemunit/ownerPage.vue' import DeptOrgPage from './systemunit/deptOrgPage.vue' +import DeptOrgSearch from './systemunit/deptOrgSearch.vue' import Editor from "@/components/WangEditor/index.vue"; // import { QuillEditor } from '@vueup/vue-quill' @@ -49,6 +50,7 @@ export default (app: any) => { app.component('EditTime',EditTime) //创建时间主键 app.component('OwnerPage',OwnerPage) //选择拥有者 app.component('DeptOrgPage',DeptOrgPage) //所属部门 + app.component('DeptOrgSearch',DeptOrgSearch) //所属部门 app.component('Editor', Editor) //Editor富文本 } diff --git a/src/widget/systemunit/deptOrgSearch.vue b/src/widget/systemunit/deptOrgSearch.vue new file mode 100644 index 0000000..80e17da --- /dev/null +++ b/src/widget/systemunit/deptOrgSearch.vue @@ -0,0 +1,101 @@ + + + +