@kp-ui/lowcode-pc-v2 0.0.6 → 0.0.8

package/assets/styles/style.css

@@ -445,27 +445,25 @@
 }
 .vf-box-widget .vf-box-content[data-v-d52cfec5] {
   min-height: 60px;
-}.collapse-container[data-v-cf9e4069] {
+}.collapse-container[data-v-198dcc4f] {
   display: flex;
   margin: 2px;
-  height: 100%;
   width: 100%;
-  flex: 1 0 0;
 }
-.collapse-container .form-widget-list[data-v-cf9e4069] {
+.collapse-container .form-widget-list[data-v-198dcc4f] {
   min-height: 28px;
 }
-.collapse-container[data-v-cf9e4069] .header-right .form-widget-list {
+.collapse-container[data-v-198dcc4f] .header-right .form-widget-list {
   min-width: 200px;
 }
-.tpf-collapse[data-v-cf9e4069] {
+.tpf-collapse[data-v-198dcc4f] {
   padding: 5px;
 }
-.tpf-collapse .collapse-right[data-v-cf9e4069] {
+.tpf-collapse .collapse-right[data-v-198dcc4f] {
   min-width: 200px;
   min-height: 30px;
 }
-.tpf-collapse[data-v-cf9e4069] .tpf-collapse-content-wrapper {
+.tpf-collapse[data-v-198dcc4f] .tpf-collapse-content-wrapper {
   overflow: hidden;
   background-color: #fff;
   padding: 16px;
@@ -531,16 +529,20 @@
 .page-template-widget[data-v-dc2a06fa] .addInfoLayout-footer .ant-form-item {
   margin-bottom: 0;
 }
-.layout-render-wrapper[data-v-464184f3] {
+.layout-render-wrapper[data-v-976bc2cb] {
+  flex: 1;
+  width: 100%;
+  height: 100%;
+  min-height: 0;
   overflow-y: auto;
   overflow-x: hidden;
-  background: var(--4a7fb80b);
+  background: var(--ee95b64a);
 }
-.loading-wrapper[data-v-464184f3] {
+.loading-wrapper[data-v-976bc2cb] {
   min-height: 300px;
   padding: 20px;
 }
-.ant-form .ant-form-item-explain.ant-form-item-explain-connected[data-v-464184f3] {
+.ant-form .ant-form-item-explain.ant-form-item-explain-connected[data-v-976bc2cb] {
   display: none;
 }
 /*$vite$:1*/

package/core/src/components/common/render/usePageContext.js

@@ -2,7 +2,7 @@ import { EVENT_TYPE, useEmitter } from "../../../utils/useEmitter.js";
 import { useI18n } from "../../../utils/i18n.js";
 import { generateId, insertCustomCssToHead, insertGlobalFunctionsToHtml, removeCustomCssToHead, removeScriptToHead } from "../../../utils/util.js";
 import { useAppRef } from "../../../hooks/useAppRef.js";
-import { computed, nextTick, onMounted, ref, useTemplateRef, watch, watchEffect } from "vue";
+import { computed, nextTick, onMounted, ref, watch, watchEffect } from "vue";
 import { useExecFunction, useRef } from "tmgc2-share";
 import { cloneDeep, set } from "lodash-es";
 //#region ../core/src/components/common/render/usePageContext.ts
@@ -13,7 +13,6 @@ import { cloneDeep, set } from "lodash-es";
 */
 var usePageContext = ({ props }) => {
 	const { formJson } = props;
-	const dynamicDialogRef = useTemplateRef("dynamicDialogRef");
 	const { i18nt } = useI18n();
 	const [readModeFlag, setReadMode] = useRef(false);
 	const formContextData = ref({});
@@ -96,10 +95,7 @@ var usePageContext = ({ props }) => {
 	const getParentPageInstance = () => {
 		return props.parentForm;
 	};
-	const getChildFormRef = () => {
-		var _dynamicDialogRef$val;
-		return (_dynamicDialogRef$val = dynamicDialogRef.value) === null || _dynamicDialogRef$val === void 0 ? void 0 : _dynamicDialogRef$val.getPageInstance();
-	};
+	const getChildFormRef = () => {};
 	/**
 	* 字段值变化事件处理器
 	*/
@@ -202,7 +198,6 @@ var usePageContext = ({ props }) => {
 		isLoading,
 		vfCtx: props.vfCtx,
 		formConfig,
-		dynamicDialogRef,
 		setChildFormRef,
 		setDialogOrDrawerRef,
 		executeHttp

package/core/src/hooks/useLowcode.js

@@ -2,7 +2,6 @@ import { ref } from "vue";
 import { message } from "ant-design-vue";
 import { http, routerReloadStatus, useDataQueryApi, useRouteBackTab } from "tmgc2-share";
 import { cloneDeep } from "lodash-es";
-import { getLocat } from "@kp-ui/tool";
 //#region ../core/src/hooks/useLowcode.ts
 var defaultPageJson = {
 	widgetList: [],
@@ -12,25 +11,25 @@ var pageJsonCache = /* @__PURE__ */ new Map();
 var pageJsonRequestCache = /* @__PURE__ */ new Map();
 var normalizePageJson = (json) => ({
 	...defaultPageJson,
-	...json || {}
+	...json
 });
-var getCachedPageJson = (formCode, useDataQuery) => {
-	const cached = pageJsonCache.get(formCode);
+var getCachedPageJson = (pageCode, useDataQuery) => {
+	const cached = pageJsonCache.get(pageCode);
 	if (cached) return Promise.resolve(cached);
-	const pending = pageJsonRequestCache.get(formCode);
+	const pending = pageJsonRequestCache.get(pageCode);
 	if (pending) return pending;
-	const request = useDataQuery.dataQueryDetail({ code: formCode }, "FormDefinitionV2").then((res) => {
+	const request = useDataQuery.dataQueryDetail({ code: pageCode }, "FormDefinitionV2").then((res) => {
 		const data = res.data.object || {};
 		const cache = {
 			formId: data.formId,
 			json: normalizePageJson(JSON.parse(data.frontendDefinition || "{}"))
 		};
-		pageJsonCache.set(formCode, cache);
+		pageJsonCache.set(pageCode, cache);
 		return cache;
 	}).finally(() => {
-		pageJsonRequestCache.delete(formCode);
+		pageJsonRequestCache.delete(pageCode);
 	});
-	pageJsonRequestCache.set(formCode, request);
+	pageJsonRequestCache.set(pageCode, request);
 	return request;
 };
 var useLowcode = (options = {}) => {
@@ -40,14 +39,16 @@ var useLowcode = (options = {}) => {
 	const formId = ref();
 	const formConfig = ref();
 	const { routeBackTab } = useRouteBackTab();
-	const getPageJson = async (formCode) => {
+	const pageCode = ref(options.pageCode || "");
+	const getPageJson = async (_pageCode) => {
 		let json = cloneDeep(defaultPageJson);
-		formCode = formCode || options.formCode || getLocat().formCode;
-		if (formCode) {
+		pageCode.value = _pageCode || options.pageCode || "";
+		console.log(pageCode.value);
+		if (pageCode.value) {
 			var _vfdRef$value;
 			(_vfdRef$value = vfdRef.value) === null || _vfdRef$value === void 0 || _vfdRef$value.setLoading(true);
 			try {
-				const cache = await getCachedPageJson(formCode, useDataQuery);
+				const cache = await getCachedPageJson(pageCode.value, useDataQuery);
 				json = cloneDeep(cache.json);
 				formId.value = cache.formId;
 			} finally {
@@ -60,7 +61,7 @@ var useLowcode = (options = {}) => {
 		vfdRef.value.setPageJson(json);
 		return json;
 	};
-	const getComponentJson = async (..._args) => getPageJson(options.formCode);
+	const getComponentJson = async (..._args) => getPageJson(options.pageCode);
 	const getFieldList = async (entityCode) => {
 		isLoading.value = true;
 		const p = {
@@ -91,14 +92,13 @@ var useLowcode = (options = {}) => {
 		routeBackTab(reloadStatus, cb);
 	};
 	const saveJsonApi = async (json) => {
-		const { formCode } = getLocat();
 		const params = {
-			formCode,
+			pageCode: pageCode.value,
 			formId: formId.value,
 			frontendDefinition: JSON.stringify(json)
 		};
 		await http.post(`/api/tmgc2-mgt/formDefinition/formDefinitionV2/save`, params);
-		if (formCode) pageJsonCache.set(formCode, {
+		if (pageCode.value) pageJsonCache.set(pageCode.value, {
 			formId: formId.value,
 			json: normalizePageJson(cloneDeep(json))
 		});

package/core/src/utils/smart-vue-i18n/index.js

@@ -1,5 +1,7 @@
 import { reactive } from "vue";
 import { get, isObject } from "lodash-es";
+import zhCN from "ant-design-vue/es/locale/zh_CN";
+import enUS from "ant-design-vue/es/locale/en_US";
 //#region ../core/src/utils/smart-vue-i18n/index.ts
 var locale = reactive({
 	lang: "zh-CN",
@@ -7,28 +9,26 @@ var locale = reactive({
 });
 var langLoaders = {
 	"zh-CN": async () => {
-		const [zhCN, zhLocale, zhLocale_render, zhLocale_extension] = await Promise.all([
-			import("ant-design-vue/es/locale/zh_CN"),
+		const [zhLocale, zhLocale_render, zhLocale_extension] = await Promise.all([
 			import("../../lang/zh-CN.js"),
 			import("../../lang/zh-CN_render.js"),
 			import("../../lang/zh-CN_extension.js")
 		]);
 		return {
-			...zhCN.default,
+			...zhCN,
 			...zhLocale.default,
 			...zhLocale_render.default,
 			...zhLocale_extension.default
 		};
 	},
 	"en-US": async () => {
-		const [enUS, enLocale, enLocale_render, enLocale_extension] = await Promise.all([
-			import("ant-design-vue/es/locale/en_US"),
+		const [enLocale, enLocale_render, enLocale_extension] = await Promise.all([
 			import("../../lang/en-US.js"),
 			import("../../lang/en-US_render.js"),
 			import("../../lang/en-US_extension.js")
 		]);
 		return {
-			...enUS.default,
+			...enUS,
 			...enLocale.default,
 			...enLocale_render.default,
 			...enLocale_extension.default

package/install.js

@@ -1,5 +1,6 @@
 import "./_virtual/virtual_svg-icons-register.js";
 /* empty css                       */
+import { openCustomerModal } from "./src/components/public/CustomerModal/useCustomerModal.js";
 import render_default from "./src/render/index.js";
 import CustomPageRender_default from "./src/components/public/ConfigView/CustomPageRender.js";
 import { VxeTooltip } from "vxe-pc-ui";
@@ -8,9 +9,7 @@ var createLowcode = ({ app, publicComponents }) => {
 	app.config.globalProperties.$publicComponents = publicComponents;
 	app.component("VxeTooltip", VxeTooltip);
 	app.config.globalProperties.$openLowcodeModal = (ops) => {
-		import("./src/components/public/CustomerModal/useCustomerModal.js").then(({ openCustomerModal }) => {
-			openCustomerModal(ops, app);
-		});
+		openCustomerModal(ops, app);
 	};
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kp-ui/lowcode-pc-v2",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"

package/src/components/public/ConfigView/CustomPageRender.vue_vue_type_script_setup_true_lang.js

@@ -1,21 +1,17 @@
 import { useLowcode } from "../../../../core/src/hooks/useLowcode.js";
 import render_default from "../../../render/index.js";
-import { createBlock, defineComponent, onMounted, openBlock, ref, unref } from "vue";
+import { createBlock, defineComponent, onMounted, openBlock, unref } from "vue";
 import { getLocat } from "@kp-ui/tool";
 //#region src/components/public/ConfigView/CustomPageRender.vue?vue&type=script&setup=true&lang.tsx
 var CustomPageRender_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	__name: "CustomPageRender",
-	props: { title: {
-		type: String,
-		default: ""
-	} },
+	props: { pageCode: String },
 	setup(__props) {
-		const { formCode = "", id = "", type = "edit" } = getLocat();
-		const anchorList = ref([]);
-		const setAnchorList = (list) => {
-			anchorList.value = list;
-		};
-		const { vfdRef, formConfig, getPageJson, goBack } = useLowcode();
+		const { type = "edit" } = getLocat();
+		const { vfdRef, getPageJson, goBack } = useLowcode({
+			pageCode: __props.pageCode,
+			type
+		});
 		onMounted(async () => {
 			await getPageJson();
 		});
@@ -24,10 +20,8 @@ var CustomPageRender_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 				ref_key: "vfdRef",
 				ref: vfdRef,
 				vfCtx: {
-					_id: unref(id),
 					...unref(getLocat)(),
-					goBack: unref(goBack),
-					setAnchorList
+					goBack: unref(goBack)
 				}
 			}, null, 8, ["vfCtx"]);
 		};

package/src/components/public/CustomerModal/CustomerModal.vue_vue_type_script_setup_true_lang.js

@@ -35,7 +35,10 @@ var CustomerModal_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 			};
 		});
 		const isDisabled = ref(false);
-		const { vfdRef, formConfig, getPageJson, isLoading } = useLowcode();
+		const { vfdRef, formConfig, getPageJson, isLoading } = useLowcode({
+			pageCode: props.formCode,
+			type: props.type
+		});
 		const leftNum = ref(null);
 		const modalTitle = computed(() => {
 			if (props.title) return props.title;
@@ -47,7 +50,7 @@ var CustomerModal_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 		const show = async () => {
 			visible.value = true;
 			await nextTick();
-			await getPageJson(props.formCode);
+			await getPageJson();
 		};
 		const setleftText = (number) => {
 			leftNum.value = number;

package/src/render/index.js

@@ -2,6 +2,6 @@ import _plugin_vue_export_helper_default from "../../_virtual/_plugin-vue_export
 import index_vue_vue_type_script_setup_true_lang_default from "./index.vue_vue_type_script_setup_true_lang.js";
 /* empty css                                                      */
 //#region src/render/index.vue
-var render_default = /* @__PURE__ */ _plugin_vue_export_helper_default(index_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-464184f3"]]);
+var render_default = /* @__PURE__ */ _plugin_vue_export_helper_default(index_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-976bc2cb"]]);
 //#endregion
 export { render_default as default };

package/src/render/index.vue_vue_type_script_setup_true_lang.js

@@ -28,7 +28,7 @@ var index_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 		parentForm: { default: null }
 	},
 	setup(__props, { expose: __expose }) {
-		useCssVars((_ctx) => ({ "4a7fb80b": unref(formConfig).backgroundColor }));
+		useCssVars((_ctx) => ({ "ee95b64a": unref(formConfig).backgroundColor }));
 		const debug = computed(() => getLocat().debug === "1");
 		const debugVisible = ref(false);
 		const props = __props;

package/src/widgets/containers/collapse/index-render.js

@@ -3,6 +3,6 @@ import index_render_vue_vue_type_script_setup_true_lang_default from "./index-re
 /* empty css                                                             */
 /* empty css                                                             */
 //#region src/widgets/containers/collapse/index-render.vue
-var index_render_default = /* @__PURE__ */ _plugin_vue_export_helper_default(index_render_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-cf9e4069"]]);
+var index_render_default = /* @__PURE__ */ _plugin_vue_export_helper_default(index_render_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-198dcc4f"]]);
 //#endregion
 export { index_render_default as default };

package/src/widgets/containers/collapse/index-render.vue_vue_type_script_setup_true_lang.js

@@ -18,7 +18,7 @@ var index_render_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 	__name: "index-render",
 	props: { widget: {} },
 	setup(__props, { expose: __expose }) {
-		const { handleHidden, defineExposed } = useField(__props.widget, false);
+		const { handleHidden, defineExposed } = useField(__props.widget);
 		__expose({ ...defineExposed });
 		return (_ctx, _cache) => {
 			return !unref(handleHidden) ? (openBlock(), createElementBlock("div", _hoisted_1, [createVNode(unref(TpfCollapse), { title: _ctx.widget.props.label }, {