super-page-runtime 2.3.4 → 2.3.5-rc1

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

@@ -44,5 +44,5 @@ export declare function getPermissionCodes(configure: Component, pageContext: Pa
  * @returns
  */
 export declare function queryPageSuperGrids(pageDesign: any, pageContext: any, publishVersion: any): Promise<any>;
-export declare function packageFormRules(pageContext: PageContext, configure: any): void;
+export declare function packageFormRules(pageContext: PageContext, configure: any, isHasPermission: boolean): void;
 export declare function controlObjectRenderState(pageContext: PageContext, propName: string): void;

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

@@ -6,14 +6,14 @@ import { getSessionCache as l } from "agilebuilder-ui/src/utils/auth";
 import { functions as a } from "./api/page-expose-util.js";
 import { isWorkflowPage as p, deepCopy as u } from "./common-util.js";
 import { packageCustomValidator as d } from "./events/validator-util.js";
-import { isMobileBrowser as c } from "agilebuilder-ui/src/utils/common-util";
+import { isMobileBrowser as f } from "agilebuilder-ui/src/utils/common-util";
 function m(t2) {
   return e.get(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + t2);
 }
-function f(e2) {
+function c(e2) {
   var _a, _b, _c;
   if (null == e2) return null;
-  const t2 = { uuid: e2.uuid, name: e2.name, label: e2.label, code: e2.code, version: e2.version, dimensions: e2.dimensions, systemCode: e2.systemCode, systemVersion: e2.systemVersion, backendUrl: e2.backendUrl, rules: {}, tableUuids: e2.tableUuids, listCodesMap: e2.listCodesMap, formNoRuleCode: e2.props ? e2.props.formNoRuleCode : null, judgeHeavyList: g(e2), pageType: e2.pageType, beanName: e2.props ? e2.props.beanName : null, importBeanName: e2.props ? e2.props.importBeanName : null, subTablePageInfo: e2.subTablePageInfo, workflowCode: e2.workflowCode, workflowVersion: e2.workflowVersion, refercePropMap: (_a = e2.runtime) == null ? void 0 : _a.refercePropMap, subTableWatchProps: e2.subTableWatchProps, dataTypeMaps: e2.dataTypeMaps, isWorkflowEntity: void 0 !== ((_b = e2.props) == null ? void 0 : _b.activeWorkflow) ? (_c = e2.props) == null ? void 0 : _c.activeWorkflow : e2.isWorkflowEntity, allChartUuids: e2.allChartUuids, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam } };
+  const t2 = { uuid: e2.uuid, name: e2.name, label: e2.label, code: e2.code, version: e2.version, dimensions: e2.dimensions, systemCode: e2.systemCode, systemVersion: e2.systemVersion, backendUrl: e2.backendUrl, rules: {}, tableUuids: e2.tableUuids, listCodesMap: e2.listCodesMap, formNoRuleCode: e2.props ? e2.props.formNoRuleCode : null, judgeHeavyList: g(e2), pageType: e2.pageType, beanName: e2.props ? e2.props.beanName : null, importBeanName: e2.props ? e2.props.importBeanName : null, subTablePageInfo: e2.subTablePageInfo, workflowCode: e2.workflowCode, workflowVersion: e2.workflowVersion, refercePropMap: (_a = e2.runtime) == null ? void 0 : _a.refercePropMap, subTableWatchProps: e2.subTableWatchProps, dataTypeMaps: e2.dataTypeMaps, isWorkflowEntity: void 0 !== ((_b = e2.props) == null ? void 0 : _b.activeWorkflow) ? (_c = e2.props) == null ? void 0 : _c.activeWorkflow : e2.isWorkflowEntity, allChartUuids: e2.allChartUuids, branchFieldAuth: e2.branchFieldAuth, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam } };
   if (e2.props && e2.props.notIdInitializationList) {
     let s2 = e2.props.notIdInitializationList;
     "string" == typeof s2 && (s2 = JSON.parse(s2)), s2.length > 0 && (t2.notIdInitializationList = s2);
@@ -23,7 +23,7 @@ function f(e2) {
     for (const t3 of e2.variables) t3.name && (t3.isArrayElement ? s2[t3.name] = [] : t3.defaultValue ? s2[t3.name] = t3.defaultValue : s2[t3.name] = void 0);
   }
   return function(e3) {
-    if (c()) {
+    if (f()) {
       e3.entity.page._isMobile = "true";
       const t3 = navigator ? navigator.userAgent : null;
       t3 ? t3.indexOf(" uni-app ") > 0 ? (e3.entity.page._isMobileApp = "true", e3.entity.page._isMobileBrowser = "false") : (e3.entity.page._isMobileApp = "false", e3.entity.page._isMobileBrowser = "true") : (e3.entity.page._isMobileApp = "false", e3.entity.page._isMobileBrowser = "false");
@@ -57,25 +57,22 @@ function b(e2) {
 }
 function y(e2, t2) {
   if (e2) {
-    console.log("packageAdditionalMapWithPageRequest----pageRequest=", e2), Object.assign(t2, e2);
-    v(e2.paramStoreId, t2), delete e2.paramStoreId, console.log("packageAdditionalMapWithPageRequest----requestObj=", t2), e2.jumpMode && (t2.jumpMode = e2.jumpMode);
+    Object.assign(t2, e2);
+    w(e2.paramStoreId, t2), delete e2.paramStoreId, e2.jumpMode && (t2.jumpMode = e2.jumpMode);
   }
 }
 function h(e2, t2) {
-  if (console.log("packageAdditionalMapWithRoute----route=", e2), e2) {
-    if (e2.params && Object.assign(t2, e2.params), console.log("packageAdditionalMapWithRoute----route.query=", e2.query), e2.query) {
-      Object.assign(t2, e2.query);
-      v(e2.query.paramStoreId, t2);
-    }
-    console.log("packageAdditionalMapWithRoute----requestObj=", t2);
+  if (e2 && (e2.params && Object.assign(t2, e2.params), e2.query, e2.query)) {
+    Object.assign(t2, e2.query);
+    w(e2.query.paramStoreId, t2);
   }
 }
-function v(e2, t2) {
+function w(e2, t2) {
   if (e2) {
     const s2 = l(e2);
     if (s2) {
       const e3 = JSON.parse(s2);
-      Object.assign(t2, e3), console.log("已获取到附加参数", e3);
+      Object.assign(t2, e3);
     }
   }
 }
@@ -85,7 +82,7 @@ function E(e2, t2) {
   let o2 = null;
   return t2 && !t2.startsWith("${") ? o2 = ["data", t2] : !e2 || i2 && i2.startsWith("${") ? i2.startsWith("${") ? (i2 = i2.substring(2, i2.length - 1), o2 = i2.split("."), e2 && o2.length < 2 && (o2 = [e2.uuid])) : e2 && (o2 = ["page", e2.uuid]) : o2 = ["page", e2.uuid], o2 || e2 ? o2 : ["temp"];
 }
-function M(e2, t2, s2) {
+function v(e2, t2, s2) {
   const i2 = E(t2, s2), r2 = e2.entity;
   if (null == r2.data.ID && null == r2.data.id) {
     let s3, l2, a2 = false;
@@ -94,14 +91,14 @@ function M(e2, t2, s2) {
     if (null == p2) {
       const t3 = s3 ? s3.defaultValue : null;
       if (t3) {
-        const s4 = w(e2, t3, l2, a2);
+        const s4 = P(e2, t3, l2, a2);
         null != s4 && n(r2, i2, s4);
       }
     }
   }
   return i2;
 }
-function w(e2, t2, s2, i2) {
+function P(e2, t2, s2, i2) {
   let o2;
   if (t2 && (o2 = r(e2, t2), null != o2 && null != o2 && s2)) {
     let e3 = false;
@@ -109,7 +106,7 @@ function w(e2, t2, s2, i2) {
   }
   return o2;
 }
-function P(e2, t2) {
+function M(e2, t2) {
   const s2 = [];
   if (e2.autoPermissions) for (const i2 of e2.autoPermissions) s2.push(t2.code + "." + i2.simpleCode);
   if (e2.functionCodes) {
@@ -120,47 +117,58 @@ function P(e2, t2) {
       if ("service" == r2) l2 = n2;
       else if ("standard" === r2) l2 = t2.code + "." + n2;
       else {
-        l2 = "custom" === j(n2, t2).type ? n2 : t2.code + "." + n2;
+        l2 = "custom" === k(n2, t2).type ? n2 : t2.code + "." + n2;
       }
       s2.includes(l2) || s2.push(l2);
     }
   }
   return s2.join(",");
 }
-function j(e2, t2) {
+function k(e2, t2) {
   const s2 = t2.pagePermissions;
   if (s2 && s2.length > 0) {
     for (let t3 = 0; t3 < s2.length; t3++) if (s2[t3].simpleCode === e2) return s2[t3];
   }
   return null;
 }
-function C(s2, i2, o2) {
+function j(s2, i2, o2) {
   const n2 = s2.tableRuntimes, r2 = t(i2);
   let l2;
   const a2 = i2.code;
   return r2 && Object.keys(r2) > 0 && (l2 = JSON.stringify(r2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: n2, additionalParamMapJson: l2, pageCode: a2, publishVersion: o2, pageType: s2.pageType });
 }
-const I = ["button-detail", "print-label"];
-function O(e2, t2) {
+const C = ["button-detail", "print-label"];
+function I(e2, t2, s2) {
   var _a, _b;
-  const s2 = t2.props && t2.props.base ? t2.props.base.prop : null, o2 = p(e2);
-  let n2 = false;
-  if (o2 && I.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
+  const o2 = t2.props && t2.props.base ? t2.props.base.prop : null, n2 = p(e2);
+  let r2 = false;
+  if (n2 && C.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
     const s3 = e2.fieldPermissionMap.get("all_fields");
-    false === (s3 == null ? void 0 : s3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", n2 = true);
+    false === (s3 == null ? void 0 : s3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", r2 = true);
   }
-  if (s2) {
-    const r2 = i(s2);
-    if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[r2] || (e2.rules[r2] = []), t2.props.rules.forEach((e3) => {
-      d(e3);
-    }), e2.rules[r2] = t2.props.rules), o2 && !n2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
-      const s3 = e2.fieldPermissionMap.get(r2);
-      t2.runtime.props || (t2.runtime.props = {}), s3 ? false === s3.canEdit ? t2.runtime.props.state = "disabled" : s3.canEdit && (t2.runtime.props.state = "", t2.runtime.props.required = true) : t2.runtime.props.state = "";
+  if (o2) {
+    const l2 = i(o2);
+    if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[l2] || (e2.rules[l2] = []), t2.props.rules.forEach((e3) => {
+      d(e3), !s2 && e3 && e3.required && (e3.required = false);
+    }), e2.rules[l2] = t2.props.rules), n2 && !r2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
+      const i2 = e2.fieldPermissionMap.get(l2);
+      if (!s2 && e2.workflowRules && (e2.workflowRules[l2] || e2.workflowRules.rules && e2.workflowRules.rules[l2])) {
+        let t3 = e2.workflowRules[l2];
+        if (!t3 && e2.workflowRules.rules && (t3 = e2.workflowRules.rules[l2]), t3 && Array.isArray(t3) && t3.length > 0) for (let e3 = 0; e3 < t3.length; e3++) {
+          const s3 = t3[e3];
+          if (s3 && s3.required) {
+            s3.required = false;
+            break;
+          }
+        }
+        else t3 && t3.required && (t3.required = false);
+      }
+      t2.runtime.props || (t2.runtime.props = {}), i2 ? (!s2 && i2.canEdit && (i2.canEdit = false), false === i2.canEdit ? t2.runtime.props.state = "disabled" : i2.canEdit && (t2.runtime.props.state = "", t2.runtime.props.required = true)) : t2.runtime.props.state = "";
     }
-    ((_b = t2.props) == null ? void 0 : _b.customRuleEvents) && (e2.customRuleEvents || (e2.customRuleEvents = []), e2.customRuleEvents.push({ prop: r2, events: t2.props.customRuleEvents }));
+    ((_b = t2.props) == null ? void 0 : _b.customRuleEvents) && (e2.customRuleEvents || (e2.customRuleEvents = []), e2.customRuleEvents.push({ prop: l2, events: t2.props.customRuleEvents }));
   }
 }
-function k(e2, t2) {
+function O(e2, t2) {
   if (e2.initInfo) {
     ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"].forEach((s2) => {
       const i2 = e2.initInfo[s2];
@@ -176,16 +184,16 @@ function k(e2, t2) {
   }
 }
 export {
-  k as controlObjectRenderState,
-  f as convertToPageContext,
-  w as getDefaultValue,
-  M as getFormModelFields,
+  O as controlObjectRenderState,
+  c as convertToPageContext,
+  P as getDefaultValue,
+  v as getFormModelFields,
   E as getModelFields,
-  P as getPermissionCodes,
+  M as getPermissionCodes,
   b as packageAdditionalMapWithLocationSearch,
   y as packageAdditionalMapWithPageRequest,
   h as packageAdditionalMapWithRoute,
-  O as packageFormRules,
+  I as packageFormRules,
   m as queryPageDesignByCode,
-  C as queryPageSuperGrids
+  j as queryPageSuperGrids
 };

package/dist/es/components/runtime/utils/page-store.js

@@ -1,18 +1,18 @@
 import { ref as e } from "vue";
-import { defineStore as o } from "pinia";
-import a from "./eventBus.js";
-const t = o("pageContextUtil", () => {
-  const o2 = e({ systemCode: "", systemVersion: -1 }), t2 = e(false), n = e(false), u = e(false), l = e(0), d = e(0);
-  return { pageContext: o2, setPageContext: function(e2) {
-    o2.value = e2;
+import { defineStore as a } from "pinia";
+import o from "./eventBus.js";
+const t = a("pageContextUtil", () => {
+  const a2 = e({ systemCode: "", systemVersion: -1 }), t2 = e(false), n = e(false), u = e(false), l = e(0), v = e(0);
+  return { pageContext: a2, setPageContext: function(e2) {
+    a2.value = e2;
   }, countComponentsTotalNmber: function() {
     l.value++, t2.value = false, u.value = false;
   }, countComponentsLoadedNumber: function() {
-    d.value++, u.value = false;
-  }, componentsTotalNmber: l, componentsLoadedNumber: d, setPageComponentsLoaded: function(e2) {
-    t2.value = e2, t2.value && n.value && (a.$emit("pageLoaded"), u.value = true);
+    v.value++, u.value = false;
+  }, componentsTotalNmber: l, componentsLoadedNumber: v, setPageComponentsLoaded: function(e2) {
+    t2.value = e2, t2.value && n.value && (o.$emit("pageLoaded"), u.value = true);
   }, setFormPageDataLoadState: function(e2) {
-    n.value = e2, t2.value && n.value && (console.log("setpageLoaded+++++++++++++++++++", t2.value, n.value), u.value = true);
+    n.value = e2, t2.value && n.value && (t2.value, n.value, u.value = true);
   }, formPageDataLoaded: n, pageComponentsLoaded: t2, restorePageLoadState: function() {
     t2.value = false, n.value = false, u.value = false;
   }, pageLoaded: u, getPageLoaded: function() {

package/dist/es/components/runtime/utils/table-utils.d.ts

@@ -18,3 +18,17 @@ export declare function getDistanceToAppContainer(tableDivRef: any): {
     distanceToTop: number;
     distanceToBottom: number;
 };
+/**
+ * 是否有字段的权限
+ * @param pageContext
+ * @param fieldName
+ * @returns
+ */
+export declare function isHasFieldAuth(pageContext: any, configure: any): boolean;
+/**
+ * 是否有字段的权限
+ * @param pageContext
+ * @param fieldName
+ * @returns
+ */
+export declare function isHasFieldPermissionAuth(pageContext: any, tableName: any, fieldName: any): boolean;

package/dist/es/components/runtime/utils/table-utils.js

@@ -1,55 +1,80 @@
 import "agilebuilder-ui/src/utils/common-util";
 import "agilebuilder-ui/src/utils/util";
+import { ExpressionEvaluator as t } from "../views/assemblys/chart/table/chart-table-util.js";
+import { getCustomFunc as e } from "./events/event-util.js";
 import "agilebuilder-ui/src/utils/request";
-import e from "./eventBus.js";
-import { getPermissionCodes as t } from "./page-init-util.js";
-import { getCustomFunc as o } from "./events/event-util.js";
-import { $t as i } from "./i18n-util.js";
-import { ExpressionEvaluator as s } from "../views/assemblys/chart/table/chart-table-util.js";
-function n(t2) {
-  const o2 = t2.pageContext && t2.pageContext.code;
-  console.log("弹框显示页面--popupToPage====params=", t2), e.$emit(o2 + "_open-dialog", t2);
+import i from "./eventBus.js";
+import { getPermissionCodes as o } from "./page-init-util.js";
+import { $t as n } from "./i18n-util.js";
+import { getFormPropName as s } from "./page-helper-util.js";
+function r(t2) {
+  const e2 = t2.pageContext && t2.pageContext.code;
+  i.$emit(e2 + "_open-dialog", t2);
 }
-function r(e2, t2) {
-  const o2 = e2.tableName;
-  if (!t2 && o2) return o2;
-  let i2;
-  return e2.tableRuntimes && t2 && e2.tableRuntimes[t2] && (i2 = JSON.parse(e2.tableRuntimes[t2].configure)), i2 && i2.props && i2.props.dataOrigin ? i2.props.dataOrigin.tableName : null;
+function u(t2, e2) {
+  const i2 = t2.tableName;
+  if (!e2 && i2) return i2;
+  let o2;
+  return t2.tableRuntimes && e2 && t2.tableRuntimes[e2] && (o2 = JSON.parse(t2.tableRuntimes[e2].configure)), o2 && o2.props && o2.props.dataOrigin ? o2.props.dataOrigin.tableName : null;
 }
-function u(e2, o2, s2, n2) {
-  const r2 = !(!o2.props || !o2.props.base) && o2.props.base.showOperation, u2 = o2.btnList;
-  console.log("configure.btnList===", o2.btnList, "configure====", o2), r2 && u2 && u2.forEach((o3) => {
-    const r3 = {}, u3 = Object.assign({}, o3.props.base);
-    if ("custom" === o3.name ? u3.customControl = u3.name : u3.elementType = "el-button", void 0 === o3.isPermission || o3.isPermission + "" == "true") {
-      const i2 = t(o3, e2);
-      i2 && (u3.permission = i2);
+function l(t2, e2, i2, s2) {
+  const r2 = !(!e2.props || !e2.props.base) && e2.props.base.showOperation, u2 = e2.btnList;
+  e2.btnList, r2 && u2 && u2.forEach((e3) => {
+    const r3 = {}, u3 = Object.assign({}, e3.props.base);
+    if ("custom" === e3.name ? u3.customControl = u3.name : u3.elementType = "el-button", void 0 === e3.isPermission || e3.isPermission + "" == "true") {
+      const i3 = o(e3, t2);
+      i3 && (u3.permission = i3);
     }
-    if (u3.label = i(u3.title), u3.sourceButton = { uuid: o3.uuid }, r3.props = u3, void 0 !== n2) {
-      const e3 = n2(o3);
-      r3.onClick = (e3 == null ? void 0 : e3.onClick) ?? e3, r3.eventName = e3 == null ? void 0 : e3.eventName;
+    if (u3.label = n(u3.title), u3.sourceButton = { uuid: e3.uuid }, r3.props = u3, void 0 !== s2) {
+      const t3 = s2(e3);
+      r3.onClick = (t3 == null ? void 0 : t3.onClick) ?? t3, r3.eventName = t3 == null ? void 0 : t3.eventName;
     }
-    s2.push(r3);
+    i2.push(r3);
   });
 }
-function l(e2, t2, i2, n2) {
+function p(i2, o2, n2, s2) {
   let r2;
-  const u2 = i2 == null ? void 0 : i2.some((i3) => {
+  const u2 = n2 == null ? void 0 : n2.some((n3) => {
     let u3 = false;
-    if (i3.scopeFunc) {
-      const s2 = o(e2, i3.scopeFunc);
-      if (s2) {
-        s2.apply(s2, [{ pageContext: e2, configureObj: t2, row: n2 }]) && (u3 = true);
+    if (n3.scopeFunc) {
+      const t2 = e(i2, n3.scopeFunc);
+      if (t2) {
+        t2.apply(t2, [{ pageContext: i2, configureObj: o2, row: s2 }]) && (u3 = true);
       }
-    } else if (i3.showCondition && i3.showCondition.length > 0) {
-      s.evaluate(e2, i3.showCondition, n2) && (u3 = true);
+    } else if (n3.showCondition && n3.showCondition.length > 0) {
+      t.evaluate(i2, n3.showCondition, s2) && (u3 = true);
     } else u3 = true;
-    if (u3) return r2 = i3, true;
+    if (u3) return r2 = n3, true;
   });
   return { show: u2, toPage: r2 };
 }
+function a(t2, e2) {
+  var _a;
+  const i2 = t2.tableName;
+  let o2 = "";
+  const n2 = (_a = e2 == null ? void 0 : e2.props) == null ? void 0 : _a.base;
+  if (n2 && n2.prop) {
+    const t3 = n2.prop;
+    o2 = s(t3);
+  }
+  return c(t2, i2, o2);
+}
+function c(t2, e2, i2) {
+  if (!i2 || !e2) return true;
+  const o2 = t2.branchFieldAuth;
+  if (o2) {
+    const t3 = o2.hasAuthFields;
+    if (t3 && t3[e2] && t3[e2].indexOf(i2) >= 0) return true;
+    const n2 = o2.allAuthFields;
+    if (n2 && n2[e2] && n2[e2].indexOf(i2) >= 0) return false;
+  }
+  return true;
+}
 export {
-  l as expressJump,
-  u as getOperationButtons,
-  r as getTableNameByTableUuid,
-  n as popupToPage
+  p as expressJump,
+  l as getOperationButtons,
+  u as getTableNameByTableUuid,
+  a as isHasFieldAuth,
+  c as isHasFieldPermissionAuth,
+  r as popupToPage
 };

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

@@ -1,8 +1,8 @@
-import { defineComponent as e, ref as r, onMounted as o, watch as t, createElementBlock as n, openBlock as i, normalizeClass as a, normalizeStyle as l, unref as s, withDirectives as u, createVNode as c, vShow as p } from "vue";
+import { defineComponent as e, ref as r, onMounted as o, watch as t, createElementBlock as n, openBlock as a, normalizeClass as i, normalizeStyle as u, unref as s, withDirectives as l, createVNode as c, vShow as p } from "vue";
 import { getCustomTheme as f, initChartOption as g, monitorChartClickToVariable as m, clearChartSelected as h, exportCommonChart as d } from "../../../../utils/charts/chart-util.js";
-import { getChartDatasFromPage as v, updateChartDatasources as x, monitorFieldChange as C } from "../../../../utils/page-helper-util.js";
-import { updateChartOption as k } from "../../../../utils/charts/chart-columnline-util.js";
-import { doClickJumpPageEvent as I } from "../../../../utils/events/event-util.js";
+import { getChartDatasFromPage as x, updateChartDatasources as v, monitorFieldChange as C } from "../../../../utils/page-helper-util.js";
+import { updateChartOption as I } from "../../../../utils/charts/chart-columnline-util.js";
+import { doClickJumpPageEvent as k } from "../../../../utils/events/event-util.js";
 import y from "../common/common-chart-header.vue.js";
 import { use as R } from "echarts/core";
 import { CanvasRenderer as j } from "echarts/renderers";
@@ -18,24 +18,21 @@ const A = e({ __name: "column-line-runtime", props: { pageContext: {}, configure
     "clearDrill" == F ? U.value && U.value.closeDrill && U.value.closeDrill(0) : "clickEvent" === F && Z(e3);
   }
   function Z(e3) {
-    if (console.log("clik0", e3), e3.seriesIndex >= Q.series.length) return;
-    console.log("clik1", e3);
-    const r2 = Q.series[e3.seriesIndex].uuid;
-    console.log("clik2", r2);
-    const o2 = B[r2];
-    if (console.log("clik3", o2), !o2) return;
+    if (e3.seriesIndex >= Q.series.length) return;
+    const r2 = Q.series[e3.seriesIndex].uuid, o2 = B[r2];
+    if (!o2) return;
     const t2 = { data: e3.data, dataIndex: e3.dataIndex, name: e3.name, seriesId: e3.seriesId, seriesIndex: e3.seriesIndex, seriesName: e3.seriesName, seriesType: e3.seriesType, value: e3.value };
-    I(H.pageContext, o2, t2);
+    k(H.pageContext, o2, t2);
   }
   g(H.configure, Q), o(() => {
-    const e3 = v(H.pageContext, H.configure);
+    const e3 = x(H.pageContext, H.configure);
     e3 && oe(e3), S.value && (z || Object.keys(B).length > 0) && S.value.chart.on("click", function(e4) {
       z ? U.value && U.value.drill && U.value.drill(e4, H.configure.cacheDatas) : Z(e4);
     }), !z && H.configure.clickSet && S.value && m(H.pageContext, H.configure, S.value.chart);
   });
   let $ = M.groupValue;
   function ee(e3) {
-    L ? (true !== e3 && (L.autoRefresh = true), x(H.pageContext, [L], M.drillParams)) : console.log("无数据源配置，不需要查询!");
+    L && (true !== e3 && (L.autoRefresh = true), v(H.pageContext, [L], M.drillParams));
   }
   t(M, () => {
     $ != M.groupValue && ($ = M.groupValue, L && (L.services[0].groupValue = M.groupValue), ee(false));
@@ -43,14 +40,13 @@ const A = e({ __name: "column-line-runtime", props: { pageContext: {}, configure
   const re = M.monitorFields;
   function oe(e3) {
     var _a;
-    if (e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender) return e3.hasRender = true, void console.log("重复更新!", e3);
-    e3.hasRender = true, L.autoRefresh || ($ = e3.groupValue, $ && "checkbox" !== M.groupComponent && ($ = $.join(",")), M.groupValue = $), L.autoRefresh && z || h(H.pageContext, H.configure, (_a = S.value) == null ? void 0 : _a.chart), L.autoRefresh = false, k(H.pageContext, H.configure, Q, e3);
+    e3 || (e3 = []), Array.isArray(e3) && (e3 = e3.length > 0 ? e3[0] : {}), e3 || (e3 = {}), e3.hasRender ? e3.hasRender = true : (e3.hasRender = true, L.autoRefresh || ($ = e3.groupValue, $ && "checkbox" !== M.groupComponent && ($ = $.join(",")), M.groupValue = $), L.autoRefresh && z || h(H.pageContext, H.configure, (_a = S.value) == null ? void 0 : _a.chart), L.autoRefresh = false, I(H.pageContext, H.configure, Q, e3));
   }
   return C(H.pageContext, re, () => {
     ee(true);
   }), A2({ updateChartDatas: oe, exportChart: function() {
     return d(S.value);
-  }, chartOption: Q }), (e3, r2) => (i(), n("div", { style: l(s(J)), class: a([s(K), "amb-widget-chart amb-widget-flex"]), ref_key: "thisRef", ref: N }, [u(c(y, { ref_key: "headerRef", ref: U, headerInfo: s(M), configure: e3.configure, pageContext: e3.pageContext, onDrillEnd: Y }, null, 8, ["headerInfo", "configure", "pageContext"]), [[p, s(M).showHeader || e3.pageContext.showHomepageSearch]]), c(s(O), { ref_key: "chartRef", ref: S, theme: s(X), option: s(Q), autoresize: "" }, null, 8, ["theme", "option"])], 6));
+  }, chartOption: Q }), (e3, r2) => (a(), n("div", { style: u(s(J)), class: i([s(K), "amb-widget-chart amb-widget-flex"]), ref_key: "thisRef", ref: N }, [l(c(y, { ref_key: "headerRef", ref: U, headerInfo: s(M), configure: e3.configure, pageContext: e3.pageContext, onDrillEnd: Y }, null, 8, ["headerInfo", "configure", "pageContext"]), [[p, s(M).showHeader || e3.pageContext.showHomepageSearch]]), c(s(O), { ref_key: "chartRef", ref: S, theme: s(X), option: s(Q), autoresize: "" }, null, 8, ["theme", "option"])], 6));
 } });
 export {
   A as default

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

@@ -2,10 +2,10 @@ import { defineComponent as e, watch as l, resolveComponent as o, createBlock as
 const t = e({ __name: "common-chart-header-group", props: { headerInfo: { type: Object, required: true } }, setup(e2) {
   const t2 = e2;
   return l(t2.headerInfo, () => {
-    console.log("props.headerInfo", t2.headerInfo);
+    t2.headerInfo;
   }), (l2, t3) => {
-    const h = o("el-checkbox"), f = o("el-checkbox-group"), m = o("el-radio"), I = o("el-radio-button"), V = o("el-radio-group");
-    return "checkbox" == e2.headerInfo.groupComponent ? (r(), a(f, { key: 0, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[0] || (t3[0] = (l3) => e2.headerInfo.groupValue = l3) }, { default: n(() => [(r(true), u(d, null, p(e2.headerInfo.options, (e3) => (r(), a(h, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"])) : "radio" == e2.headerInfo.groupComponent ? (r(true), u(d, { key: 1 }, p(e2.headerInfo.options, (l3) => (r(), a(m, { modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[1] || (t3[1] = (l4) => e2.headerInfo.groupValue = l4), value: l3.value, label: l3.label }, null, 8, ["modelValue", "value", "label"]))), 256)) : (r(), a(V, { key: 2, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[2] || (t3[2] = (l3) => e2.headerInfo.groupValue = l3) }, { default: n(() => [(r(true), u(d, null, p(e2.headerInfo.options, (e3) => (r(), a(I, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"]));
+    const h = o("el-checkbox"), f = o("el-checkbox-group"), m = o("el-radio"), V = o("el-radio-button"), b = o("el-radio-group");
+    return "checkbox" == e2.headerInfo.groupComponent ? (r(), a(f, { key: 0, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[0] || (t3[0] = (l3) => e2.headerInfo.groupValue = l3) }, { default: n(() => [(r(true), u(d, null, p(e2.headerInfo.options, (e3) => (r(), a(h, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"])) : "radio" == e2.headerInfo.groupComponent ? (r(true), u(d, { key: 1 }, p(e2.headerInfo.options, (l3) => (r(), a(m, { modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[1] || (t3[1] = (l4) => e2.headerInfo.groupValue = l4), value: l3.value, label: l3.label }, null, 8, ["modelValue", "value", "label"]))), 256)) : (r(), a(b, { key: 2, modelValue: e2.headerInfo.groupValue, "onUpdate:modelValue": t3[2] || (t3[2] = (l3) => e2.headerInfo.groupValue = l3) }, { default: n(() => [(r(true), u(d, null, p(e2.headerInfo.options, (e3) => (r(), a(V, { label: e3.label, value: e3.value }, null, 8, ["label", "value"]))), 256))]), _: 1 }, 8, ["modelValue"]));
   };
 } });
 export {

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

@@ -1,5 +1,5 @@
-import { defineComponent as e, ref as o, resolveComponent as r, createElementBlock as n, openBlock as t, createElementVNode as a, createCommentVNode as l, withDirectives as i, createBlock as d, normalizeStyle as f, toDisplayString as h, vShow as s, createVNode as c, withCtx as I, unref as p } from "vue";
-import { Search as u } from "@element-plus/icons-vue";
+import { defineComponent as e, ref as o, resolveComponent as r, createElementBlock as n, openBlock as t, createElementVNode as a, createCommentVNode as l, withDirectives as i, createBlock as d, normalizeStyle as f, toDisplayString as h, vShow as s, createVNode as c, withCtx as I, unref as u } from "vue";
+import { Search as p } from "@element-plus/icons-vue";
 import g from "./common-chart-header-group.vue.js";
 import m from "./common-chart-header-breadcrumb.vue.js";
 import b from "./common-homepage-search.vue.js";
@@ -8,7 +8,7 @@ const w = { class: "amb-widget-chart-header" }, x = { class: "amb-widget-chart-h
   const N = e2, D = o(null), A = o(), R = _;
   function S(e3) {
     const o2 = N.headerInfo.drillOptions.length;
-    if (e3 >= o2) console.log("无效的取消操作,", e3, N.headerInfo.drillOptions);
+    if (e3 >= o2) N.headerInfo.drillOptions;
     else {
       for (let r2 = o2 - 1; r2 >= e3; r2--) N.headerInfo.drillOptions.splice(r2, 1);
       q(e3);
@@ -45,14 +45,14 @@ const w = { class: "amb-widget-chart-header" }, x = { class: "amb-widget-chart-h
   return P2({ drill: function(e3, o2) {
     const r2 = N.headerInfo.drillOptions.length;
     if (r2 + 1 >= N.headerInfo.options.length) {
-      return F(o2 && e3.dataIndex < o2.length ? o2[e3.dataIndex] : void 0), console.log("钻取到最底层了！"), void R("drill-end", e3);
+      return F(o2 && e3.dataIndex < o2.length ? o2[e3.dataIndex] : void 0), void R("drill-end", e3);
     }
-    console.log("props.headerInfo.options", r2, N.headerInfo.options);
+    N.headerInfo.options;
     const n2 = N.headerInfo.options[r2], t2 = o2 && e3.dataIndex < o2.length ? o2[e3.dataIndex] : null, a2 = { fieldName: n2.target ? n2.target.replace(".", "_") : "", rawFieldName: n2.target ? n2.target : "", label: e3.name, value: e3.name, data: t2 };
     N.headerInfo.drillOptions.push(a2), q(r2 + 1);
   }, closeDrill: S }), (o2, v2) => {
     const y2 = r("el-icon"), O2 = r("el-tooltip");
-    return t(), n("div", w, [a("div", x, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && (!e2.headerInfo.textAlign || "left" == e2.headerInfo.textAlign)]]), !e2.headerInfo.showDrill || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(m, { key: 0, ref_key: "drillObjRef", ref: D, headerInfo: e2.headerInfo, onCloseDrill: S }, null, 8, ["headerInfo"])), !e2.headerInfo.showGroup || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"]))]), a("div", k, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "center" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "center" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "center" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), a("div", j, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "right" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "right" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "right" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), e2.pageContext.showHomepageSearch ? (t(), n("div", C, [c(O2, { content: "打开查询弹窗", effect: "light" }, { default: I(() => [c(y2, { onClick: G }, { default: I(() => [c(p(u))]), _: 1 })]), _: 1 }), c(b, { ref_key: "commonHomepageSearchRef", ref: A, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"])])) : l("", true)]);
+    return t(), n("div", w, [a("div", x, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && (!e2.headerInfo.textAlign || "left" == e2.headerInfo.textAlign)]]), !e2.headerInfo.showDrill || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(m, { key: 0, ref_key: "drillObjRef", ref: D, headerInfo: e2.headerInfo, onCloseDrill: S }, null, 8, ["headerInfo"])), !e2.headerInfo.showGroup || e2.headerInfo.groupPosition && "left" != e2.headerInfo.groupPosition ? l("", true) : (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"]))]), a("div", k, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "center" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "center" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "center" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), a("div", j, [i(a("label", { style: f(e2.headerInfo.style) }, h(e2.headerInfo.title) + "  ", 5), [[s, e2.headerInfo.title && "right" == e2.headerInfo.textAlign]]), e2.headerInfo.showDrill && "right" == e2.headerInfo.groupPosition ? (t(), d(m, { key: 0, headerInfo: e2.headerInfo, onCloseDrill: S, ref_key: "drillObjRef", ref: D }, null, 8, ["headerInfo"])) : l("", true), e2.headerInfo.showGroup && "right" == e2.headerInfo.groupPosition ? (t(), d(g, { key: 1, headerInfo: e2.headerInfo }, null, 8, ["headerInfo"])) : l("", true)]), e2.pageContext.showHomepageSearch ? (t(), n("div", C, [c(O2, { content: "打开查询弹窗", effect: "light" }, { default: I(() => [c(y2, { onClick: G }, { default: I(() => [c(u(p))]), _: 1 })]), _: 1 }), c(b, { ref_key: "commonHomepageSearchRef", ref: A, configure: e2.configure, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"])])) : l("", true)]);
   };
 } });
 export {

package/dist/es/components/runtime/views/assemblys/chart/common/common-homepage-search.vue2.js

@@ -5,59 +5,59 @@ import { ElLoading as y, ElMessage as C } from "element-plus";
 import S from "agilebuilder-ui/src/utils/request";
 import "agilebuilder-ui/src/utils/common-util";
 import "agilebuilder-ui/src/utils/util";
-import "agilebuilder-ui/src/utils/auth";
+import "async-validator";
 import "../../../../utils/global-refs.js";
 import "../../../../utils/eventBus.js";
-import "axios";
-import "async-validator";
 import "../../../../utils/page-store.js";
 import "agilebuilder-ui/src/utils/i18n-util";
 import "vue-i18n";
+import "agilebuilder-ui/src/utils/auth";
+import "axios";
 import "../../../../utils/events/print-label.js";
-const b = { style: { overflow: "auto", height: "calc(100vh - 140px)" }, ref: "dialogBody" }, O = { class: "dialog-footer" }, x = e({ __name: "common-homepage-search", props: { configure: { type: Object, required: true }, pageContext: { type: Object, default: () => {
-} } }, setup(e2, { expose: x2 }) {
-  const N = e2, _ = t(false), J = t({}), j = t(0);
+const _ = { style: { overflow: "auto", height: "calc(100vh - 140px)" }, ref: "dialogBody" }, b = { class: "dialog-footer" }, O = e({ __name: "common-homepage-search", props: { configure: { type: Object, required: true }, pageContext: { type: Object, default: () => {
+} } }, setup(e2, { expose: O2 }) {
+  const x = e2, N = t(false), J = t({}), j = t(0);
   let I;
   o(() => {
     I = setTimeout(() => {
-      J.value = JSON.parse(JSON.stringify(N.pageContext.entity));
+      J.value = JSON.parse(JSON.stringify(x.pageContext.entity));
     }, 200);
   }), i(() => {
     I && clearTimeout(I);
   });
   const k = t([]), w = () => {
-    _.value = false;
+    N.value = false;
   }, T = () => {
     const e3 = y.service({ lock: true, text: "Loading", background: "rgba(0, 0, 0, 0.7)" });
-    v(N.pageContext, N.pageContext.initChartServiceConfigs, null, false).then(() => {
-      _.value = false;
+    v(x.pageContext, x.pageContext.initChartServiceConfigs, null, false).then(() => {
+      N.value = false;
     }).finally(() => {
-      _.value = false, e3.close();
+      N.value = false, e3.close();
     });
   };
   function H() {
-    N.pageContext.entity = JSON.parse(JSON.stringify(J.value)), j.value++;
+    x.pageContext.entity = JSON.parse(JSON.stringify(J.value)), j.value++;
   }
   function A() {
     const e3 = {};
-    N.pageContext.variables.forEach((t3) => {
+    x.pageContext.variables.forEach((t3) => {
       const o3 = "${page." + t3.name + "}";
-      e3[o3] = h(N.pageContext.entity, o3, null);
+      e3[o3] = h(x.pageContext.entity, o3, null);
     });
     let t2 = window.localStorage.getItem("HOME_MY_CHARTS_CONDITIONS"), o2 = {};
-    t2 && (o2 = JSON.parse(t2)), o2[N.configure.homeChartSettingUserId] = e3;
+    t2 && (o2 = JSON.parse(t2)), o2[x.configure.homeChartSettingUserId] = e3;
     const i2 = JSON.stringify(e3);
-    window.localStorage.setItem("HOME_MY_CHARTS_CONDITIONS", JSON.stringify(o2)), J.value = JSON.parse(JSON.stringify(N.pageContext.entity)), S.post(window.$vueApp.config.globalProperties.baseAPI + "/component/home-chart-settings/search-conditions", { id: N.configure.homeChartSettingUserId, searchConditionsJson: i2 }).then((e4) => {
+    window.localStorage.setItem("HOME_MY_CHARTS_CONDITIONS", JSON.stringify(o2)), J.value = JSON.parse(JSON.stringify(x.pageContext.entity)), S.post(window.$vueApp.config.globalProperties.baseAPI + "/component/home-chart-settings/search-conditions", { id: x.configure.homeChartSettingUserId, searchConditionsJson: i2 }).then((e4) => {
       C.success("保存成功"), T();
     });
   }
-  return x2({ openSearch: () => {
-    _.value = true, k.value = N.configure.pushHomepage.searchConditions;
+  return O2({ openSearch: () => {
+    N.value = true, k.value = x.configure.pushHomepage.searchConditions;
   } }), (t2, o2) => {
     const i2 = l("el-empty"), v2 = l("el-form"), h2 = l("el-button"), y2 = l("el-dialog");
-    return r(), a(y2, { modelValue: _.value, "onUpdate:modelValue": o2[0] || (o2[0] = (e3) => _.value = e3), title: "筛选", close: w, "append-to-body": "", fullscreen: "", top: "40vh", append: "", width: "70%", draggable: "" }, { default: n(() => [u("div", b, [k.value && 0 !== k.value.length ? c("", true) : (r(), a(i2, { key: 0, description: "未设置筛选条件", "image-size": 50 })), (r(), a(v2, { key: j.value }, { default: n(() => [(r(true), g(m, null, d(k.value, (t3) => (r(), a(f, { key: t3.uuid, configure: t3, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"]))), 128))]), _: 1 }))], 512)]), footer: n(() => [u("div", O, [s(h2, { type: "primary", onClick: T }, { default: n(() => o2[1] || (o2[1] = [p(" 确定 ")])), _: 1 }), s(h2, { type: "default", onClick: H }, { default: n(() => o2[2] || (o2[2] = [p("重置")])), _: 1 }), s(h2, { type: "primary", onClick: A }, { default: n(() => o2[3] || (o2[3] = [p(" 保存为默认条件 ")])), _: 1 })])]), _: 1 }, 8, ["modelValue"]);
+    return r(), a(y2, { modelValue: N.value, "onUpdate:modelValue": o2[0] || (o2[0] = (e3) => N.value = e3), title: "筛选", close: w, "append-to-body": "", fullscreen: "", top: "40vh", append: "", width: "70%", draggable: "" }, { default: n(() => [u("div", _, [k.value && 0 !== k.value.length ? c("", true) : (r(), a(i2, { key: 0, description: "未设置筛选条件", "image-size": 50 })), (r(), a(v2, { key: j.value }, { default: n(() => [(r(true), g(m, null, d(k.value, (t3) => (r(), a(f, { key: t3.uuid, configure: t3, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"]))), 128))]), _: 1 }))], 512)]), footer: n(() => [u("div", b, [s(h2, { type: "primary", onClick: T }, { default: n(() => o2[1] || (o2[1] = [p(" 确定 ", -1)])), _: 1, __: [1] }), s(h2, { type: "default", onClick: H }, { default: n(() => o2[2] || (o2[2] = [p("重置", -1)])), _: 1, __: [2] }), s(h2, { type: "primary", onClick: A }, { default: n(() => o2[3] || (o2[3] = [p(" 保存为默认条件 ", -1)])), _: 1, __: [3] })])]), _: 1 }, 8, ["modelValue"]);
   };
 } });
 export {
-  x as default
+  O as default
 };