@ibiz-template/vue3-components 0.7.26-alpha.2 → 0.7.26

package/lib/control/calendar/components/custom-calendar/custom-calendar.cjs

@@ -3,9 +3,8 @@
 var vue = require('vue');
 var dayjs = require('dayjs');
 var vue3Util = require('@ibiz-template/vue3-util');
-var index$2 = require('../calendar-daily/index.cjs');
-var index$1 = require('../calendar-week/index.cjs');
-var index = require('../calendar-month/index.cjs');
+var index$1 = require('../calendar-daily/index.cjs');
+var index = require('../calendar-week/index.cjs');
 var useCustomCalendar = require('./use-custom-calendar.cjs');
 require('./custom-calendar.css');
 require('../interface/index.cjs');
@@ -24,7 +23,6 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
     const {
       date,
       events,
-      i18nDate,
       shortcuts,
       viewType,
       validatedRange,
@@ -42,112 +40,6 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
     vue.onMounted(() => {
       pickDay(dayjs(/* @__PURE__ */ new Date()));
     });
-    const renderMonth = () => {
-      var _a;
-      return vue.createVNode("div", {
-        "class": [ns.e("calendar-month")]
-      }, [(slots == null ? void 0 : slots.header) ? vue.createVNode("div", {
-        "class": [ns.em("calendar-month", "header")]
-      }, [(_a = slots == null ? void 0 : slots.header) == null ? void 0 : _a.call(slots, {
-        date: i18nDate.value,
-        legends: legends.value
-      })]) : vue.createVNode("div", {
-        "class": [ns.em("calendar-month", "header")]
-      }, [vue.createVNode("div", {
-        "class": [ns.em("header", "title")]
-      }, [i18nDate.value]), vue.createVNode("div", {
-        "class": ns.em("calendar-month", "legend")
-      }, [legends.value.length > 1 && legends.value.map((legend) => {
-        return vue.createVNode("div", {
-          "class": ns.em("calendar-month", "legend-item"),
-          "onClick": () => selectLegend(legend)
-        }, [vue.createVNode("div", {
-          "class": ns.em("calendar-month", "legend-item-tip"),
-          "style": {
-            background: legend.isShow ? legend.bkcolor : "#CCCCCC"
-          }
-        }, null), vue.createVNode("div", {
-          "class": ns.em("calendar-month", "legend-item-text"),
-          "style": {
-            color: legend.isShow ? legend.color : "#CCCCCC"
-          },
-          "title": legend.name
-        }, [legend.name])]);
-      })]), validatedRange.value.length === 0 && vue.createVNode("div", {
-        "class": [ns.em("calendar-month", "button-group")]
-      }, [vue.createVNode(vue.resolveComponent("el-date-picker"), {
-        "modelValue": realSelectedDay.value,
-        "onUpdate:modelValue": ($event) => realSelectedDay.value = $event,
-        "type": "month"
-      }, null), vue.createVNode(vue.resolveComponent("el-button-group"), null, {
-        default: () => [vue.createVNode(vue.resolveComponent("el-button"), {
-          "size": "small",
-          "onClick": () => {
-            selectDate("prev-year");
-          }
-        }, {
-          default: () => [vue.createTextVNode("\u53BB\u5E74")]
-        }), vue.createVNode(vue.resolveComponent("el-button"), {
-          "size": "small",
-          "onClick": () => {
-            selectDate("prev-month");
-          }
-        }, {
-          default: () => [vue.createTextVNode("\u4E0A\u4E2A\u6708")]
-        }), vue.createVNode(vue.resolveComponent("el-button"), {
-          "size": "small",
-          "onClick": () => {
-            selectDate("today");
-          }
-        }, {
-          default: () => [vue.createTextVNode("\u4ECA\u5929")]
-        }), vue.createVNode(vue.resolveComponent("el-button"), {
-          "size": "small",
-          "onClick": () => {
-            selectDate("next-month");
-          }
-        }, {
-          default: () => [vue.createTextVNode("\u4E0B\u4E2A\u6708")]
-        }), vue.createVNode(vue.resolveComponent("el-button"), {
-          "size": "small",
-          "onClick": () => {
-            selectDate("next-year");
-          }
-        }, {
-          default: () => [vue.createTextVNode("\u660E\u5E74")]
-        })]
-      })])]), validatedRange.value.length === 0 ? vue.createVNode("div", {
-        "class": [ns.em("calendar-month", "body")]
-      }, [vue.createVNode(index.IBizCalendarMonth, {
-        "date": date.value,
-        "controller": props.controller,
-        "selected-day": realSelectedDay.value,
-        "events": events.value,
-        "legends": legends.value,
-        "multiple": multiple.value,
-        "selectedData": selectedData.value,
-        "onPickEvent": (day) => pickDay(day),
-        "onEventClick": (value) => handleEVentClick(value),
-        "onEventDblClick": (value) => handleEVentDblClick(value)
-      }, slots)]) : vue.createVNode("div", {
-        "class": [ns.em("calendar-month", "body")]
-      }, [validatedRange.value.map((item, index$1) => {
-        return vue.createVNode(index.IBizCalendarMonth, {
-          "date": item[0],
-          "controller": props.controller,
-          "selected-day": realSelectedDay.value,
-          "range": item,
-          "hide-header": index$1 !== 0,
-          "onPickEvent": (day) => pickDay(day),
-          "events": events.value,
-          "legends": legends.value,
-          "multiple": multiple.value,
-          "selectedData": selectedData.value,
-          "onEventClick": (value) => handleEVentClick(value),
-          "onEventDblClick": (value) => handleEVentDblClick(value)
-        }, slots);
-      })])]);
-    };
     const renderWeek = () => {
       var _a;
       return vue.createVNode("div", {
@@ -163,7 +55,7 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         "class": ns.em("calendar-week", "header-top")
       }, [vue.createVNode("div", {
         "class": ns.em("calendar-week", "title")
-      }, [props.controller.state.calendarTitle || ibiz.i18n.t("control.calendar.title")]), vue.createVNode("div", {
+      }, [props.calendarTitle || ibiz.i18n.t("control.calendar.title")]), vue.createVNode("div", {
         "class": ns.em("calendar-week", "legend")
       }, [legends.value.length > 1 && legends.value.map((item) => {
         return vue.createVNode("div", {
@@ -189,9 +81,9 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         "type": "date",
         "placeholder": "\u9009\u62E9\u65E5\u671F",
         "shortcuts": shortcuts
-      }, null)])])]), vue.createVNode(index$1.IBizCalendarWeek, {
+      }, null)])])]), vue.createVNode(index.IBizCalendarWeek, {
         "selected-day": realSelectedDay.value,
-        "controller": props.controller,
+        "showDetail": props.showDetail,
         "events": events.value,
         "legends": legends.value,
         "multiple": multiple.value,
@@ -215,7 +107,7 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         "class": ns.em("calendar-week", "header-top")
       }, [vue.createVNode("div", {
         "class": ns.em("calendar-week", "title")
-      }, [props.controller.state.calendarTitle || ibiz.i18n.t("control.calendar.title")]), vue.createVNode("div", {
+      }, [props.calendarTitle || ibiz.i18n.t("control.calendar.title")]), vue.createVNode("div", {
         "class": ns.em("calendar-week", "legend")
       }, [legends.value.length > 1 && legends.value.map((item) => {
         return vue.createVNode("div", {
@@ -243,7 +135,7 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
         "shortcuts": shortcuts
       }, null)])]), vue.createVNode("div", {
         "class": ns.em("calendar-week", "text-secondary")
-      }, [curWeek.value])]), vue.createVNode(index$2.IBizCalendarDaily, {
+      }, [curWeek.value])]), vue.createVNode(index$1.IBizCalendarDaily, {
         "selected-day": realSelectedDay.value,
         "controller": props.controller,
         "events": events.value,
@@ -256,8 +148,6 @@ const CustomCalendar = /* @__PURE__ */ vue.defineComponent({
     };
     const renderContent = () => {
       switch (viewType.value) {
-        case "MONTH":
-          return renderMonth();
         case "DAY":
           return renderDay();
         case "WEEK":

package/lib/control/calendar/components/interface/calendar-daily.cjs

@@ -6,9 +6,6 @@ var lodashEs = require('lodash-es');
 
 "use strict";
 const calendarDailyProps = util.handleProps({
-  controller: {
-    type: Object
-  },
   selectedDay: {
     type: util.definePropType(Object)
   },

package/lib/control/calendar/components/interface/calendar-week.cjs

@@ -6,8 +6,9 @@ var lodashEs = require('lodash-es');
 
 "use strict";
 const calendarWeekProps = util.handleProps({
-  controller: {
-    type: Object
+  showDetail: {
+    type: Boolean,
+    default: false
   },
   selectedDay: {
     type: util.definePropType(Object)

package/lib/control/calendar/components/interface/custom-calendar.cjs

@@ -9,9 +9,14 @@ var event = require('../constant/event.cjs');
 "use strict";
 const isValidRange = (range) => lodashEs.isArray(range) && range.length === 2 && range.every((item) => lodashEs.isDate(item));
 const customCalendarProps = util.handleProps({
-  controller: {
-    type: Object,
-    required: true
+  // 标题
+  calendarTitle: {
+    type: String
+  },
+  // 显示popover 详情
+  showDetail: {
+    type: Boolean,
+    default: false
   },
   /**
    * @description 绑定值

package/lib/control/calendar/components/interface/index.cjs

@@ -3,7 +3,6 @@
 require('./common.cjs');
 var customCalendar = require('./custom-calendar.cjs');
 var calendarDaily = require('./calendar-daily.cjs');
-var calendarMonth = require('./calendar-month.cjs');
 var calendarWeek = require('./calendar-week.cjs');
 
 "use strict";
@@ -12,7 +11,5 @@ exports.customCalendarEmits = customCalendar.customCalendarEmits;
 exports.customCalendarProps = customCalendar.customCalendarProps;
 exports.calendarDailyEmits = calendarDaily.calendarDailyEmits;
 exports.calendarDailyProps = calendarDaily.calendarDailyProps;
-exports.calendarMonthEmits = calendarMonth.calendarMonthEmits;
-exports.calendarMonthProps = calendarMonth.calendarMonthProps;
 exports.calendarWeekEmits = calendarWeek.calendarWeekEmits;
 exports.calendarWeekProps = calendarWeek.calendarWeekProps;

package/lib/control/dashboard/custom-dashboard-container/custom-dashboard-container.cjs

@@ -32,7 +32,7 @@ const CustomDashboardContainer = /* @__PURE__ */ vue.defineComponent({
     const clickCollapse = (type) => {
       showTypeDir.value = type === "left";
     };
-    const getPortletByCodeName = (codeName) => {
+    const getPortletModelByCodeName = (codeName) => {
       const app = ibiz.hub.getApp(ibiz.env.appId);
       if (app.model.appPortlets) {
         const appPortlet = app.model.appPortlets.find((portlet) => {
@@ -44,15 +44,25 @@ const CustomDashboardContainer = /* @__PURE__ */ vue.defineComponent({
         }
       }
     };
-    const convertData = (models) => {
+    const getPortletModel = async (data) => {
+      if (data.dynamodelFlag) {
+        if (data.portletModel) {
+          return data.portletModel;
+        }
+        const dynaPortlet = await props.dashboard.loadDynaPortletById(data.portletId);
+        return dynaPortlet;
+      }
+      return getPortletModelByCodeName(data.portletCodeName);
+    };
+    const convertData = async (models) => {
       const tempModelDatas = [];
       if (models.length > 0) {
-        models.forEach((item) => {
-          const temModelData = getPortletByCodeName(item.portletCodeName);
+        for (let i = 0; i < models.length; i++) {
+          const temModelData = await getPortletModel(models[i]);
           if (temModelData) {
             tempModelDatas.push(temModelData);
           }
-        });
+        }
       }
       return tempModelDatas;
     };
@@ -62,7 +72,7 @@ const CustomDashboardContainer = /* @__PURE__ */ vue.defineComponent({
     };
     const onSaved = async (args) => {
       isShowDesign.value = false;
-      const tempModelDatas = convertData(args.model);
+      const tempModelDatas = await convertData(args.model);
       await handleCustomModelChange({
         model: tempModelDatas,
         config: args.config
@@ -84,7 +94,7 @@ const CustomDashboardContainer = /* @__PURE__ */ vue.defineComponent({
     });
     vue.onMounted(async () => {
       const response = await customC.loadCustomModelData();
-      const tempModelDatas = convertData(response.model);
+      const tempModelDatas = await convertData(response.model);
       emit("changed", {
         model: tempModelDatas
       });

package/lib/control/dashboard/dashboard-design/dashboard-design.cjs

@@ -31,10 +31,20 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
     emit
   }) {
     const ns = vue3Util.useNamespace("dashboard-design");
+    const c = props.dashboard;
     const customC = props.customDashboard;
-    const filterData = (list2) => {
+    const portlets = vue.ref([]);
+    const list = vue.ref([]);
+    const groups = vue.ref([]);
+    const filterVal = vue.ref("");
+    const layoutModel = vue.ref(ramda.clone(customC.customModelData));
+    const layoutConfig = vue.ref(ramda.clone(customC.portletConfig));
+    const providers = vue.ref({});
+    const portletControllers = vue.ref({});
+    const designPanel = vue.ref(null);
+    const filterData = (list1) => {
       const items = [];
-      list2.forEach((data) => {
+      list1.forEach((data) => {
         var _a;
         if (Object.is(data.type, "app")) {
           items.push(data);
@@ -98,10 +108,26 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
       });
       return items;
     };
-    const prepareData = () => {
-      const list2 = [];
+    const prepareData = async () => {
+      const list3 = [];
       const app = ibiz.hub.getApp(ibiz.env.appId);
-      if (app.model.appPortletCats && app.model.appPortlets) {
+      if (c.enableDynamic) {
+        const dynamicPortlets = await c.loadAllDynaPortlet();
+        dynamicPortlets == null ? void 0 : dynamicPortlets.forEach((portlet) => {
+          const temp = {
+            type: "app",
+            dynamodelFlag: 1,
+            portletId: portlet.psappportletid,
+            portletCodeName: portlet.codename,
+            portletName: portlet.psappportletname,
+            groupCodeName: "Ungroup",
+            groupName: "\u672A\u5206\u7C7B",
+            appCodeName: app.model.pkgcodeName,
+            appName: app.model.name
+          };
+          list3.push(temp);
+        });
+      } else if (app.model.appPortletCats && app.model.appPortlets) {
         const isDEView = customC.model.appDataEntityId;
         const categoryTag = props.dashboard.controlParams.categorytag;
         app.model.appPortlets.forEach((portlet) => {
@@ -131,28 +157,14 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
             appCodeName: portlet.appDataEntityId || app.model.pkgcodeName,
             appName: app.model.name
           };
-          list2.push(temp);
+          list3.push(temp);
         });
       }
-      const datas = filterData(list2);
-      const result2 = prepareList(datas);
-      const groups2 = prepareGroup(datas);
-      return {
-        portlets: datas,
-        list: result2.reverse(),
-        groups: groups2
-      };
+      const datas = filterData(list3);
+      portlets.value = datas;
+      list.value = prepareList(datas).reverse();
+      groups.value = prepareGroup(datas);
     };
-    const result = prepareData();
-    const portlets = vue.ref(result.portlets);
-    const list = vue.ref(result.list);
-    const groups = vue.ref(result.groups);
-    const filterVal = vue.ref("");
-    const layoutModel = vue.ref(ramda.clone(customC.customModelData));
-    const layoutConfig = vue.ref(ramda.clone(customC.portletConfig));
-    const providers = vue.ref({});
-    const portletControllers = vue.ref({});
-    const designPanel = vue.ref(null);
     const defaultOpens = vue.computed(() => {
       let tempOpens = [];
       if (filterVal.value) {
@@ -188,41 +200,59 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
         }
       });
     };
-    const getPortletByCodeName = (codeName) => {
+    const getPortletModelByCodeName = (tag) => {
       const app = ibiz.hub.getApp(ibiz.env.appId);
       if (app.model.appPortlets) {
         const appPortlet = app.model.appPortlets.find((portlet) => {
           var _a;
-          return ((_a = portlet.control) == null ? void 0 : _a.codeName) === codeName;
+          return ((_a = portlet.control) == null ? void 0 : _a.codeName) === tag;
         });
         if (appPortlet) {
           return appPortlet.control;
         }
       }
     };
-    const convertData = (models) => {
+    const getPortletModel = async (data) => {
+      if (data.dynamodelFlag) {
+        if (data.portletModel) {
+          return data.portletModel;
+        }
+        const dynaPortlet = await c.loadDynaPortletById(data.portletId);
+        return dynaPortlet;
+      }
+      return getPortletModelByCodeName(data.portletCodeName);
+    };
+    const convertData = async (models) => {
       const tempModelDatas = [];
       if (models.length > 0) {
-        models.forEach((item) => {
-          const temModelData = getPortletByCodeName(item.portletCodeName);
+        for (let i = 0; i < models.length; i++) {
+          const temModelData = await getPortletModel(models[i]);
           if (temModelData) {
             tempModelDatas.push(temModelData);
           }
-        });
+        }
       }
       return tempModelDatas;
     };
-    const preparePortlet = async () => {
-      const tempModelDatas = convertData(layoutModel.value);
+    const preparePortlet = async (data) => {
+      const tempModelDatas = await convertData(data);
       await initPortlets(tempModelDatas);
       await initPortletsConfig();
+      return tempModelDatas;
     };
     vue.watch(() => props.isShowDesign, async (newVal) => {
       if (newVal) {
+        await prepareData();
         const res = await customC.loadCustomModelData();
-        layoutModel.value = ramda.clone(res.model);
+        const model = ramda.clone(res.model);
+        const tempModelDatas = await preparePortlet(model);
+        layoutModel.value = model;
+        layoutModel.value.forEach((item, index) => {
+          if (item.dynamodelFlag) {
+            item.portletModel = tempModelDatas[index];
+          }
+        });
         layoutConfig.value = ramda.clone(res.config);
-        await preparePortlet();
       }
     }, {
       immediate: true
@@ -248,7 +278,7 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
       const index = layoutModel.value.indexOf(child);
       if (index !== -1) {
         layoutModel.value.splice(index, 1);
-        const temModelData = getPortletByCodeName(child.portletCodeName);
+        const temModelData = await getPortletModel(child);
         if (temModelData) {
           const controller = portletControllers.value[temModelData.id];
           await controller.destroyed();
@@ -257,6 +287,7 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
     };
     const lastScrollHeight = vue.ref(0);
     const addLayoutItem = async (child) => {
+      const tempModelDatas = await preparePortlet([child]);
       const element = designPanel.value;
       if (element) {
         lastScrollHeight.value = element.scrollHeight + 3 * customC.layoutRowH;
@@ -267,15 +298,20 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
           maxY = obj.y;
         }
       }
-      layoutModel.value.push({
+      const tempItemModel = {
         w: 4,
         h: 3,
         x: 0,
         y: maxY + 3,
         i: child.portletCodeName,
         ...child
-      });
-      await preparePortlet();
+      };
+      if (child.dynamodelFlag) {
+        Object.assign(tempItemModel, {
+          portletModel: tempModelDatas[0]
+        });
+      }
+      layoutModel.value.push(tempItemModel);
       if (element) {
         const intervalId = setInterval(() => {
           if (element.scrollHeight >= lastScrollHeight.value) {
@@ -321,9 +357,9 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
       isDisabled,
       providers,
       portletControllers,
-      getPortletByCodeName,
       maskSize,
-      designPanel
+      designPanel,
+      getPortletModelByCodeName
     };
   },
   render() {
@@ -392,23 +428,24 @@ const DashboardDesign = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const renderPortlet = (item) => {
-      const portletModel = this.getPortletByCodeName(item.portletCodeName);
-      if (portletModel) {
-        const provider = this.providers[portletModel.id];
-        const controller = this.portletControllers[portletModel.id];
-        const commonProps = {
-          modelData: portletModel,
-          controller
-        };
-        if (!provider) {
-          return vue.createVNode("div", null, [portletModel.portletType, ibiz.i18n.t("app.noSupport")]);
-        }
-        const providerComp = vue.resolveComponent(provider.component);
-        return vue.h(providerComp, {
-          ...commonProps,
-          key: portletModel.id
-        });
+      const portletModel = item.dynamodelFlag ? item.portletModel : this.getPortletModelByCodeName(item.portletCodeName);
+      if (!portletModel) {
+        return null;
+      }
+      const provider = this.providers[portletModel.id];
+      const controller = this.portletControllers[portletModel.id];
+      const commonProps = {
+        modelData: portletModel,
+        controller
+      };
+      if (!provider) {
+        return vue.createVNode("div", null, [portletModel.portletType, ibiz.i18n.t("app.noSupport")]);
       }
+      const providerComp = vue.resolveComponent(provider.component);
+      return vue.h(providerComp, {
+        ...commonProps,
+        key: portletModel.id
+      });
     };
     return vue.createVNode("div", {
       "class": this.ns.b()

package/lib/control/drtab/drtab-control.util.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var vue = require('vue');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.25_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.26_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 
 "use strict";
 function useAppDRTab(c, controlRef, counterData) {

package/lib/control/form/form-detail/form-mdctrl/mdctrl-container2/mdctrl-container2.cjs

@@ -109,6 +109,7 @@ const MDCtrlContainer2 = /* @__PURE__ */ vue.defineComponent({
     };
     const handleDragEnd = () => {
       draggingKey.value = "";
+      props.controller.updateData();
       updateArrowVisible();
     };
     return {