@kp-ui/lowcode 1.0.72 → 1.0.74

package/src/components/form-render/container-item/vf-collapse-item.vue.js

@@ -155,7 +155,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             _: 1
           }),
-          $props.widget.options.isCollapse ? (openBlock(), createElementBlock("div", {
+          !$props.widget.options.isCollapse ? (openBlock(), createElementBlock("div", {
             key: 0,
             class: normalizeClass(["header-right", $options.rightSlotCss])
           }, [
@@ -269,7 +269,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     [vShow, !$props.widget.options.hidden]
   ]);
 }
-const vfCollapseItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-d81bc2ac"]]);
+const vfCollapseItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43b60d66"]]);
 export {
   vfCollapseItem as default
 };

package/src/components/form-render/dynamic-dialog.vue.js

@@ -1,12 +1,11 @@
-import i18n from "../../utils/i18n.js";
-import zhCN from "ant-design-vue/es/locale/zh_CN";
-import { defineAsyncComponent, resolveComponent, resolveDirective, createBlock, openBlock, mergeProps, withCtx, withDirectives, createElementBlock, createVNode, createElementVNode } from "vue";
+import { defineComponent, defineAsyncComponent, ref, getCurrentInstance, computed, onBeforeUnmount, resolveDirective, createBlock, openBlock, unref, withCtx, createVNode, mergeProps, withDirectives, createElementBlock, nextTick } from "vue";
+import { useComRef, TpfConfigProvider, TpfModal, http } from "tmgc2-share";
 import _sfc_main$1 from "./SubmitButtonRender.vue.js";
-/* empty css                    */
-import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.js";
-const _sfc_main = {
-  name: "dynamic-dialog",
-  mixins: [i18n],
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    name: "dynamic-dialog"
+  },
+  __name: "dynamic-dialog",
   props: {
     options: {
       type: Object,
@@ -46,220 +45,208 @@ const _sfc_main = {
       default: null
     }
   },
-  components: {
-    SubmitButtonRender: _sfc_main$1,
-    VFormRender: defineAsyncComponent(() => import("./index.vue.js"))
-  },
-  data() {
-    const elLocaleMap = {
-      "zh-CN": { ...zhCN },
-      "en-US": {}
-    };
-    return {
-      isSubmitting: false,
-      // 添加提交状态标记
-      isClosing: false,
-      // 添加关闭状态标记
-      isLoading: false,
-      dialogVisible: false,
-      elLocaleMap
-    };
-  },
-  created() {
-  },
-  computed: {
-    elLocale() {
-      const curLocale = localStorage.getItem("lowcode_local") || "zh-CN";
-      return this.elLocaleMap[curLocale];
-    },
-    parentForm() {
+  setup(__props, { expose: __expose }) {
+    var _a;
+    const VFormRender = defineAsyncComponent(() => import("./index.vue.js"));
+    const props = __props;
+    const isLoading = ref(false);
+    const dialogVisible = ref(false);
+    const dFormRef = useComRef(VFormRender);
+    const currentInstance = (_a = getCurrentInstance()) == null ? void 0 : _a.proxy;
+    const parentForm = computed(() => {
       return {
-        ...this.parentFormRef,
-        parentDom: this,
-        getParentFormRef: this.getParentFormRef
+        ...props.parentFormRef,
+        parentDom: currentInstance,
+        getParentFormRef
       };
-    },
-    otherAttrs() {
-      if (this.options.cancelButtonHidden && this.options.okButtonHidden) {
+    });
+    const otherAttrs = computed(() => {
+      if (props.options.cancelButtonHidden && props.options.okButtonHidden) {
         return { footer: null };
       }
       return {};
-    },
-    cancelBtnLabel() {
-      return this.options.cancelButtonLabel || this.i18nt("designer.hint.cancel");
-    },
-    okBtnLabel() {
-      return this.options.okButtonLabel || this.i18nt("designer.hint.confirm");
-    }
-  },
-  mounted() {
-  },
-  beforeUnmount() {
-    console.log(this.parentFormRef);
-    this.parentFormRef.setChildFormRef(null);
-  },
-  methods: {
-    async loadFormCode() {
-      if (this.options.formCode) {
-        this.isLoading = true;
+    });
+    onBeforeUnmount(() => {
+      console.log(props.parentFormRef);
+      props.parentFormRef.setChildFormRef(null);
+    });
+    const loadFormCode = async () => {
+      if (props.options.formCode) {
+        isLoading.value = true;
         try {
-          const res = await this.$http.get(`/api/tmgc2-query/dataQuery/detail/FormDefinitionManagement`, {
-            params: { code: this.options.formCode }
+          const res = await http.get(`/api/tmgc2-query/dataQuery/detail/FormDefinitionManagement`, {
+            params: { code: props.options.formCode }
           }).then((res2) => res2.data.object.frontendDefinition || "{}");
           const formJson = JSON.parse(res);
           console.log("formJson: ", formJson);
-          this.$refs.dFormRef.setFormJson(formJson);
+          dFormRef.value.setFormJson(formJson);
         } catch (error) {
         }
-        this.isLoading = false;
+        isLoading.value = false;
       }
-    },
-    setLoading(status) {
+    };
+    const setLoading = (status) => {
       console.log("setLoading", status);
-      this.isLoading = status;
-    },
-    setFormJson(formJson) {
-      this.$refs.dFormRef.setFormJson(formJson);
-    },
-    setTitle(title) {
-      this.options.title = title;
-    },
-    beforeOpen() {
-      this.dialogVisible = true;
-    },
-    show() {
-      this.dialogVisible = true;
-      this.$nextTick(() => {
-        var _a;
-        if (!!this.options.readMode) {
-          this.$refs["dFormRef"].setReadMode(true);
+      isLoading.value = status;
+    };
+    const setFormJson = (formJson) => {
+      dFormRef.value.setFormJson(formJson);
+    };
+    const setTitle = (title) => {
+      props.options.title = title;
+    };
+    const beforeOpen = () => {
+      dialogVisible.value = true;
+    };
+    const show = () => {
+      dialogVisible.value = true;
+      nextTick(() => {
+        var _a2;
+        if (!!props.options.readMode) {
+          dFormRef.value.setReadMode(true);
         }
-        this.loadFormCode();
-        (_a = this.$refs["dFormRef"]) == null ? void 0 : _a.setDialogOrDrawerRef(this);
-        if (this.parentFormRef) {
-          this.parentFormRef.setChildFormRef(this.$refs["dFormRef"]);
+        loadFormCode();
+        console.log(dFormRef.value);
+        (_a2 = dFormRef.value) == null ? void 0 : _a2.setDialogOrDrawerRef(currentInstance);
+        if (props.parentFormRef) {
+          props.parentFormRef.setChildFormRef(dFormRef.value);
         }
-        this.handleOpenedEvent();
+        handleOpenedEvent();
       });
-    },
-    close() {
-      if (!!this.options.onDialogBeforeClose) {
-        const customFn = new Function("done", this.options.onDialogBeforeClose);
-        const closeResult = customFn.call(this);
+    };
+    const close = () => {
+      if (!!props.options.onDialogBeforeClose) {
+        const customFn = new Function("done", props.options.onDialogBeforeClose);
+        const closeResult = customFn.call(currentInstance);
         if (closeResult === false) {
           return;
         }
       }
-      this.dialogVisible = false;
-      setTimeout(this.deleteWrapperNode, 150);
-    },
-    deleteWrapperNode() {
-      const wrapperNode = document.getElementById(
-        "vf-dynamic-dialog-wrapper" + this.wrapperId
-      );
+      dialogVisible.value = false;
+      setTimeout(deleteWrapperNode, 150);
+    };
+    const deleteWrapperNode = () => {
+      const wrapperNode = document.getElementById("vf-dynamic-dialog-wrapper" + props.wrapperId);
       if (!!wrapperNode) {
         document.body.removeChild(wrapperNode);
       }
-    },
-    handleBeforeClose() {
-      if (!!this.options.onDialogBeforeClose) {
-        const customFn = new Function(this.options.onDialogBeforeClose);
-        return customFn.call(this);
+    };
+    const handleBeforeClose = () => {
+      if (!!props.options.onDialogBeforeClose) {
+        const customFn = new Function(props.options.onDialogBeforeClose);
+        return customFn.call(currentInstance);
       }
       return true;
-    },
-    handleCloseEvent() {
-      if (!this.handleBeforeClose()) return;
-      this.dialogVisible = false;
-      setTimeout(this.deleteWrapperNode, 150);
-    },
-    handleOpenedEvent() {
-      if (!!this.options.onDialogOpened) {
-        const customFn = new Function(this.options.onDialogOpened);
-        customFn.call(this);
+    };
+    const handleCloseEvent = () => {
+      if (!handleBeforeClose()) return;
+      dialogVisible.value = false;
+      setTimeout(deleteWrapperNode, 150);
+    };
+    const handleOpenedEvent = () => {
+      if (!!props.options.onDialogOpened) {
+        const customFn = new Function(props.options.onDialogOpened);
+        customFn.call(currentInstance);
       }
-    },
-    getParentFormRef() {
-      return this.parentFormRef;
-    },
-    getFormRef() {
+    };
+    const getParentFormRef = () => {
+      return props.parentFormRef;
+    };
+    const getFormRef = () => {
       console.log("getFormRef");
-      return this.$refs["dFormRef"];
-    },
-    getWidgetRef(widgetName, showError = false) {
-      return this.$refs["dFormRef"].getWidgetRef(widgetName, showError);
-    },
-    updateTable() {
-      var _a, _b, _c;
-      if ((_c = (_b = (_a = this.vfCtx) == null ? void 0 : _a.parent) == null ? void 0 : _b.exposed) == null ? void 0 : _c.updateTable) {
-        this.vfCtx.parent.exposed.updateTable();
+      return dFormRef.value;
+    };
+    const getWidgetRef = (widgetName, showError = false) => {
+      return dFormRef.value.getWidgetRef(widgetName, showError);
+    };
+    const updateTable = () => {
+      var _a2, _b, _c;
+      if ((_c = (_b = (_a2 = props.vfCtx) == null ? void 0 : _a2.parent) == null ? void 0 : _b.exposed) == null ? void 0 : _c.updateTable) {
+        props.vfCtx.parent.exposed.updateTable();
       }
-    },
-    getExtraData() {
-      return this.extraData;
-    }
+    };
+    const getExtraData = () => {
+      return props.extraData;
+    };
+    __expose({
+      loadFormCode,
+      setLoading,
+      setFormJson,
+      setTitle,
+      beforeOpen,
+      show,
+      close,
+      deleteWrapperNode,
+      handleBeforeClose,
+      handleCloseEvent,
+      handleOpenedEvent,
+      getParentFormRef,
+      getFormRef,
+      getWidgetRef,
+      updateTable,
+      getExtraData
+    });
+    return (_ctx, _cache) => {
+      const _directive_loading = resolveDirective("loading");
+      return openBlock(), createBlock(unref(TpfConfigProvider), null, {
+        default: withCtx(() => [
+          createVNode(unref(TpfModal), mergeProps({
+            class: "tpf-model design-model",
+            transitionName: !dialogVisible.value ? "" : "zoom",
+            maskTransitionName: !dialogVisible.value ? "" : "fade",
+            destroyOnClose: true,
+            title: __props.options.title,
+            bodyStyle: {
+              height: __props.options.height,
+              overflow: "auto",
+              ...JSON.parse(__props.options.bodyStyle || "{}")
+            },
+            centered: true,
+            visible: dialogVisible.value,
+            "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => dialogVisible.value = $event),
+            width: __props.options.width,
+            mask: __props.options.showModal,
+            maskClosable: __props.options.closeOnClickModal,
+            keyboard: __props.options.closeOnPressEscape,
+            onCancel: handleCloseEvent
+          }, otherAttrs.value), {
+            footerRight: withCtx(() => [
+              createVNode(_sfc_main$1, {
+                "dialog-visible": dialogVisible.value,
+                "onUpdate:dialogVisible": _cache[0] || (_cache[0] = ($event) => dialogVisible.value = $event),
+                handleBeforeClose,
+                deleteWrapperNode,
+                options: __props.options,
+                ctx: unref(currentInstance)
+              }, null, 8, ["dialog-visible", "options", "ctx"])
+            ]),
+            default: withCtx(() => [
+              withDirectives((openBlock(), createElementBlock("div", { class: "dialog-content" }, [
+                createVNode(unref(VFormRender), {
+                  isLoading: isLoading.value,
+                  ref_key: "dFormRef",
+                  ref: dFormRef,
+                  "form-json": __props.formJson,
+                  "form-data": __props.formData,
+                  vfCtx: __props.vfCtx,
+                  "option-data": __props.optionData,
+                  "global-dsv": __props.globalDsv,
+                  "parent-form": parentForm.value,
+                  "disabled-mode": __props.options.disabledMode,
+                  "dynamic-creation": true
+                }, null, 8, ["isLoading", "form-json", "form-data", "vfCtx", "option-data", "global-dsv", "parent-form", "disabled-mode"])
+              ])), [
+                [_directive_loading, isLoading.value]
+              ])
+            ]),
+            _: 1
+          }, 16, ["transitionName", "maskTransitionName", "title", "bodyStyle", "visible", "width", "mask", "maskClosable", "keyboard"])
+        ]),
+        _: 1
+      });
+    };
   }
-};
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_VFormRender = resolveComponent("VFormRender");
-  const _component_SubmitButtonRender = resolveComponent("SubmitButtonRender");
-  const _component_a_modal = resolveComponent("a-modal");
-  const _directive_loading = resolveDirective("loading");
-  return openBlock(), createBlock(_component_a_modal, mergeProps({
-    class: "tpf-model design-model",
-    transitionName: !$data.dialogVisible ? "" : "zoom",
-    maskTransitionName: !$data.dialogVisible ? "" : "fade",
-    destroyOnClose: true,
-    title: $props.options.title,
-    bodyStyle: {
-      height: $props.options.height,
-      overflow: "auto",
-      ...JSON.parse(this.options.bodyStyle || "{}")
-    },
-    centered: true,
-    visible: $data.dialogVisible,
-    "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => $data.dialogVisible = $event),
-    width: $props.options.width,
-    mask: $props.options.showModal,
-    maskClosable: $props.options.closeOnClickModal,
-    keyboard: $props.options.closeOnPressEscape,
-    onCancel: $options.handleCloseEvent
-  }, $options.otherAttrs), {
-    footer: withCtx(() => [
-      createElementVNode("div", { class: "footer-left" }),
-      createElementVNode("div", { class: "footer-right" }, [
-        createVNode(_component_SubmitButtonRender, {
-          "dialog-visible": $data.dialogVisible,
-          "onUpdate:dialogVisible": _cache[0] || (_cache[0] = ($event) => $data.dialogVisible = $event),
-          handleBeforeClose: $options.handleBeforeClose,
-          deleteWrapperNode: $options.deleteWrapperNode,
-          options: $props.options,
-          ctx: this
-        }, null, 8, ["dialog-visible", "handleBeforeClose", "deleteWrapperNode", "options"])
-      ])
-    ]),
-    default: withCtx(() => [
-      withDirectives((openBlock(), createElementBlock("div", { class: "dialog-content" }, [
-        createVNode(_component_VFormRender, {
-          isLoading: $data.isLoading,
-          ref: "dFormRef",
-          "form-json": $props.formJson,
-          "form-data": $props.formData,
-          vfCtx: $props.vfCtx,
-          "option-data": $props.optionData,
-          "global-dsv": $props.globalDsv,
-          "parent-form": $options.parentForm,
-          "disabled-mode": $props.options.disabledMode,
-          "dynamic-creation": true
-        }, null, 8, ["isLoading", "form-json", "form-data", "vfCtx", "option-data", "global-dsv", "parent-form", "disabled-mode"])
-      ])), [
-        [_directive_loading, $data.isLoading]
-      ])
-    ]),
-    _: 1
-  }, 16, ["transitionName", "maskTransitionName", "title", "bodyStyle", "visible", "width", "mask", "maskClosable", "keyboard", "onCancel"]);
-}
-const DynamicDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+});
 export {
-  DynamicDialog as default
+  _sfc_main as default
 };

package/src/components/form-render/dynamic-dialog.vue2.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./dynamic-dialog.vue.js";
+export {
+  _sfc_main as default
+};

package/src/components/form-render/index.vue.js

@@ -3,7 +3,7 @@ import emitter from "../../utils/emitter.js";
 import comps from "../form-designer/form-widget/field-widget/index.js";
 import { buildDefaultFormJson, getContainerWidgetByName, cloneFormConfigWithoutEventHandler, deepClone, getDSByName, overwriteObj, runDataSourceRequest, getAllContainerWidgets, getAllFieldWidgets, getDefaultFormConfig, traverseFieldWidgets, getFieldWidgetByName, traverseFieldWidgetsOfContainer, insertCustomCssToHead, insertGlobalFunctionsToHtml, generateId } from "../../utils/util.js";
 import i18n, { changeLocale } from "../../utils/i18n.js";
-import DynamicDialog from "./dynamic-dialog.vue.js";
+import _sfc_main$1 from "./dynamic-dialog.vue.js";
 import DynamicDrawer from "./dynamic-drawer.vue.js";
 import { fmtHttpParams } from "../../utils/request/fmtHttpParams.js";
 /* empty css           */
@@ -946,7 +946,7 @@ const _sfc_main = {
         formConfig: cloneFormConfigWithoutEventHandler(topFormRef.formConfig)
       };
       const wrapperDivId = generateId() + "";
-      const dialogInstance = h(DynamicDialog, {
+      const dialogInstance = h(_sfc_main$1, {
         options: dialogCon.options,
         formJson: dFormJson,
         formData: { ...formData },
@@ -963,7 +963,7 @@ const _sfc_main = {
       document.body.appendChild(wrapperDiv);
       render(dialogInstance, wrapperDiv);
       document.body.appendChild(dialogInstance.el);
-      dialogInstance.component.ctx.show();
+      dialogInstance.component.exposed.show();
     },
     showDrawer(drawerName, formData = {}, extraData = {}) {
       const topFormRef = this.getTopFormRef();
@@ -1024,14 +1024,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           }, ["prevent"]))
         }, {
           default: withCtx(() => [
-            (openBlock(true), createElementBlock(Fragment, null, renderList($options.widgetList, (widget, index2) => {
+            (openBlock(true), createElementBlock(Fragment, null, renderList($options.widgetList, (widget, index) => {
               return openBlock(), createElementBlock(Fragment, null, [
                 "container" === widget.category ? (openBlock(), createBlock(resolveDynamicComponent($options.getContainerWidgetName(widget)), {
                   widget,
                   key: widget.id,
                   data: $data.formDataModel[widget.options.name],
                   "parent-list": $options.widgetList,
-                  "index-of-parent-list": index2,
+                  "index-of-parent-list": index,
                   "parent-widget": null,
                   model: $data.formDataModel
                 }, createSlots({ _: 2 }, [
@@ -1049,7 +1049,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   designer: null,
                   key: widget.id,
                   "parent-list": $options.widgetList,
-                  "index-of-parent-list": index2,
+                  "index-of-parent-list": index,
                   "parent-widget": null
                 }, createSlots({ _: 2 }, [
                   renderList(Object.keys(_ctx.$slots), (slot) => {
@@ -1071,7 +1071,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 3
   }, 8, ["spinning"]);
 }
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-88794663"]]);
+const VFormRender = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-5d8bcc8a"]]);
 export {
-  index as default
+  VFormRender as default
 };

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

@@ -1,6 +1,7 @@
 import { defineComponent, getCurrentInstance, useAttrs, ref, computed, onMounted, createBlock, openBlock, unref, mergeProps, withCtx, createVNode, nextTick } from "vue";
 import { useLowcode } from "../../../hooks/useLowcode.js";
 import _sfc_main$1 from "../../form-render/SubmitButtonRender.vue.js";
+import VFormRender from "../../form-render/index.vue.js";
 import { TpfModal } from "tmgc2-share";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "CustomerModal",
@@ -9,7 +10,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     formCode: {}
   },
   setup(__props) {
-    const VFormRender = defineAsyncComponent(() => import("../../form-render/index.vue.js"));
     const instance = getCurrentInstance();
     const attrs = useAttrs() || {};
     const visible = ref(false);
@@ -59,7 +59,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           options: unref(formConfig),
           ctx: unref(vfdRef)
         }, null, 8, ["dialogVisible", "options", "ctx"])]),
-        default: withCtx(() => [createVNode(unref(VFormRender), {
+        default: withCtx(() => [createVNode(VFormRender, {
           vfCtx: vfCtx.value,
           ref_key: "vfdRef",
           ref: vfdRef

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

@@ -1,6 +1,6 @@
 import { defineAsyncComponent, createApp, createVNode, mergeProps } from "vue";
 import { TpfConfigProvider } from "tmgc2-share";
-const openCustomerModal = (ops, useMountApp) => {
+const openCustomerModal = (ops) => {
   console.log("ops: ", ops);
   const {
     type,
@@ -26,7 +26,9 @@ const openCustomerModal = (ops, useMountApp) => {
       onCancel
     }, args), null)]
   }));
-  useMountApp(modal);
+  if (window.useMountApp) {
+    window.useMountApp(modal);
+  }
   modal.mount(div);
 };
 export {

package/src/hooks/useLowcode.js

@@ -1,11 +1,12 @@
+import VFormRender from "../components/form-render/index.vue.js";
 import { basicFieldsEnums } from "../components/form-designer/widget-panel/basicFieldsEnums.js";
 import { getUuidKey } from "@kp-ui/tool";
-import { useDataQueryApi, useRouteBackTab, routerReloadStatus } from "tmgc2-share";
+import { useDataQueryApi, useComRef, useRouteBackTab, routerReloadStatus } from "tmgc2-share";
 import { ref } from "vue";
 const useLowcode = (params) => {
   const { formCode, entityCode, type } = params;
   const useDataQuery = useDataQueryApi();
-  const vfdRef = ref();
+  const vfdRef = useComRef(VFormRender);
   const formConfig = ref();
   const { routeBackTab } = useRouteBackTab();
   const insertBtn = (list = []) => {

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

@@ -49,6 +49,7 @@ function createI18n(options) {
       return message !== null ? message : get(messages, path2);
     },
     async setLang(lang) {
+      console.log({ lang });
       locale.lang = lang;
       if (!(lang in locale.messages)) {
         if (lang in langLoaders) {
@@ -56,6 +57,7 @@ function createI18n(options) {
           locale.messages[lang] = messages;
         }
       }
+      console.log(locale.messages);
       locale.lang = lang;
     }
   };