+
+
+ 当满足以下条件时此控件隐藏
-
-
+
+
+
+
+ -
+
- 请从左侧面板右击选择字段或选项 +
- 支持英文模式下运算符 +
- 参考场景： + 年龄控件输入的值大于10时，需要隐藏当前控件，则可将隐藏条件设置为：年龄>10 +
+
+
+
+
+
+
+
仅可选择符合以下条件的数据
+
+
+
+
-
+
- 请从左侧面板右击选择字段或选项 +
- 支持英文模式下运算符 +
- 参考场景： + 仅可选择关联表单中年龄大于10的数据，则可将数据范围设置为：年龄>10 +
当选择具体数据后，将按如下规则给当前表单字段填充数据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index 07b65e8dd..f49176214 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -21,7 +21,7 @@ const props = defineProps({
},
color: {
type: String,
- default: "",
+ default: "currentColor",
},
size: {
type: String,
diff --git a/src/router/index.ts b/src/router/index.ts
index b4448abdb..d068ba1f8 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,5 +1,5 @@
import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
-
+import CreatePage from "@/views/sysworkflow/codepage/createpage.vue";
export const Layout = () => import("@/layout/index.vue");
// 静态路由
@@ -13,6 +13,11 @@ export const constantRoutes: RouteRecordRaw[] = [
path: "/redirect/:path(.*)",
component: () => import("@/views/redirect/index.vue"),
},
+ {
+ path:"/create",
+ name: "create",
+ component: () => import('@/views/sysworkflow/codepage/createpage.vue'),
+ }
],
},
@@ -51,6 +56,7 @@ export const constantRoutes: RouteRecordRaw[] = [
},
],
},
+
// 外部链接
/*{
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index e2838bd1b..f9db34acf 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -11,6 +11,7 @@ declare module '@vue/runtime-core' {
export interface GlobalComponents {
AceDrawer: typeof import('./../components/DesignForm/aceDrawer.vue')['default']
AddNode: typeof import('./../components/workflow/addNode.vue')['default']
+ AppMenuSvgPage: typeof import('./../components/IconSelect/appMenuSvgPage.vue')['default']
ApproverDrawer: typeof import('./../components/workflow/drwer/approverDrawer.vue')['default']
BianXian: typeof import('./../components/DesignForm/designLayout/bianXian.vue')['default']
Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default']
@@ -110,7 +111,17 @@ declare module '@vue/runtime-core' {
IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
IEpClose: typeof import('~icons/ep/close')['default']
+<<<<<<< HEAD
IEpSetting: typeof import('~icons/ep/setting')['default']
+=======
+ IEpDelete: typeof import('~icons/ep/delete')['default']
+ IEpEdit: typeof import('~icons/ep/edit')['default']
+ IEpPlus: typeof import('~icons/ep/plus')['default']
+ IEpRefresh: typeof import('~icons/ep/refresh')['default']
+ IEpSearch: typeof import('~icons/ep/search')['default']
+ IEpSetting: typeof import('~icons/ep/setting')['default']
+ IEpView: typeof import('~icons/ep/view')['default']
+>>>>>>> v8_master
LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
@@ -135,6 +146,7 @@ declare module '@vue/runtime-core' {
SingleUpload: typeof import('./../components/Upload/SingleUpload.vue')['default']
SizeSelect: typeof import('./../components/SizeSelect/index.vue')['default']
SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default']
+ SvgPage: typeof import('./../components/IconSelect/svgPage.vue')['default']
TableListPage: typeof import('./../components/DesignForm/tableListPage/index.vue')['default']
Template: typeof import('./../components/DesignForm/template.vue')['default']
TextPage: typeof import('./../components/DesignForm/designLayout/textPage.vue')['default']
diff --git a/src/views/sysworkflow/codepage/createpage.vue b/src/views/sysworkflow/codepage/createpage.vue
new file mode 100644
index 000000000..c29609219
--- /dev/null
+++ b/src/views/sysworkflow/codepage/createpage.vue
@@ -0,0 +1,594 @@
+
+
+
+ -
+
-
+
+ ++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 表单预览
+
+
+
+
+
+
+
+ 编辑表单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sysworkflow/codepage/page.vue b/src/views/sysworkflow/codepage/page.vue
index 4d85332a1..217e483f1 100644
--- a/src/views/sysworkflow/codepage/page.vue
+++ b/src/views/sysworkflow/codepage/page.vue
@@ -1,213 +1,252 @@
-
-
+ ![预览图片]()
+
+
-
-
-
-
-
-
-
-
-
-
- 添加
- 编辑
- 删除
-
-
-
-
-
- 标题一
-
-
-
-
-
-
-
-
- ![]( "示例图片")
-
-
-
-
-
- {{ card.name }}
-
-
-
-
-
-
+
+
+
+
+
+ ("")
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-23 15:30:17
+@ 功能: 编辑app内容
+*/
+const editAppCont = (val:string) => {
+ appKey.value = val.toString();
+ appPageShow.value = true;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/views/sysworkflow/codepage/page0318.vue b/src/views/sysworkflow/codepage/page0318.vue
new file mode 100644
index 000000000..7284b0f41
--- /dev/null
+++ b/src/views/sysworkflow/codepage/page0318.vue
@@ -0,0 +1,213 @@
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ 自定义卡片
+
+
+
+
+
+
+
+ 编辑应用
+ 删除
+
+
+
+
+
+ {{ card.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+ 编辑
+ 删除
+
+
+
+
+
+ 标题一
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+ {{ card.name }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue
index 854c8a1b9..573ac8c0b 100644
--- a/src/views/sysworkflow/lowcodepage/appFormList.vue
+++ b/src/views/sysworkflow/lowcodepage/appFormList.vue
@@ -12,6 +12,7 @@ import { json2string,objToStringify,string2json,stringToObj } from '@/utils/Desi
import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue"
import TaskCustomerForm from '@/views/taskplatform/taskmanagement/taskcustomerformnew.vue'
import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue'
+import DesignAPPpage from "@/views/sysworkflow/lowcodepage/appPage/index.vue" //自建应用
const props = defineProps({
groupId:{
@@ -132,6 +133,17 @@ const refreshPage = (pageType:string) =>{
onMounted(()=>{
getFormAppList()
})
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-24 08:21:32
+@ 功能: 关闭应用刷新页面
+*/
+const closeAppPage = () =>{
+ console.log("关闭应用刷新页面")
+ getFormAppList()
+}
+
/**
@ 作者: 秦东
@ 时间: 2024-04-01 14:32:18
@@ -201,6 +213,18 @@ const state = reactive({
dict: {},
refreshTable: true
})
+
+const appPageShow = ref(false)
+const appKey = ref
@@ -224,7 +248,18 @@ const state = reactive({
{{item.name}}
-
+
+
+
+
+
+
+
+
+
@@ -246,6 +281,7 @@ const state = reactive({
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
new file mode 100644
index 000000000..80dcdda5c
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+ {{node.label}}
+
+
+ 修改名称
+ 复制
+ 移动到
+ 新建子分组
+ 新建普通表单
+ 新建流程表单
+ 隐藏PC端
+ 隐藏移动端
+ 删除
+
+
+
+
-
+
- Header
+
+
- Aside
- Main
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据收集、事件记录
+
+
+
+
+
+
+
+
+
+
+ 任务协同、业务审批
+
+
+
+
+
+
+
+
+
+
+ 应用项目管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -33,5 +252,75 @@ const drawerOpenOrClose = ref(true)
diff --git a/src/views/sysworkflow/lowcodepage/index.vue b/src/views/sysworkflow/lowcodepage/index.vue
index 6cf3324d3..6fa9e0138 100644
--- a/src/views/sysworkflow/lowcodepage/index.vue
+++ b/src/views/sysworkflow/lowcodepage/index.vue
@@ -5,7 +5,7 @@
-->
+
+
\ No newline at end of file
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
new file mode 100644
index 000000000..40764b91f
--- /dev/null
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+ {{ appCont.appName }}
+ 已启用
+ 已禁用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 访问
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/widget/associatedforms/associatedFormsTinyaceRange.vue b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
new file mode 100644
index 000000000..dd4f02abe
--- /dev/null
+++ b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+