super-page-runtime 2.0.75 → 2.0.80

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

@@ -13,10 +13,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
+    function isDisable() {
+      return designProperty.value.state === "disabled" || isButtongLoading();
+    }
+    function isButtongLoading() {
+      return props.pageContext.canClick !== void 0 && props.pageContext.clickUuid !== void 0 ? !props.pageContext.canClick && props.pageContext.clickUuid === props.configure.uuid : false;
+    }
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");
       return openBlock(), createBlock(_component_el_button, {
-        disabled: designProperty.value.state === "disabled",
+        disabled: isDisable(),
         class: normalizeClass(unref(runtimeClass)),
         style: normalizeStyle(unref(runtimeStyle)),
         type: designProperty.value.type,
@@ -24,6 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         text: designProperty.value.text,
         round: designProperty.value.round,
         plain: designProperty.value.plain,
+        loading: isButtongLoading(),
         onClick: _cache[0] || (_cache[0] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "click"))
       }, {
         default: withCtx(() => [
@@ -46,7 +53,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ], 64)) : createCommentVNode("", true)
         ]),
         _: 1
-      }, 8, ["disabled", "class", "style", "type", "size", "text", "round", "plain"]);
+      }, 8, ["disabled", "class", "style", "type", "size", "text", "round", "plain", "loading"]);
     };
   }
 });

package/dist/es/components/runtime/views/assemblys/data/table/sub-table-runtime.vue.js

@@ -29,10 +29,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
-    let dynamicFields = getModelFields(props.pageContext, props.configure, prop);
+    let dynamicFields = getModelFields(props.configure, prop);
     const listViewShowFlag = ref(false);
     const baseURL = window["$vueApp"].config.globalProperties.baseURL;
     const listViewOptions = ref({
+      isSql: true,
       subTableData: null,
       extraParam: {},
       operations: {},

package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js

@@ -127,6 +127,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "start-placeholder": designProperty.value.placeholder,
             "end-placeholder": designProperty.value.endPlaceholder,
             format: designProperty.value.format,
+            "value-format": designProperty.value.valueFormat ? "x" : designProperty.value.valueFormat,
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dynamicModelMethod.value = $event),
             shortcuts: shortcuts.value,
@@ -136,7 +137,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onFocus: _cache[3] || (_cache[3] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
             onVisibleChange: _cache[4] || (_cache[4] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
             onPanelChange: _cache[5] || (_cache[5] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
-          }, null, 8, ["is-range", "clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "modelValue", "shortcuts", "type"])) : (openBlock(), createBlock(_component_el_date_picker, {
+          }, null, 8, ["is-range", "clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "value-format", "modelValue", "shortcuts", "type"])) : (openBlock(), createBlock(_component_el_date_picker, {
             key: 1,
             clearable: designProperty.value.clearable,
             disabled: designProperty.value.state === "disabled",
@@ -150,12 +151,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => dynamicModelMethod.value = $event),
             shortcuts: shortcuts.value,
             type: designProperty.value.dateType,
+            "value-format": designProperty.value.valueFormat ? "x" : designProperty.value.valueFormat,
             onChange: _cache[7] || (_cache[7] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
             onBlur: _cache[8] || (_cache[8] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
             onFocus: _cache[9] || (_cache[9] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
             onVisibleChange: _cache[10] || (_cache[10] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
             onPanelChange: _cache[11] || (_cache[11] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
-          }, null, 8, ["clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "modelValue", "shortcuts", "type"]))
+          }, null, 8, ["clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "modelValue", "shortcuts", "type", "value-format"]))
         ]),
         _: 1
       }, 8, ["required", "class", "label-width", "style"]);

package/dist/es/components/runtime/views/assemblys/form/file-upload/fileupload-runtime.vue2.js

@@ -2,7 +2,7 @@ import { defineComponent, ref, resolveComponent, openBlock, createBlock, normali
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { fileUploadBeforeUpload } from "../../../../utils/events/event-util.js";
 import http from "agilebuilder-ui/src/utils/request";
-import FsUploadNew from "agilebuilder-ui";
+import { FsUploadNew } from "agilebuilder-ui";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "fileupload-runtime",
   props: {
@@ -23,16 +23,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const initPaths = getVariableValue(entity, pathFields);
     const fileList = ref([]);
     const fileInfo = ref({});
-    const baseURL = window.$vueApp.config.globalProperties.baseURL;
-    const baseAPI = window.$vueApp.config.globalProperties.baseAPI;
-    let url = baseURL;
-    if (!isPlateSys(props.pageContext.systemCode)) {
-      url = baseAPI;
-    }
     if (initPaths) {
       const uuids = initPaths.split(",");
       if (uuids.length > 0) {
-        http.post(url + "/common/fs-upload/search-file-names").then((result) => {
+        const backendUrl = props.pageContext.backendUrl;
+        http.post(backendUrl + "/common/fs-upload/search-file-names", uuids).then((result) => {
           const names = [];
           for (let index = 0; index < uuids.length; index++) {
             const uuid = uuids[index];
@@ -74,13 +69,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       setVariableValue(props.pageContext.entity, pathFields, uuids.join(","));
       setVariableValue(props.pageContext.entity, nameFields, names.join(","));
     };
-    function isPlateSys(systemCode) {
-      if (systemCode && (systemCode === "agilebuilder" || systemCode === "portal" || systemCode === "mms" || systemCode === "task" || systemCode === "wf" || systemCode === "dc" || systemCode === "mc" || systemCode === "mobile" || systemCode === "acs" || systemCode === "bs" || systemCode === "pcm")) {
-        return true;
-      } else {
-        return false;
-      }
-    }
     return (_ctx, _cache) => {
       const _component_el_form_item = resolveComponent("el-form-item");
       return designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
@@ -98,7 +86,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ]),
         default: withCtx(() => [
           createVNode(unref(FsUploadNew), {
-            disabled: designProperty.value.state == "disabled",
+            disabled: designProperty.value.state === "disabled",
             displayType: designProperty.value.displayType,
             accept: designProperty.value.accept,
             multiple: designProperty.value.multiple,
@@ -115,7 +103,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         _: 1
       }, 8, ["required", "class", "label-width", "style"])) : (openBlock(), createBlock(unref(FsUploadNew), {
         key: 1,
-        disabled: designProperty.value.state == "disabled",
+        disabled: designProperty.value.state === "disabled",
         displayType: designProperty.value.displayType,
         accept: designProperty.value.accept,
         multiple: designProperty.value.multiple,

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue.js

@@ -1,4 +1,7 @@
 import _sfc_main from "./placeholder-runtime.vue2.js";
+import "./placeholder-runtime.vue3.js";
+import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
+const placeholderRuntime = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a0860ff0"]]);
 export {
-  _sfc_main as default
+  placeholderRuntime as default
 };

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

@@ -1,5 +1,6 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementVNode } from "vue";
-const _hoisted_1 = /* @__PURE__ */ createElementVNode("div", { style: { "width": "100%", "height": "100%" } }, " ", -1);
+import { defineComponent, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, pushScopeId, popScopeId, createElementVNode } from "vue";
+const _withScopeId = (n) => (pushScopeId("data-v-a0860ff0"), n = n(), popScopeId(), n);
+const _hoisted_1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { style: { "width": "100%", "height": "100%" } }, " ", -1));
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "placeholder-runtime",
   props: {

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/runtime/views/assemblys/object-render.vue.js

@@ -3,8 +3,8 @@ import _sfc_main$1 from "./error-render.vue.js";
 import { getRuntimeComponentByName } from "../../utils/assemblys-config.js";
 import { PageDimensions } from "../../utils/interfaces/page-design-types.js";
 import { addComponentRef, addComponentRefByCode } from "../../utils/global-refs.js";
-import { getPermissionCodes, packageFormRules } from "../../utils/page-init-util.js";
-import { caculateShowCondition } from "../../utils/page-helper-util.js";
+import { getPermissionCodes, packageFormRules, controlObjectRenderState } from "../../utils/page-init-util.js";
+import { caculateShowCondition, getFormPropName } from "../../utils/page-helper-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "object-render",
   props: {
@@ -97,9 +97,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.configure.code) {
         addComponentRefByCode(props.pageContext, props.configure.code, thisRef);
       } else if (props.configure.props && props.configure.props.base) {
-        const propsBase = props.configure.props.base;
-        if (propsBase.prop) {
-          let propName = propsBase.prop;
+        const propsBase2 = props.configure.props.base;
+        if (propsBase2.prop) {
+          let propName = propsBase2.prop;
           if (propName.startsWith("${")) {
             propName = propName.substring(2, propName.length - 1);
           }
@@ -109,6 +109,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           addComponentRefByCode(props.pageContext, propName, thisRef);
         }
       }
+      const propsBase = props.configure.props ? props.configure.props.base : null;
+      if (propsBase && propsBase.prop) {
+        let propName = propsBase.prop;
+        propName = getFormPropName(propName);
+        controlObjectRenderState(props.pageContext, propName);
+      }
     }
     onMounted(() => {
       if (!thisRef.value || !thisRef.value.parentNode) {

package/dist/es/components/runtime/views/assemblys/workflow/workflow-button/workflowbutton-runtime.vue2.js

@@ -20,8 +20,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let activityNameColor = "";
     if (props.configure.props.base.showActivityName) {
       activityNameColor = props.configure.props.base.activityNameColor || "red";
-      if (props.pageContext.entity && props.pageContext.entity.task && props.pageContext.entity.task.name) {
-        taskName.value = props.pageContext.entity.task.name;
+      if (props.pageContext.entity && props.pageContext.entity.data) {
+        taskName.value = props.pageContext.entity.data["CURRENT_ACTIVITY_NAME"] || props.pageContext.entity.data["current_activity_name"];
       }
     }
     props.configure.items.forEach((item) => {

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

@@ -1,7 +1,7 @@
 import { defineComponent, ref, onMounted, onUpdated, nextTick, onUnmounted, openBlock, createElementBlock, normalizeClass, normalizeStyle, Fragment, renderList, createBlock, unref, createCommentVNode, createElementVNode, watch } from "vue";
 import _sfc_main$1 from "./assemblys/object-render.vue.js";
 import { updateOptionDatasources, updateChartDatasources } from "../utils/page-helper-util.js";
-import { queryPageSuperGrids, queryPageDesignByCode, convertToPageContext } from "../utils/page-init-util.js";
+import { queryPageSuperGrids, queryPageDesignByCode, convertToPageContext, packageAdditionalMapWithRoute } from "../utils/page-init-util.js";
 import { addComponentRef, removePageAllRef, initComponentRefState } from "../utils/global-refs.js";
 import { removeCustomFuncFromWindow, handleEvent, initPageEvents } from "../utils/events/event-util.js";
 import _sfc_main$2 from "./assemblys/common/export-form-report-dialog.vue.js";
@@ -109,6 +109,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (tempContext.isTest && props.dimensions) {
         tempContext.dimensions = props.dimensions;
       }
+      packageAdditionalMapWithRoute(route, tempContext.entity.request);
       pageContext.value = tempContext;
       if (pageContext.value == null) {
         return;
@@ -413,13 +414,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
           const jumpMode = openPageParams.jumpMode;
           const popPageSetting = openPageParams;
+          if (!parentEventParams.value) {
+            parentEventParams.value = {};
+          }
+          parentEventParams.value.paramStoreId = openPageParams.paramStoreId;
           popPageSetting.parentPageCode = parentPageContext.value.code;
           popPageSetting.parentPageVersion = parentPageContext.value.version;
           popPageSetting.isNewPage = true;
           if (jumpMode === "popup") {
-            eventBus.$on(eventPageInfo.value + "close-dialog", (params) => {
-              closeFunc(params);
-            });
             jumpPageSetting.value = popPageSetting;
             isShowDialog.value = true;
           } else if (jumpMode === "refresh") {
@@ -428,6 +430,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               query: popPageSetting
             });
           }
+          if (jumpMode === "popup" || jumpMode === "refresh") {
+            eventBus.$on(eventPageInfo.value + "close-dialog", (params) => {
+              closeFunc(params);
+            });
+          }
         } else {
           console.error("页面配置信息不存在");
         }

package/dist/es/style.css

@@ -0,0 +1,3 @@
+.el-form-item[data-v-a0860ff0] {
+  margin-bottom: 0px;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.75",
+  "version": "2.0.80",
   "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.54",
+    "agilebuilder-ui": "1.0.56",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",