super-page-runtime 3.0.4 → 3.0.5-beta1

package/dist/es/components/runtime/views/assemblys/chart/gauge/gauge-runtime.vue2.js

@@ -1,5 +1,8 @@
-import { defineComponent, ref, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, createVNode } from "vue";
-import { getCustomTheme } from "../../../../utils/charts/chart-util.js";
+import { defineComponent, ref, onMounted, watch, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, withDirectives, createVNode, vShow } from "vue";
+import { getCustomTheme, initChartOption } from "../../../../utils/charts/chart-util.js";
+import { getChartDatasFromPage, updateChartDatasources, monitorFieldChange } from "../../../../utils/page-helper-util.js";
+import { updateChartOption } from "../../../../utils/charts/chart-gauge-util.js";
+import _sfc_main$1 from "../common/common-chart-header.vue.js";
 import B from "../../../../../../node_modules/.pnpm/vue-echarts@6.6.9_echarts@5.5.0_vue@3.4.21/node_modules/vue-echarts/dist/index.esm.min.js";
 import { install as install$1 } from "../../../../../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/chart/gauge/install.js";
 import { use } from "../../../../../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/extension.js";
@@ -14,23 +17,66 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props) {
-    use([
-      install,
-      install$1,
-      install$2,
-      install$3,
-      install$4,
-      install$5
-    ]);
+  setup(__props, { expose: __expose }) {
+    use([install, install$1, install$2, install$3, install$4, install$5]);
     const props = __props;
     const thisRef = ref(null);
+    const chartRef = ref(null);
+    const headerRef = ref(null);
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
+    const dataConfig = runtimeInfo.dataConfig;
+    const headerInfo = runtimeInfo.headerInfo ? runtimeInfo.headerInfo : {};
     const chartOption = runtimeInfo.chartOption;
     const configureProps = props.configure.props ? props.configure.props : {};
     const customTheme = getCustomTheme(configureProps.customTheme);
+    initChartOption(props.configure, chartOption);
+    onMounted(() => {
+      const resultData = getChartDatasFromPage(props.pageContext, props.configure);
+      if (resultData) {
+        updateChartDatas(resultData);
+      }
+    });
+    let hisGroupValue = headerInfo.groupValue;
+    watch(headerInfo, () => {
+      if (hisGroupValue == headerInfo.groupValue) {
+        return;
+      }
+      hisGroupValue = headerInfo.groupValue;
+      refresh();
+    });
+    function refresh() {
+      if (!dataConfig) {
+        console.log("无数据源配置，不需要查询!");
+        return;
+      }
+      dataConfig.services[0].groupValue = headerInfo.groupValue;
+      updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
+    }
+    const monitorFields = headerInfo.monitorFields;
+    monitorFieldChange(props.pageContext, monitorFields, refresh);
+    function updateChartDatas(resultData) {
+      if (!resultData) {
+        resultData = [];
+      }
+      resultData = resultData.length > 0 ? resultData[0] : {};
+      if (!resultData) {
+        resultData = {};
+      }
+      if (resultData.hasRender) {
+        resultData.hasRender = true;
+        console.log("重复更新!", resultData);
+        return;
+      }
+      resultData.hasRender = true;
+      console.log("gauge resultData", resultData);
+      updateChartOption(props.pageContext, props.configure, chartOption, resultData);
+      console.log("chartOption", chartOption);
+    }
+    __expose({
+      updateChartDatas
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         style: normalizeStyle(unref(runtimeStyle)),
@@ -38,8 +84,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref_key: "thisRef",
         ref: thisRef
       }, [
+        withDirectives(createVNode(_sfc_main$1, {
+          ref_key: "headerRef",
+          ref: headerRef,
+          headerInfo: unref(headerInfo)
+        }, null, 8, ["headerInfo"]), [
+          [vShow, unref(headerInfo).showHeader]
+        ]),
         createVNode(unref(B), {
-          ref: "chartRef",
+          ref_key: "chartRef",
+          ref: chartRef,
           theme: unref(customTheme),
           option: unref(chartOption),
           autoresize: ""

package/dist/es/components/runtime/views/assemblys/chart/pie/pie-runtime.vue2.js

@@ -1,5 +1,8 @@
-import { defineComponent, ref, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, createVNode } from "vue";
-import { getCustomTheme } from "../../../../utils/charts/chart-util.js";
+import { defineComponent, ref, onMounted, watch, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, withDirectives, createVNode, vShow } from "vue";
+import { getCustomTheme, initChartOption, monitorChartClickToVariable } from "../../../../utils/charts/chart-util.js";
+import { updateChartOption } from "../../../../utils/charts/chart-pie-util.js";
+import { getChartDatasFromPage, updateChartDatasources, monitorFieldChange } from "../../../../utils/page-helper-util.js";
+import _sfc_main$1 from "../common/common-chart-header.vue.js";
 import B from "../../../../../../node_modules/.pnpm/vue-echarts@6.6.9_echarts@5.5.0_vue@3.4.21/node_modules/vue-echarts/dist/index.esm.min.js";
 import { install as install$1 } from "../../../../../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/chart/pie/install.js";
 import { use } from "../../../../../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/extension.js";
@@ -15,7 +18,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     use([
       install,
       install$1,
@@ -27,12 +30,87 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     ]);
     const props = __props;
     const thisRef = ref(null);
+    const chartRef = ref(null);
+    const headerRef = ref(null);
+    const enableDrill = props.configure.props ? props.configure.props.enableDrill : null;
+    const drillEndTrigger = props.configure.props ? props.configure.props.drillEndTrigger : null;
+    const selGroupVariable = props.configure.props ? props.configure.props.selGroupVariable : null;
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
+    const dataConfig = runtimeInfo.dataConfig;
+    const headerInfo = runtimeInfo.headerInfo ? runtimeInfo.headerInfo : {};
     const chartOption = runtimeInfo.chartOption;
     const configureProps = props.configure.props ? props.configure.props : {};
     const customTheme = getCustomTheme(configureProps.customTheme);
+    initChartOption(props.configure, chartOption);
+    onMounted(() => {
+      const resultData = getChartDatasFromPage(props.pageContext, props.configure);
+      if (resultData) {
+        updateChartDatas(resultData);
+      }
+      if (enableDrill && chartRef.value) {
+        chartRef.value.chart.on("click", function(params) {
+          if (headerRef.value && headerRef.value.drill) {
+            headerRef.value.drill(params, props.configure.cacheDatas);
+          }
+        });
+      }
+      if (!enableDrill && selGroupVariable && chartRef.value) {
+        monitorChartClickToVariable(
+          props.pageContext,
+          props.configure,
+          chartRef.value.chart,
+          selGroupVariable
+        );
+      }
+    });
+    function onDrillEnd(params) {
+      if (drillEndTrigger == "clearDrill") {
+        if (headerRef.value && headerRef.value.closeDrill) {
+          headerRef.value.closeDrill(0);
+        }
+      }
+    }
+    let hisGroupValue = headerInfo.groupValue;
+    watch(headerInfo, () => {
+      if (hisGroupValue == headerInfo.groupValue) {
+        return;
+      }
+      hisGroupValue = headerInfo.groupValue;
+      refresh();
+    });
+    function refresh() {
+      if (!dataConfig) {
+        console.log("无数据源配置，不需要查询!");
+        return;
+      }
+      dataConfig.services[0].groupValue = headerInfo.groupValue;
+      updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
+    }
+    const monitorFields = headerInfo.monitorFields;
+    monitorFieldChange(props.pageContext, monitorFields, refresh);
+    function updateChartDatas(resultData) {
+      if (!resultData) {
+        resultData = [];
+      }
+      resultData = resultData.length > 0 ? resultData[0] : {};
+      if (!resultData) {
+        resultData = {};
+      }
+      if (resultData.hasRender) {
+        resultData.hasRender = true;
+        console.log("重复更新!", resultData);
+        return;
+      }
+      resultData.hasRender = true;
+      console.log("pie resultData", resultData);
+      updateChartOption(props.pageContext, props.configure, chartOption, resultData);
+      console.log("chartOption", chartOption);
+    }
+    __expose({
+      updateChartDatas
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         style: normalizeStyle(unref(runtimeStyle)),
@@ -40,8 +118,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref_key: "thisRef",
         ref: thisRef
       }, [
+        withDirectives(createVNode(_sfc_main$1, {
+          ref_key: "headerRef",
+          ref: headerRef,
+          headerInfo: unref(headerInfo),
+          onDrillEnd
+        }, null, 8, ["headerInfo"]), [
+          [vShow, unref(headerInfo).showHeader]
+        ]),
         createVNode(unref(B), {
-          ref: "chartRef",
+          ref_key: "chartRef",
+          ref: chartRef,
           theme: unref(customTheme),
           option: unref(chartOption),
           autoresize: ""

package/dist/es/components/runtime/views/assemblys/chart/radar/radar-runtime.vue2.js

@@ -1,5 +1,8 @@
-import { defineComponent, ref, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, createVNode } from "vue";
-import { getCustomTheme } from "../../../../utils/charts/chart-util.js";
+import { defineComponent, ref, onMounted, watch, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, withDirectives, createVNode, vShow } from "vue";
+import { getCustomTheme, initChartOption } from "../../../../utils/charts/chart-util.js";
+import { getChartDatasFromPage, updateChartDatasources, monitorFieldChange } from "../../../../utils/page-helper-util.js";
+import { updateChartOption } from "../../../../utils/charts/chart-radar-util.js";
+import _sfc_main$1 from "../common/common-chart-header.vue.js";
 import B from "../../../../../../node_modules/.pnpm/vue-echarts@6.6.9_echarts@5.5.0_vue@3.4.21/node_modules/vue-echarts/dist/index.esm.min.js";
 import { install as install$1 } from "../../../../../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/chart/radar/install.js";
 import { use } from "../../../../../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/extension.js";
@@ -15,7 +18,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     use([
       install,
       install$1,
@@ -27,12 +30,62 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     ]);
     const props = __props;
     const thisRef = ref(null);
+    const chartRef = ref(null);
+    const headerRef = ref(null);
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
+    const dataConfig = runtimeInfo.dataConfig;
+    const headerInfo = runtimeInfo.headerInfo ? runtimeInfo.headerInfo : {};
     const chartOption = runtimeInfo.chartOption;
     const configureProps = props.configure.props ? props.configure.props : {};
     const customTheme = getCustomTheme(configureProps.customTheme);
+    initChartOption(props.configure, chartOption);
+    console.log("chartOption", chartOption);
+    onMounted(() => {
+      const resultData = getChartDatasFromPage(props.pageContext, props.configure);
+      if (resultData) {
+        updateChartDatas(resultData);
+      }
+    });
+    let hisGroupValue = headerInfo.groupValue;
+    watch(headerInfo, () => {
+      if (hisGroupValue == headerInfo.groupValue) {
+        return;
+      }
+      hisGroupValue = headerInfo.groupValue;
+      refresh();
+    });
+    function refresh() {
+      if (!dataConfig) {
+        console.log("无数据源配置，不需要查询!");
+        return;
+      }
+      dataConfig.services[0].groupValue = headerInfo.groupValue;
+      updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
+    }
+    const monitorFields = headerInfo.monitorFields;
+    monitorFieldChange(props.pageContext, monitorFields, refresh);
+    function updateChartDatas(resultData) {
+      if (!resultData) {
+        resultData = [];
+      }
+      resultData = resultData.length > 0 ? resultData[0] : {};
+      if (!resultData) {
+        resultData = {};
+      }
+      if (resultData.hasRender) {
+        resultData.hasRender = true;
+        console.log("重复更新!", resultData);
+        return;
+      }
+      resultData.hasRender = true;
+      updateChartOption(props.pageContext, props.configure, chartOption, resultData);
+      console.log("chartOption", chartOption);
+    }
+    __expose({
+      updateChartDatas
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         style: normalizeStyle(unref(runtimeStyle)),
@@ -40,8 +93,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref_key: "thisRef",
         ref: thisRef
       }, [
+        withDirectives(createVNode(_sfc_main$1, {
+          ref_key: "headerRef",
+          ref: headerRef,
+          headerInfo: unref(headerInfo)
+        }, null, 8, ["headerInfo"]), [
+          [vShow, unref(headerInfo).showHeader]
+        ]),
         createVNode(unref(B), {
-          ref: "chartRef",
+          ref_key: "chartRef",
+          ref: chartRef,
           theme: unref(customTheme),
           option: unref(chartOption),
           autoresize: ""

package/dist/es/components/runtime/views/assemblys/chart/scatter/scatter-runtime.vue2.js

@@ -1,5 +1,8 @@
-import { defineComponent, ref, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, createVNode } from "vue";
-import { getCustomTheme } from "../../../../utils/charts/chart-util.js";
+import { defineComponent, ref, onMounted, watch, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, withDirectives, createVNode, vShow } from "vue";
+import { getCustomTheme, initChartOption } from "../../../../utils/charts/chart-util.js";
+import { getChartDatasFromPage, updateChartDatasources, monitorFieldChange } from "../../../../utils/page-helper-util.js";
+import { updateChartOption } from "../../../../utils/charts/chart-scatter-util.js";
+import _sfc_main$1 from "../common/common-chart-header.vue.js";
 import B from "../../../../../../node_modules/.pnpm/vue-echarts@6.6.9_echarts@5.5.0_vue@3.4.21/node_modules/vue-echarts/dist/index.esm.min.js";
 import { install as install$1 } from "../../../../../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/chart/scatter/install.js";
 import { use } from "../../../../../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/extension.js";
@@ -16,7 +19,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     use([
       install,
       install$1,
@@ -29,12 +32,62 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     ]);
     const props = __props;
     const thisRef = ref(null);
+    const chartRef = ref(null);
+    const headerRef = ref(null);
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
+    const dataConfig = runtimeInfo.dataConfig;
+    const headerInfo = runtimeInfo.headerInfo ? runtimeInfo.headerInfo : {};
     const chartOption = runtimeInfo.chartOption;
     const configureProps = props.configure.props ? props.configure.props : {};
     const customTheme = getCustomTheme(configureProps.customTheme);
+    initChartOption(props.configure, chartOption);
+    console.log("chartOption", chartOption);
+    onMounted(() => {
+      const resultData = getChartDatasFromPage(props.pageContext, props.configure);
+      if (resultData) {
+        updateChartDatas(resultData);
+      }
+    });
+    let hisGroupValue = headerInfo.groupValue;
+    watch(headerInfo, () => {
+      if (hisGroupValue == headerInfo.groupValue) {
+        return;
+      }
+      hisGroupValue = headerInfo.groupValue;
+      refresh();
+    });
+    function refresh() {
+      if (!dataConfig) {
+        console.log("无数据源配置，不需要查询!");
+        return;
+      }
+      dataConfig.services[0].groupValue = headerInfo.groupValue;
+      updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
+    }
+    const monitorFields = headerInfo.monitorFields;
+    monitorFieldChange(props.pageContext, monitorFields, refresh);
+    function updateChartDatas(resultData) {
+      if (!resultData) {
+        resultData = [];
+      }
+      resultData = resultData.length > 0 ? resultData[0] : {};
+      if (!resultData) {
+        resultData = {};
+      }
+      if (resultData.hasRender) {
+        resultData.hasRender = true;
+        console.log("重复更新!", resultData);
+        return;
+      }
+      resultData.hasRender = true;
+      updateChartOption(props.pageContext, props.configure, chartOption, resultData);
+      console.log("chartOption scatter", chartOption);
+    }
+    __expose({
+      updateChartDatas
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         style: normalizeStyle(unref(runtimeStyle)),
@@ -42,8 +95,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref_key: "thisRef",
         ref: thisRef
       }, [
+        withDirectives(createVNode(_sfc_main$1, {
+          ref_key: "headerRef",
+          ref: headerRef,
+          headerInfo: unref(headerInfo)
+        }, null, 8, ["headerInfo"]), [
+          [vShow, unref(headerInfo).showHeader]
+        ]),
         createVNode(unref(B), {
-          ref: "chartRef",
+          ref_key: "chartRef",
+          ref: chartRef,
           theme: unref(customTheme),
           option: unref(chartOption),
           autoresize: ""

package/dist/es/components/runtime/views/assemblys/common/remove-signer-dialog.vue.d.ts

@@ -8,8 +8,8 @@ declare const _default: import('vue').DefineComponent<{
         default: any;
     };
 }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    close: (...args: any[]) => void;
     result: (...args: any[]) => void;
+    close: (...args: any[]) => void;
     open: (...args: any[]) => void;
     opend: (...args: any[]) => void;
     closed: (...args: any[]) => void;

package/dist/es/components/runtime/views/assemblys/common/task-informition-dialog.vue.d.ts

@@ -4,8 +4,8 @@ declare const _default: import('vue').DefineComponent<{
         default: any;
     };
 }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    close: (...args: any[]) => void;
     result: (...args: any[]) => void;
+    close: (...args: any[]) => void;
     open: (...args: any[]) => void;
     opend: (...args: any[]) => void;
     closed: (...args: any[]) => void;

package/dist/es/components/runtime/views/assemblys/common/task-informition-dialog.vue.js

@@ -24,7 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
         return;
       }
-      emits("result", this.selections[0]);
+      emits("result", selections.value[0]);
     }
     function select(selection) {
       selections.value = selection;

package/dist/es/components/runtime/views/assemblys/container/card/card-runtime.vue2.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, openBlock, createBlock, unref, normalizeStyle, normalizeClass, createSlots, withCtx, createElementVNode, createElementBlock, Fragment, renderList, createCommentVNode, createTextVNode, toDisplayString } from "vue";
-import { SuperIcon as _sfc_main$2 } from "../../../../../../node_modules/.pnpm/agilebuilder-ui@1.0.13_vue@3.4.21/node_modules/agilebuilder-ui/lib/super-ui.js";
+import { SuperIcon as _sfc_main$4 } from "../../../../../../node_modules/.pnpm/agilebuilder-ui@1.0.26_vue@3.4.21/node_modules/agilebuilder-ui/lib/super-ui.js";
 import _sfc_main$1 from "../../object-render.vue.js";
 import { ElCard } from "../../../../../../node_modules/.pnpm/element-plus@2.6.2_vue@3.4.21/node_modules/element-plus/es/components/card/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -18,7 +18,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
-    const contentClass = runtimeInfo.contentClass;
+    const contentStyle = runtimeInfo.contentStyle;
     function test() {
       props.configure.props.title = "teee";
     }
@@ -34,7 +34,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, createSlots({
         default: withCtx(() => [
           createElementVNode("div", {
-            class: normalizeClass(unref(contentClass))
+            style: normalizeStyle(unref(contentStyle))
           }, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.configure.items, (element, itemIndex) => {
               return openBlock(), createBlock(_sfc_main$1, {
@@ -43,7 +43,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 configure: element
               }, null, 8, ["pageContext", "configure"]);
             }), 128))
-          ], 2)
+          ], 4)
         ]),
         _: 2
       }, [
@@ -53,7 +53,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createElementVNode("div", {
               style: normalizeStyle(unref(headerStyle))
             }, [
-              _ctx.configure.props.iconType && _ctx.configure.props.iconValue ? (openBlock(), createBlock(unref(_sfc_main$2), {
+              _ctx.configure.props.iconType && _ctx.configure.props.iconValue ? (openBlock(), createBlock(unref(_sfc_main$4), {
                 key: 0,
                 iconType: _ctx.configure.props.iconType,
                 iconValue: _ctx.configure.props.iconValue,

package/dist/es/components/runtime/views/assemblys/container/flex/flex-runtime.vue2.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, unref, normalizeStyle, normalizeClass, withCtx, createElementBlock, Fragment, renderList } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, normalizeStyle, unref, normalizeClass, withCtx, createElementBlock, Fragment, renderList, createVNode } from "vue";
 import _sfc_main$1 from "../../object-render.vue.js";
-import "../../../../utils/global-refs.js";
+import { PageDimensions } from "../../../../utils/interfaces/page-design-types.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "flex-runtime",
   props: {
@@ -13,25 +13,52 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
-    const designProperty = runtimeInfo.props ? runtimeInfo.props : {};
+    const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    if (props.configure.items) {
+      const pageDimensions = props.pageContext && props.pageContext.dimensions ? props.pageContext.dimensions : PageDimensions.PC;
+      for (let item of props.configure.items) {
+        const itemCommon = item.runtime && item.runtime.common ? item.runtime.common : {};
+        const sizeStyle = itemCommon.style ? itemCommon.style[pageDimensions + "_style"] : void 0;
+        const itemStyle = {};
+        if (sizeStyle) {
+          item.flexSpan = sizeStyle.flexSpan ? sizeStyle.flexSpan : -2;
+          Object.assign(itemStyle, sizeStyle);
+          delete itemStyle.height;
+          delete sizeStyle.width;
+        }
+        item.itemStyle = itemStyle;
+        if (itemCommon.style) {
+          itemCommon.style[pageDimensions + "_class"] = "";
+        }
+      }
+    }
     return (_ctx, _cache) => {
+      const _component_el_col = resolveComponent("el-col");
       const _component_el_row = resolveComponent("el-row");
       return openBlock(), createBlock(_component_el_row, {
         ref_key: "thisRef",
         ref: thisRef,
-        justify: unref(designProperty).flexJustify,
-        gutter: unref(designProperty).flexGutter,
-        align: unref(designProperty).alignItems,
-        style: normalizeStyle(unref(runtimeStyle)),
+        justify: designProperty.value.flexJustify,
+        gutter: designProperty.value.flexGutter,
+        align: designProperty.value.alignItems,
+        style: normalizeStyle([{ "display": "flex" }, unref(runtimeStyle)]),
         class: normalizeClass(unref(runtimeClass))
       }, {
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.configure.items, (element, itemIndex) => {
-            return openBlock(), createBlock(_sfc_main$1, {
+            return openBlock(), createBlock(_component_el_col, {
               key: element.uuid,
-              pageContext: _ctx.pageContext,
-              configure: element
-            }, null, 8, ["pageContext", "configure"]);
+              style: normalizeStyle(element.itemStyle),
+              span: element.flexSpan
+            }, {
+              default: withCtx(() => [
+                createVNode(_sfc_main$1, {
+                  pageContext: _ctx.pageContext,
+                  configure: element
+                }, null, 8, ["pageContext", "configure"])
+              ]),
+              _: 2
+            }, 1032, ["style", "span"]);
           }), 128))
         ]),
         _: 1

package/dist/es/components/runtime/views/assemblys/container/form/form-runtime.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, unref, normalizeStyle, normalizeClass, withCtx, createElementBlock, Fragment, renderList } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, unref, normalizeStyle, normalizeClass, withCtx, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList } from "vue";
 import _sfc_main$1 from "../../object-render.vue.js";
 import "../../../../utils/global-refs.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -14,8 +14,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeProps = runtimeInfo.props ? runtimeInfo.props : {};
-    const runtimeStyle = runtimeInfo.style;
+    const runtimeStyle = ref(runtimeInfo.style ? runtimeInfo.style : {});
     const runtimeClass = runtimeInfo.class;
+    const titleStyle = ref(runtimeInfo.titleStyle ? runtimeInfo.titleStyle : {});
     return (_ctx, _cache) => {
       const _component_el_form = resolveComponent("el-form");
       return openBlock(), createBlock(_component_el_form, {
@@ -23,10 +24,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         "label-width": unref(runtimeProps).labelWidth,
         "label-position": unref(runtimeProps).labelPosition,
         size: unref(runtimeProps).componentSize,
-        style: normalizeStyle(unref(runtimeStyle)),
+        style: normalizeStyle(runtimeStyle.value),
         class: normalizeClass(unref(runtimeClass))
       }, {
         default: withCtx(() => [
+          unref(runtimeProps).formTitle ? (openBlock(), createElementBlock("div", {
+            key: 0,
+            class: "amb-widget-form-title",
+            style: normalizeStyle(titleStyle.value)
+          }, toDisplayString(unref(runtimeProps).formTitle), 5)) : createCommentVNode("", true),
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.configure.items, (element, itemIndex) => {
             return openBlock(), createBlock(_sfc_main$1, {
               key: element.uuid,