super-page-runtime 2.0.43-beta7 → 2.0.44

package/dist/es/components/runtime/utils/charts/chart-util.d.ts

@@ -41,7 +41,16 @@ export declare function initChartOption(configure: Component, chartOption: any):
  * @param chart
  * @param variable
  */
-export declare function monitorChartClickToVariable(pageContext: PageContext, configure: Component, chart: any, variable: string): void;
+export declare function monitorChartClickToVariable(pageContext: PageContext, configure: Component, chart: any): void;
+/**
+ * 清除统计图的选中
+ * @param pageContext
+ * @param configure
+ * @param chart
+ * @returns
+ */
+export declare function clearChartSelected(pageContext: PageContext, configure: Component, chart: any): void;
+export declare function updateClickVariablesForSelected(pageContext: PageContext, configure: Component): void;
 export declare function sortDatas(pageContext: PageContext, configure: Component, datas: Array<any>): void;
 /**
  * 限制显示数量

package/dist/es/components/runtime/utils/charts/chart-util.js

@@ -83,7 +83,6 @@ function initChartOption(configure, chartOption) {
   }
   if (chartOption.series) {
     const enableDrill = configure.props ? configure.props.enableDrill : null;
-    const selGroupVariable = configure.props ? configure.props.selGroupVariable : null;
     for (const s of chartOption.series) {
       if (!chartOption.radar) {
         s.data = [];
@@ -94,11 +93,20 @@ function initChartOption(configure, chartOption) {
         }
         s.label.formatter = getNumFormatter.apply(s, s.labelFormatterArgs);
       }
-      if (!enableDrill && selGroupVariable) {
+      if (!enableDrill && configure.clickSet && configure.clickSet.selected) {
         if (s.emphasis) {
           s.emphasis.disabled = false;
         }
       }
+      if (s.type === "pie" && configure.clickSet) {
+        if (configure.clickSet.selected) {
+          if (configure.clickSet.multiple) {
+            s.selectedMode = "multiple";
+          } else {
+            s.selectedMode = "single";
+          }
+        }
+      }
     }
   }
   if (chartOption.radar) {
@@ -123,51 +131,118 @@ function initChartOption(configure, chartOption) {
   }
   configure.defaultYaxis = defaultYaxis;
 }
-function monitorChartClickToVariable(pageContext, configure, chart, variable) {
-  if (!chart || !variable || !configure || !pageContext) {
+function monitorChartClickToVariable(pageContext, configure, chart) {
+  if (!chart || !configure || !configure.clickSet || !pageContext) {
     return;
   }
+  const clickSet = configure.clickSet;
   chart.on("click", function(params) {
-    let highlightInfos = configure.highlightInfos;
-    let hasSelect = false;
-    let selGroupValue = null;
+    let highlightInfos = configure.highlightInfos ? configure.highlightInfos : [];
+    console.log("highlightInfos", highlightInfos, params);
+    let hisSelectIndex = -1;
     if (highlightInfos) {
+      const newInfos = [];
       for (let i = 0; i < highlightInfos.length; i++) {
         const info = highlightInfos[i];
-        chart.dispatchAction({
-          type: "downplay",
-          seriesIndex: info.seriesIndex,
-          dataIndex: info.dataIndex
-        });
-        if (info.seriesIndex == params.seriesIndex && info.dataIndex == params.dataIndex) {
-          hasSelect = true;
+        const hisSelected = info.seriesIndex === params.seriesIndex && info.dataIndex === params.dataIndex;
+        if (hisSelected || !clickSet.multiple) {
+          if (clickSet.selected) {
+            const typeName = configure.name === "chart-pie" ? "unselect" : "downplay";
+            chart.dispatchAction({
+              type: typeName,
+              seriesIndex: info.seriesIndex,
+              dataIndex: info.dataIndex
+            });
+          }
+        } else {
+          newInfos.push(info);
+        }
+        if (hisSelected) {
+          hisSelectIndex = i;
         }
       }
+      highlightInfos = newInfos;
     }
-    highlightInfos = [];
-    if (!hasSelect) {
-      chart.dispatchAction({
-        type: "highlight",
-        seriesIndex: params.seriesIndex,
-        dataIndex: params.dataIndex
-      });
+    if (hisSelectIndex === -1) {
+      if (clickSet.selected) {
+        const typeName = configure.name === "chart-pie" ? "select" : "highlight";
+        chart.dispatchAction({
+          type: typeName,
+          seriesIndex: params.seriesIndex,
+          dataIndex: params.dataIndex
+        });
+      }
       highlightInfos.push({
         seriesIndex: params.seriesIndex,
         dataIndex: params.dataIndex
       });
-      const caheDatas = configure.cacheDatas;
-      const groupFields = configure.groupFields;
-      console.log("selsssss", caheDatas, groupFields);
-      if (caheDatas && params.dataIndex < caheDatas.length && groupFields && configure.groupFields.length > 0) {
-        const data = caheDatas[params.dataIndex];
-        selGroupValue = getValueFromSource(data, groupFields[0], void 0);
-      }
     }
     configure.highlightInfos = highlightInfos;
-    setValueForVariableName(pageContext.entity, variable, selGroupValue);
-    console.log("variable params", params);
+    updateClickVariablesForSelected(pageContext, configure);
   });
 }
+function clearChartSelected(pageContext, configure, chart) {
+  if (!chart || !configure || !pageContext) {
+    return;
+  }
+  const highlightInfos = configure.highlightInfos ? configure.highlightInfos : [];
+  for (let i = 0; i < highlightInfos.length; i++) {
+    const info = highlightInfos[i];
+    const typeName = configure.name === "chart-pie" ? "unselect" : "downplay";
+    chart.dispatchAction({
+      type: typeName,
+      seriesIndex: info.seriesIndex,
+      dataIndex: info.dataIndex
+    });
+  }
+  configure.highlightInfos = [];
+  updateClickVariablesForSelected(pageContext, configure);
+}
+function updateClickVariablesForSelected(pageContext, configure) {
+  if (!configure.clickSet) {
+    return;
+  }
+  const clickSet = configure.clickSet;
+  const variables = clickSet.variables;
+  if (!variables || variables.length == 0) {
+    return;
+  }
+  const highlightInfos = configure.highlightInfos ? configure.highlightInfos : [];
+  const caheDatas = configure.cacheDatas ? configure.cacheDatas : [];
+  const selDatas = [];
+  const existIndexs = [];
+  for (const highlightInfo of highlightInfos) {
+    if (existIndexs.includes(highlightInfo.dataIndex)) {
+      continue;
+    }
+    existIndexs.push(highlightInfo.dataIndex);
+    if (highlightInfo.dataIndex < caheDatas.length) {
+      selDatas.push(caheDatas[highlightInfo.dataIndex]);
+    }
+  }
+  for (const v of variables) {
+    if (!v.fieldName || !v.variable) {
+      continue;
+    }
+    const values = [];
+    for (const data of selDatas) {
+      const value = getValueFromSource(data, v.fieldName, void 0);
+      if (value == void 0) {
+        continue;
+      }
+      values.push(value);
+    }
+    if (clickSet.multiple) {
+      setValueForVariableName(pageContext.entity, v.variable, values);
+    } else {
+      setValueForVariableName(
+        pageContext.entity,
+        v.variable,
+        values.length > 0 ? values[0] : void 0
+      );
+    }
+  }
+}
 function sortDatas(pageContext, configure, datas) {
   const itemConfs = configure.items ? configure.items : [];
   const orderByTarget = configure.props ? configure.props.orderByTarget : "";
@@ -410,6 +485,7 @@ function executeChartFormula(formulaStr, accumulateMap, rowData, pageContext) {
 export {
   CommonName,
   caculateFormulaValue,
+  clearChartSelected,
   executeChartFormula,
   getCustomTheme,
   getCustomThemeOptions,
@@ -417,5 +493,6 @@ export {
   initChartOption,
   limitDatas,
   monitorChartClickToVariable,
-  sortDatas
+  sortDatas,
+  updateClickVariablesForSelected
 };

package/dist/es/components/runtime/utils/events/event-util.d.ts

@@ -29,6 +29,14 @@ export declare function getHandleEvent($event: any, pageContext: PageContext, co
 export declare function getTableUuid(pageContext: PageContext, configure: Component): any;
 export declare function handleEventByEventName(pageContext: PageContext, configure: Component, eventName: string, otherParams?: object): any;
 export declare function doBeforeClickEvent(pageContext: PageContext, configure: Component, otherParams?: object): any;
+/**
+ * TODO: 跳转页面功能
+ * 跳转页面功能
+ * @param $event
+ * @param pageContext
+ * @param configure
+ */
+export declare function doClickJumpPageEvent(pageContext: PageContext, configure: Component, eventParams: object): void;
 export declare function doAfterClickEvent(pageContext: PageContext, configure: Component, otherParams?: object): void;
 /**
  * 获得事件Function对象

package/dist/es/components/runtime/utils/events/event-util.js

@@ -127,7 +127,6 @@ function handleEventUtil($event, pageContext, configure, eventType, isExecute, o
     const eventParams = packageEventParams(pageContext, configure, $event, otherParams);
     buttonClickEvent(pageContext, configure, eventParams);
   } else {
-    debugger;
     eventFun = getEventFuncByType(pageContext, events, eventType);
     if (isExecute) {
       const eventParams = packageEventParams(pageContext, configure, $event, otherParams);
@@ -619,6 +618,7 @@ export {
   cellDblClick,
   doAfterClickEvent,
   doBeforeClickEvent,
+  doClickJumpPageEvent,
   fileUploadBeforeUpload,
   getClickEventFuncByType,
   getCustomFunc,

package/dist/es/components/runtime/utils/events/standard-event.js

@@ -1,4 +1,4 @@
-import { getBaseUrl, getRealRestApiPath, upperFirstCase, packageTemplateFiles, isArrayFn } from "../common-util.js";
+import { getBaseUrl, getRealRestApiPath, upperFirstCase, packageTemplateFiles, deepCopy, isArrayFn } from "../common-util.js";
 import http from "agilebuilder-ui/src/utils/request";
 import { getI18n } from "agilebuilder-ui/src/utils/util";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -275,7 +275,9 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
   const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
   let exportResult;
-  {
+  if (isPdf) {
+    exportResult = exportFormPdf(fileName, backendUrl, param);
+  } else {
     exportResult = exportFormReportSuccess(fileName, backendUrl, param);
   }
   if (exportResult) {
@@ -316,6 +318,34 @@ function exportFormReportSuccess(fileName, backendUrl, param) {
     });
   });
 }
+function exportFormPdf(fileName, backendUrl, param) {
+  return new Promise((resolve, reject) => {
+    const baseUrl = getBaseUrl(backendUrl);
+    const path = baseUrl + "/dsc/commons/export-pdf";
+    axios.defaults.headers.common.Authorization = getToken();
+    const request = axios.post(path, param, {
+      headers: {
+        "content-type": "application/x-www-form-urlencoded"
+      },
+      responseType: "blob"
+    });
+    request.then((response) => {
+      const blob = new Blob([response.data]);
+      const elink = document.createElement("a");
+      elink.download = fileName.substring(0, fileName.lastIndexOf(".")) + ".pdf";
+      elink.style.display = "none";
+      elink.target = "_blank";
+      elink.href = URL.createObjectURL(blob);
+      document.body.appendChild(elink);
+      elink.click();
+      URL.revokeObjectURL(elink.href);
+      document.body.removeChild(elink);
+      resolve(true);
+    }).catch((error) => {
+      reject(error);
+    });
+  });
+}
 function saveFunc(params, isListButton) {
   return new Promise((resolve, reject) => {
     const pageContext = params.pageContext;
@@ -1287,7 +1317,7 @@ function getTransactTaskParam(params) {
 }
 function getAdditionalParamMap(pageContext) {
   if (pageContext.entity) {
-    let additionalParamMap = pageContext.entity.page;
+    let additionalParamMap = deepCopy(pageContext.entity.page);
     if (!additionalParamMap) {
       additionalParamMap = {};
     }

package/dist/es/components/runtime/utils/events/validator-util.js

@@ -74,10 +74,25 @@ function getEndObjectRule(rule, props, currentProp) {
 }
 function getValidator(columns) {
   const rules = {};
+  if (columns) {
+    columns.forEach((editField) => {
+      const prop = editField.model;
+      if (prop && editField.validations) {
+        const validations = editField.validations;
+        if (prop.indexOf(".") > 0) {
+          setObjectPropRule(editField.prop, rules, validations);
+        } else {
+          if (validations && validations.length > 0) {
+            rules[prop] = [...validations];
+          }
+        }
+      }
+    });
+  }
   return rules;
 }
 function validator(entity, rules, columns, rowIndex, isSql) {
-  return validatorEntity(entity, rules, columns, rowIndex, true);
+  return validatorEntity(entity, rules, columns, rowIndex, true, isSql);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -103,7 +118,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator();
+    validateRules = getValidator(columns);
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -121,6 +136,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       if (errors) {
         result = errors[0].message;
         fieldName = errors[0]["field"];
+        if (typeof rowIndex !== "undefined" && rowIndex !== null) {
+          result = getI18n().t("superPageRuntimeMessage.recordLine", {
+            row: rowIndex + 1
+          }) + "，" + result;
+        }
         ElMessage({
           message: result,
           showClose: true,
@@ -133,11 +153,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (isSql !== void 0 && isSql === true && reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
           const copyEntity = JSON.parse(JSON.stringify(entity));
           copyEntity[fieldName.toUpperCase()] = entity[fieldName.toLowerCase()];
           delete copyEntity[fieldName.toLowerCase()];
-          result = validatorEntity(copyEntity, rules, columns, rowIndex, false);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false, isSql);
         }
       }
     }
@@ -185,7 +205,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     if (!rules || Object.keys(rules).length === 0) {
       result = true;
     } else {
-      result = validator(handleModels, rules, null, null);
+      result = validator(handleModels, rules, null, null, true);
     }
     if (result === true) {
       const workflowFieldPermissionRules = pageContext.workflowRules;
@@ -249,7 +269,7 @@ function validateCommonFormDataModel(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(handleModels);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null);
+      const validateEntityResult = validator(handleModels, rules, null, null, true);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {

package/dist/es/components/runtime/utils/page-helper-util.js

@@ -77,7 +77,8 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue) ;
+      if (f.propValue)
+        ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;
@@ -355,6 +356,13 @@ function setVariableValue(entity, fields, newValue) {
     }
   }
 }
+function setVariableValueWithProp(entity, prop, newValue) {
+  if (!entity || !prop) {
+    return;
+  }
+  const fields = prop.split(".");
+  setVariableValue(entity, fields, newValue);
+}
 function formatVariableValue(pageContext2, variable) {
   if (!pageContext2 || variable == "" || variable == null || variable == void 0) {
     return variable;
@@ -664,6 +672,7 @@ export {
   queryOptions,
   setValueForVariableName,
   setVariableValue,
+  setVariableValueWithProp,
   updateChartDatasources,
   updateOptionDatasources
 };

package/dist/es/components/runtime/utils/page-init-util.js

@@ -109,7 +109,8 @@ function getRequestObject(pageRequest) {
       Object.assign(requestObj, route.query);
     }
   }
-  if (requestObj["_t_"]) ;
+  if (requestObj["_t_"])
+    ;
   return requestObj;
 }
 function getModelFields(pageContext, formItemConfigure, prop) {
@@ -169,7 +170,7 @@ function getFormModelFields(pageContext, formItemConfigure, prop) {
   return fields;
 }
 function getPermissionCodes(configure, pageContext) {
-  if (!pageContext || !configure) {
+  if (!pageContext || !configure || pageContext.isTest) {
     return "true";
   }
   const codes = [];
@@ -238,10 +239,12 @@ function packageFormRules(pageContext, configure) {
     if (!pageContext.rules) {
       pageContext.rules = {};
     }
-    if (!pageContext.rules[propName]) {
-      pageContext.rules[propName] = [];
+    if (configure.props.rules && configure.props.rules.length > 0) {
+      if (!pageContext.rules[propName]) {
+        pageContext.rules[propName] = [];
+      }
+      pageContext.rules[propName] = configure.props.rules;
     }
-    pageContext.rules[propName] = configure.props.rules;
     if (configure.name !== "button-detail" && pageContext.fieldPermissionMap) {
       const propEditPermission = pageContext.fieldPermissionMap.get(propName);
       if (propEditPermission) {

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

@@ -1,7 +1,8 @@
 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 { getCustomTheme, initChartOption, monitorChartClickToVariable, clearChartSelected } from "../../../../utils/charts/chart-util.js";
 import { getChartDatasFromPage, updateChartDatasources, monitorFieldChange } from "../../../../utils/page-helper-util.js";
 import { updateChartOption } from "../../../../utils/charts/chart-columnline-util.js";
+import { doClickJumpPageEvent } from "../../../../utils/events/event-util.js";
 import _sfc_main$1 from "../common/common-chart-header.vue.js";
 import { use } from "echarts/core";
 import { CanvasRenderer } from "echarts/renderers";
@@ -32,7 +33,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     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 linkPage = props.configure.props ? props.configure.props.linkPage : null;
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
@@ -47,20 +48,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (resultData) {
         updateChartDatas(resultData);
       }
-      if (enableDrill && chartRef.value) {
+      if (chartRef.value && (enableDrill || linkPage && linkPage.jumpPageUrl)) {
         chartRef.value.chart.on("click", function(params) {
-          if (headerRef.value && headerRef.value.drill) {
-            headerRef.value.drill(params, props.configure.cacheDatas);
+          if (enableDrill) {
+            if (headerRef.value && headerRef.value.drill) {
+              headerRef.value.drill(params, props.configure.cacheDatas);
+            }
+          } else {
+            clickToLink();
           }
         });
       }
-      if (!enableDrill && selGroupVariable && chartRef.value) {
-        monitorChartClickToVariable(
-          props.pageContext,
-          props.configure,
-          chartRef.value.chart,
-          selGroupVariable
-        );
+      if (!enableDrill && props.configure.clickSet && chartRef.value) {
+        monitorChartClickToVariable(props.pageContext, props.configure, chartRef.value.chart);
       }
     });
     function onDrillEnd(params) {
@@ -68,8 +68,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (headerRef.value && headerRef.value.closeDrill) {
           headerRef.value.closeDrill(0);
         }
+      } else if (drillEndTrigger === "clickEvent") {
+        clickToLink();
       }
     }
+    function clickToLink() {
+      if (!linkPage || !linkPage.jumpPageUrl) {
+        return;
+      }
+      doClickJumpPageEvent(props.pageContext, props.configure, void 0);
+    }
     let hisGroupValue = headerInfo.groupValue;
     watch(headerInfo, () => {
       if (hisGroupValue == headerInfo.groupValue) {
@@ -84,6 +92,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       dataConfig.services[0].groupValue = headerInfo.groupValue;
+      dataConfig.isRefresh = true;
       updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
     }
     const monitorFields = headerInfo.monitorFields;
@@ -102,8 +111,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       resultData.hasRender = true;
+      if (!dataConfig.isRefresh) {
+        hisGroupValue = resultData.groupValue;
+        if (hisGroupValue && headerInfo.groupComponent !== "checkbox") {
+          hisGroupValue = hisGroupValue.join(",");
+        }
+        headerInfo.groupValue = hisGroupValue;
+      }
+      if (!dataConfig.isRefresh || !enableDrill) {
+        clearChartSelected(props.pageContext, props.configure, chartRef.value.chart);
+      }
+      dataConfig.isRefresh = false;
       updateChartOption(props.pageContext, props.configure, chartOption, resultData);
-      console.log("chartOption", chartOption);
     }
     __expose({
       updateChartDatas
@@ -119,8 +138,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref_key: "headerRef",
           ref: headerRef,
           headerInfo: unref(headerInfo),
+          configure: _ctx.configure,
+          pageContext: _ctx.pageContext,
           onDrillEnd
-        }, null, 8, ["headerInfo"]), [
+        }, null, 8, ["headerInfo", "configure", "pageContext"]), [
           [vShow, unref(headerInfo).showHeader]
         ]),
         createVNode(unref(VChart), {

package/dist/es/components/runtime/views/assemblys/chart/common/common-chart-header.vue.js

@@ -1,6 +1,7 @@
 import { defineComponent, ref, openBlock, createElementBlock, createElementVNode, withDirectives, normalizeStyle, toDisplayString, vShow, createBlock, createCommentVNode } from "vue";
 import _sfc_main$2 from "./common-chart-header-group.vue.js";
 import _sfc_main$1 from "./common-chart-header-breadcrumb.vue.js";
+import { setVariableValueWithProp, getValueFromSource, setValueForVariableName } from "../../../../utils/page-helper-util.js";
 const _hoisted_1 = { class: "amb-widget-chart-header" };
 const _hoisted_2 = { class: "amb-widget-chart-header-item" };
 const _hoisted_3 = { class: "amb-widget-chart-header-item amb-widget-chart-header-center" };
@@ -11,6 +12,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     headerInfo: {
       type: Object,
       required: true
+    },
+    configure: {
+      type: Object,
+      required: true
+    },
+    pageContext: {
+      type: Object,
+      required: true
     }
   },
   emits: ["drill-end"],
@@ -35,16 +44,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function drill(params, datas) {
       const currentIndex = props.headerInfo.drillOptions.length;
       if (currentIndex + 1 >= props.headerInfo.options.length) {
+        const data2 = datas && params.dataIndex < datas.length ? datas[params.dataIndex] : void 0;
+        updateClickVariables(data2);
         console.log("钻取到最底层了！");
         $emits("drill-end", params);
         return;
       }
       console.log("props.headerInfo.options", currentIndex, props.headerInfo.options);
       const targetGroup = props.headerInfo.options[currentIndex];
+      const data = datas && params.dataIndex < datas.length ? datas[params.dataIndex] : null;
       const drillOption = {
         fieldName: targetGroup.target ? targetGroup.target.replace(".", "_") : "",
+        rawFieldName: targetGroup.target ? targetGroup.target : "",
         label: params.name,
-        value: params.name
+        value: params.name,
+        data
       };
       props.headerInfo.drillOptions.push(drillOption);
       toDrillLevel(currentIndex + 1);
@@ -58,6 +72,39 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       props.headerInfo.drillParams = drillParams;
       props.headerInfo.groupValue = props.headerInfo.options[drillIndex].value;
+      updateClickVariables();
+    }
+    function updateClickVariables(endData) {
+      const clickSet = props.configure.clickSet;
+      if (!clickSet || !clickSet.variables || clickSet.variables.length === 0) {
+        return;
+      }
+      const data = {};
+      if (endData) {
+        Object.assign(data, endData);
+      }
+      const drillOptions = props.headerInfo.drillOptions;
+      if (drillOptions.length > 0) {
+        if (!endData) {
+          const endOption = drillOptions[drillOptions.length - 1];
+          if (endOption.data) {
+            Object.assign(data, endOption.data);
+          }
+        }
+        for (let o of drillOptions) {
+          if (!o.rawFieldName) {
+            continue;
+          }
+          setVariableValueWithProp(data, o.rawFieldName, o.value);
+        }
+      }
+      for (let v of clickSet.variables) {
+        if (!v.fieldName || !v.variable) {
+          continue;
+        }
+        const value = getValueFromSource(data, v.fieldName, void 0);
+        setValueForVariableName(props.pageContext.entity, v.variable, value);
+      }
     }
     __expose({
       drill,

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

@@ -1,6 +1,7 @@
 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 { getCustomTheme, initChartOption, monitorChartClickToVariable, clearChartSelected } from "../../../../utils/charts/chart-util.js";
 import { updateChartOption } from "../../../../utils/charts/chart-pie-util.js";
+import { doClickJumpPageEvent } from "../../../../utils/events/event-util.js";
 import { getChartDatasFromPage, updateChartDatasources, monitorFieldChange } from "../../../../utils/page-helper-util.js";
 import _sfc_main$1 from "../common/common-chart-header.vue.js";
 import { use } from "echarts/core";
@@ -30,7 +31,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     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 linkPage = props.configure.props ? props.configure.props.linkPage : null;
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
@@ -45,20 +46,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (resultData) {
         updateChartDatas(resultData);
       }
-      if (enableDrill && chartRef.value) {
+      if (chartRef.value && (enableDrill || linkPage && linkPage.jumpPageUrl)) {
         chartRef.value.chart.on("click", function(params) {
-          if (headerRef.value && headerRef.value.drill) {
-            headerRef.value.drill(params, props.configure.cacheDatas);
+          if (enableDrill) {
+            if (headerRef.value && headerRef.value.drill) {
+              headerRef.value.drill(params, props.configure.cacheDatas);
+            }
+          } else {
+            clickToLink();
           }
         });
       }
-      if (!enableDrill && selGroupVariable && chartRef.value) {
-        monitorChartClickToVariable(
-          props.pageContext,
-          props.configure,
-          chartRef.value.chart,
-          selGroupVariable
-        );
+      if (!enableDrill && props.configure.clickSet && chartRef.value) {
+        monitorChartClickToVariable(props.pageContext, props.configure, chartRef.value.chart);
       }
     });
     function onDrillEnd(params) {
@@ -66,8 +66,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (headerRef.value && headerRef.value.closeDrill) {
           headerRef.value.closeDrill(0);
         }
+      } else if (drillEndTrigger == "clickEvent") {
+        clickToLink();
       }
     }
+    function clickToLink() {
+      if (!linkPage || !linkPage.jumpPageUrl) {
+        return;
+      }
+      doClickJumpPageEvent(props.pageContext, props.configure, void 0);
+    }
     let hisGroupValue = headerInfo.groupValue;
     watch(headerInfo, () => {
       if (hisGroupValue == headerInfo.groupValue) {
@@ -82,6 +90,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       dataConfig.services[0].groupValue = headerInfo.groupValue;
+      dataConfig.isRefresh = true;
       updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
     }
     const monitorFields = headerInfo.monitorFields;
@@ -100,9 +109,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       resultData.hasRender = true;
-      console.log("pie resultData", resultData);
+      if (!dataConfig.isRefresh) {
+        hisGroupValue = resultData.groupValue;
+        if (hisGroupValue && headerInfo.groupComponent !== "checkbox") {
+          hisGroupValue = hisGroupValue.join(",");
+        }
+        headerInfo.groupValue = hisGroupValue;
+      }
+      if (!dataConfig.isRefresh || !enableDrill) {
+        clearChartSelected(props.pageContext, props.configure, chartRef.value.chart);
+      }
+      dataConfig.isRefresh = false;
       updateChartOption(props.pageContext, props.configure, chartOption, resultData);
-      console.log("chartOption", chartOption);
+      console.log("chartOption--pie", chartOption);
     }
     __expose({
       updateChartDatas

package/dist/es/components/runtime/views/super-page.vue.js

@@ -307,10 +307,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       buttonParams.value = null;
     }
     function doExportFormReport(templateFile) {
+      const isPdf = false;
       exportFormReport(
         buttonParams.value.pageContext,
         buttonParams.value.configureObj,
-        templateFile
+        templateFile,
+        isPdf
       );
     }
     const _selectFile_ = ref(null);
@@ -322,7 +324,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!_selectFile_.value) {
           return;
         }
-        if (_selectFile_.value.value === "" || _selectFile_.value.value === null) return;
+        if (_selectFile_.value.value === "" || _selectFile_.value.value === null)
+          return;
         const fileObj = _selectFile_.value.files[0];
         if (fileObj) {
           _selectFile_.value.value = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.43-beta7",
+  "version": "2.0.44",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.0.28",
+    "agilebuilder-ui": "1.0.34",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",