From 27f7417b6657a219ad16532bad63e21e822f570b Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Fri, 14 Mar 2025 18:14:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Revert=20"=E5=8F=96=E6=B6=88=E6=97=A0?= =?UTF-8?q?=E6=84=9F=E7=99=BB=E5=BD=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5facd34b08f564a9013b077de7cc3f18378a8215. # Conflicts: # src/views/login/index.vue --- src/views/login/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 469b027..bd0f93a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -37,11 +37,12 @@ const getSignCode = () => { } onBeforeMount(() => { + xingzhi.value = judgingEnvironment(); console.log("==============>",route.query.userkey,route.query.token) if(!userPinia.judgeIsLogin(route.query.userkey,route.query.token)){ - xingzhi.value = judgingEnvironment(); + console.log("======1========>",xingzhi.value) - if(xingzhi.value == 3){ + if(xingzhi.value == 2 || xingzhi.value == 3){ window.location.href="http://wab.hxgk.group/systemapi/wechat/obtaOnePage?systemapp="+import.meta.env.VITE_APP_SYSTEM_APP+"&isagain="+import.meta.env.VITE_APP_AGAIN+"&userid="+route.query.userid+"&call_back_type=login" }else{ xingzhi.value = 1 From 26a18b41b9b7c80b5db1ee788c34cfe160e7fe32 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Fri, 14 Mar 2025 18:15:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=97=A0=E6=84=9F?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index bd0f93a..ed9b4d2 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -38,23 +38,24 @@ const getSignCode = () => { } onBeforeMount(() => { xingzhi.value = judgingEnvironment(); - console.log("==============>",route.query.userkey,route.query.token) - if(!userPinia.judgeIsLogin(route.query.userkey,route.query.token)){ + // console.log("==============>",route.query.userkey,route.query.token) + // if(!userPinia.judgeIsLogin(route.query.userkey,route.query.token)){ - console.log("======1========>",xingzhi.value) - if(xingzhi.value == 2 || xingzhi.value == 3){ - window.location.href="http://wab.hxgk.group/systemapi/wechat/obtaOnePage?systemapp="+import.meta.env.VITE_APP_SYSTEM_APP+"&isagain="+import.meta.env.VITE_APP_AGAIN+"&userid="+route.query.userid+"&call_back_type=login" - }else{ - xingzhi.value = 1 - getSignCode() - } + // console.log("======1========>",xingzhi.value) + // if(xingzhi.value == 2 || xingzhi.value == 3){ + // window.location.href="http://wab.hxgk.group/systemapi/wechat/obtaOnePage?systemapp="+import.meta.env.VITE_APP_SYSTEM_APP+"&isagain="+import.meta.env.VITE_APP_AGAIN+"&userid="+route.query.userid+"&call_back_type=login" + // }else{ + // xingzhi.value = 1 + // getSignCode() + // } - }else{ - console.log("=======3=======>",route.query.userkey,route.query.token) - userPinia.getInfo() - router.push('/') - } - + // }else{ + // console.log("=======3=======>",route.query.userkey,route.query.token) + // userPinia.getInfo() + // router.push('/') + // } + xingzhi.value = 1 + getSignCode() }) const loginForm = ref(ElForm); //表单实例化 From bff214f980ab987124ac68c77e142b36758df855 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Fri, 14 Mar 2025 18:18:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=BE=B9=E9=94=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ed9b4d2..089fd24 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -54,7 +54,7 @@ onBeforeMount(() => { // userPinia.getInfo() // router.push('/') // } - xingzhi.value = 1 + xingzhi.value = 2 getSignCode() }) const loginForm = ref(ElForm); //表单实例化 @@ -153,7 +153,7 @@ const judgingEnvironment = () => { Date: Fri, 14 Mar 2025 18:19:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common/tableButton.ts | 21 ++ src/api/lowCode/form/type.ts | 1 + .../lowCode/assistant/departmentOrg.vue | 31 +- .../lowCode/assistant/digitpage.vue | 46 ++- src/components/lowCode/assistant/editTime.vue | 26 +- src/components/lowCode/assistant/founder.vue | 7 +- .../lowCode/assistant/founderTime.vue | 8 +- .../lowCode/assistant/quillEditor.vue | 121 ++++++++ .../lowCode/assistant/quillEditorNew.vue | 280 ++++++++++++++++++ src/components/lowCode/assistant/tinymce.vue | 2 + .../lowCode/assistant/uploadPage.vue | 6 +- .../lowCode/assistant/videoUpAndPlay.vue | 19 +- src/components/lowCode/formItem.vue | 32 +- src/utils/pinia/stores/modules/userOrders.ts | 20 +- src/utils/router/index.ts | 2 +- src/views/formTable/myTask.vue | 87 ++++-- src/views/formTable/page/calendar.vue | 15 +- .../formTable/page/calendar/itemPage.vue | 78 ++++- .../formTable/page/calendar/weekPage.vue | 112 +++++-- src/views/formTable/page/flowAndLog.vue | 2 +- src/views/formTable/taskListPage.vue | 4 +- src/views/login/index.vue | 10 +- src/views/login/unconLogin.vue | 48 +++ 23 files changed, 871 insertions(+), 107 deletions(-) create mode 100644 src/api/common/tableButton.ts create mode 100644 src/components/lowCode/assistant/quillEditor.vue create mode 100644 src/components/lowCode/assistant/quillEditorNew.vue create mode 100644 src/views/login/unconLogin.vue diff --git a/src/api/common/tableButton.ts b/src/api/common/tableButton.ts new file mode 100644 index 0000000..f186fc9 --- /dev/null +++ b/src/api/common/tableButton.ts @@ -0,0 +1,21 @@ +export interface tableButton { + control: any; + id?: string; + name?: string; + field?: string; + type?: string; + attribute:string; + pattern?: string; + fieldClass?: string; + activeValue?: string; + inactiveValue?: string; + options?: optionsInfo[]; + config?:any; + label?: string; +} + + +export interface optionsInfo { + label: string; + value: string; +} \ No newline at end of file diff --git a/src/api/lowCode/form/type.ts b/src/api/lowCode/form/type.ts index 40338af..1df198e 100644 --- a/src/api/lowCode/form/type.ts +++ b/src/api/lowCode/form/type.ts @@ -70,6 +70,7 @@ export interface tableFormStruct { }, dict: Object, refreshTable: boolean, + isOpen:boolean, view:{ list:{ status:boolean, diff --git a/src/components/lowCode/assistant/departmentOrg.vue b/src/components/lowCode/assistant/departmentOrg.vue index 10c886e..8b83733 100644 --- a/src/components/lowCode/assistant/departmentOrg.vue +++ b/src/components/lowCode/assistant/departmentOrg.vue @@ -188,20 +188,23 @@ const orgTreeProps ={ } \ No newline at end of file diff --git a/src/components/lowCode/assistant/digitpage.vue b/src/components/lowCode/assistant/digitpage.vue index 4daf9d5..9dbe678 100644 --- a/src/components/lowCode/assistant/digitpage.vue +++ b/src/components/lowCode/assistant/digitpage.vue @@ -49,9 +49,53 @@ const getFormItemInputStyle = (ele: any,sty:number) => { return AnalysisInputCss(ele?.inputStyle,sty) } } +const config = computed(() => { + return props.data.config || {} +}) +/****input slot处理***/ +const getInputSlot = (key?: string) => { + const slot = key === 'p' ? config.value.prepend : config.value.append + const has = slot.indexOf('key:') === 0 + if (!has) { + return false + } + const slotKey = slot.replace('key:', '') + const control = getControlByName(slotKey) + if (!control || Object.keys(control)?.length === 0) { + return false + } + return control +} \ No newline at end of file diff --git a/src/components/lowCode/assistant/founder.vue b/src/components/lowCode/assistant/founder.vue index 6fd5cc8..295601c 100644 --- a/src/components/lowCode/assistant/founder.vue +++ b/src/components/lowCode/assistant/founder.vue @@ -171,7 +171,9 @@ const getFormFounder = (val: any) => { } \ No newline at end of file diff --git a/src/components/lowCode/assistant/founderTime.vue b/src/components/lowCode/assistant/founderTime.vue index 3acb144..99872ab 100644 --- a/src/components/lowCode/assistant/founderTime.vue +++ b/src/components/lowCode/assistant/founderTime.vue @@ -174,8 +174,12 @@ const getCurrentTime = () => { } \ No newline at end of file diff --git a/src/components/lowCode/assistant/quillEditor.vue b/src/components/lowCode/assistant/quillEditor.vue new file mode 100644 index 0000000..b437ae4 --- /dev/null +++ b/src/components/lowCode/assistant/quillEditor.vue @@ -0,0 +1,121 @@ + + + + \ No newline at end of file diff --git a/src/components/lowCode/assistant/quillEditorNew.vue b/src/components/lowCode/assistant/quillEditorNew.vue new file mode 100644 index 0000000..cef6080 --- /dev/null +++ b/src/components/lowCode/assistant/quillEditorNew.vue @@ -0,0 +1,280 @@ + + + + \ No newline at end of file diff --git a/src/components/lowCode/assistant/tinymce.vue b/src/components/lowCode/assistant/tinymce.vue index 81ca96b..bf81099 100644 --- a/src/components/lowCode/assistant/tinymce.vue +++ b/src/components/lowCode/assistant/tinymce.vue @@ -4,6 +4,8 @@ @ 备注: 富文本 --> \ No newline at end of file diff --git a/src/components/lowCode/formItem.vue b/src/components/lowCode/formItem.vue index b4e3c70..97eaf69 100644 --- a/src/components/lowCode/formItem.vue +++ b/src/components/lowCode/formItem.vue @@ -20,7 +20,7 @@ import wx from 'weixin-js-sdk' import request from '@/utils/axios/index' import { Md5 } from 'ts-md5' import { debounce } from '@/utils/lowCode/item/index' - +import { uploadUrl } from '@/api/lowCode/form/fieldUnit' //辅助控件 import OrgCitys from '@/components/lowCode/assistant/orgCitys.vue' import UploadPage from '@/components/lowCode/assistant/uploadPage.vue' @@ -43,7 +43,8 @@ import UrlLink from '@/components/lowCode/assistant/urlLink.vue' import DepartmentOrg from '@/components/lowCode/assistant/departmentOrg.vue' import DigitpagePage from '@/components/lowCode/assistant/digitpage.vue' import OrgCentent from '@/components/lowCode/assistant/org.vue' - +import Tinymce from '@/components/lowCode/assistant/tinymce.vue' +import QuillEditor from '@/components/lowCode/assistant/quillEditorNew.vue' const props = withDefaults( @@ -505,6 +506,9 @@ const currentComponent = computed(() => { if (props.data.type === "baidumap") { return markRaw(BaiDuMap); } + if (props.data.type === "tinymce"){ + return markRaw(QuillEditor); + } if (props.data.type === "owner") { return markRaw(OwnerPage); } @@ -549,6 +553,7 @@ const currentComponent = computed(() => { } return `el-${props.data.type}` }) +