@ibiz-template/vue3-util 0.7.41-alpha.1 → 0.7.41-alpha.11

package/lib/common/control-base/control-base.cjs

@@ -5,6 +5,7 @@ var runtime = require('@ibiz-template/runtime');
 var core = require('@ibiz-template/core');
 var ramda = require('ramda');
 require('../../use/index.cjs');
+require('./control-base.css');
 var namespace = require('../../use/namespace/namespace.cjs');
 
 "use strict";
@@ -74,7 +75,7 @@ const IBizControlBase = /* @__PURE__ */ vue.defineComponent({
     };
     const getControlRender = (data) => {
       var _a, _b;
-      const controlRenders = model.controlRenders ? model.controlRenders.filter((item) => item.id !== "emptypanel") : void 0;
+      const controlRenders = model.controlRenders ? model.controlRenders.filter((item) => !Object.values(runtime.PredefinedControlRender).includes(item.id)) : void 0;
       if (!controlRenders || controlRenders.length === 0) {
         return void 0;
       }
@@ -107,6 +108,36 @@ const IBizControlBase = /* @__PURE__ */ vue.defineComponent({
       const data = props.controller.data || props.controller.items;
       return getControlRender(data);
     });
+    const disableMaskInfoRender = () => {
+      const disableRender = model.controlRenders ? model.controlRenders.find((item) => item.id === runtime.PredefinedControlRender.DISABLEPANEL) : void 0;
+      if (!disableRender) {
+        return vue.createVNode("div", {
+          "innerHTML": props.controller.state.maskOption.maskInfo || "",
+          "class": [ns.e("disable-mask-text")]
+        }, null);
+      }
+      if (disableRender.renderType === "LAYOUTPANEL_MODEL" && disableRender.layoutPanelModel) {
+        const htmlCode = runtime.ScriptFactory.execScriptFn({
+          ...props.controller.getEventArgs()
+        }, disableRender.layoutPanelModel, {
+          isAsync: false,
+          singleRowReturn: true
+        });
+        return vue.createVNode("div", {
+          "innerHTML": htmlCode,
+          "class": [ns.e("disable-mask-text")]
+        }, null);
+      }
+      if (disableRender.renderType === "LAYOUTPANEL" && disableRender.layoutPanel) {
+        return vue.createVNode(vue.resolveComponent("iBizControlShell"), {
+          "class": [ns.e("disable-mask-text")],
+          "data": {},
+          "params": props.controller.params,
+          "context": props.controller.context,
+          "modelData": disableRender.layoutPanel
+        }, null);
+      }
+    };
     return {
       ns,
       typeClass,
@@ -115,6 +146,7 @@ const IBizControlBase = /* @__PURE__ */ vue.defineComponent({
       codeName,
       controls,
       customRender,
+      disableMaskInfoRender,
       onLayoutPanelCreated
     };
   },
@@ -164,9 +196,11 @@ const IBizControlBase = /* @__PURE__ */ vue.defineComponent({
       }, slots);
     }
     return vue.createVNode("div", {
-      "class": [this.ns.b(), this.ns.b(this.typeClass), this.ns.m(this.codeName), this.sysCssName],
+      "class": [this.ns.b(), this.ns.b(this.typeClass), this.ns.m(this.codeName), this.sysCssName, this.ns.is("disabled", state.disabled)],
       "style": this.inlineStyle
-    }, [layoutPanel || this.customRender || ((_c = (_b = this.$slots).default) == null ? void 0 : _c.call(_b))]);
+    }, [layoutPanel || this.customRender || ((_c = (_b = this.$slots).default) == null ? void 0 : _c.call(_b)), state.disabled && vue.createVNode("div", {
+      "class": [this.ns.e("mask-container"), this.ns.m(state.maskOption.mode.toLowerCase())]
+    }, [state.maskOption.mode === "MASK" && this.disableMaskInfoRender()])]);
   }
 });
 

package/lib/common/control-base/control-base.css

@@ -1 +1 @@
-.ibiz-control{width:100%;height:100%}.ibiz-control__control-render{width:100%;height:100%}
+.ibiz-control{--ibiz-control-base-scrollbar-width:0px;--ibiz-control-base-mask-text-color:var(--ibiz-color-primary-text);--ibiz-control-base-mask-background-color-blank:transparent;--ibiz-control-base-mask-background-color-mask:rgba(0, 0, 0, 0.5);width:100%;height:100%}.ibiz-control__control-render{width:100%;height:100%}.ibiz-control.is-disabled{position:relative}.ibiz-control__mask-container{position:absolute;top:0;left:0;z-index:10;width:calc(100% - var(--ibiz-control-base-scrollbar-width));height:100%}.ibiz-control--blank{background-color:var(--ibiz-control-base-mask-background-color-blank)}.ibiz-control--mask{color:var(--ibiz-control-base-mask-text-color);background-color:var(--ibiz-control-base-mask-background-color-mask);display:flex;align-items:center;justify-content:center}

package/lib/common/custom-render/custom-render.cjs

@@ -49,7 +49,7 @@ const IBizCustomRender = /* @__PURE__ */ vue.defineComponent({
       if (!controlRenders || controlRenders.length === 0) {
         return void 0;
       }
-      const noDataRender = controlRenders.find((item) => item.id === "emptypanel");
+      const noDataRender = controlRenders.find((item) => item.id === runtime.PredefinedControlRender.EMPTYPANEL);
       if (!noDataRender)
         return void 0;
       if (noDataRender.renderType === "LAYOUTPANEL_MODEL" && noDataRender.layoutPanelModel) {

package/lib/common/view-shell/view-shell.cjs

@@ -198,6 +198,7 @@ const IBizViewShell = /* @__PURE__ */ vue.defineComponent({
       Object.assign(params.value, redrawData.params);
       const modal = attrs.modal;
       if (modal) {
+        modal.hooks.preDismiss.clear();
         modal.hooks.shouldDismiss.clear();
         modal.hooks.beforeDismiss.clear();
       }

package/lib/control/panel/panel/panel.cjs

@@ -66,12 +66,23 @@ function renderPanelItem(panelItem, c, ins) {
     tempStyle = panelItem.cssStyle;
   }
   const panelItemC = panelItems[panelItem.id];
+  const attrs = renderAttrs(panelItem, panelItemC);
+  if (attrs.dynamicstyle) {
+    if (typeof attrs.dynamicstyle === "object") {
+      tempStyle += Object.entries(attrs.dynamicstyle).map(([key, value]) => {
+        return "".concat(key, ":").concat(value, ";");
+      }).join("");
+    } else {
+      tempStyle += attrs.dynamicstyle;
+    }
+    delete attrs.dynamicstyle;
+  }
   return vue.h(component, {
     modelData: panelItem,
     controller: panelItemC,
     key: panelItem.id,
     style: tempStyle,
-    attrs: renderAttrs(panelItem, panelItemC)
+    attrs
   }, children);
 }
 const PanelControl = /* @__PURE__ */ vue.defineComponent({

package/lib/control/panel/view-layout-panel/view-layout-panel.cjs

@@ -146,12 +146,23 @@ const ViewLayoutPanelControl = /* @__PURE__ */ vue.defineComponent({
         tempStyle = panelItem.cssStyle;
       }
       const panelItemC = panelItems[panelItem.id];
+      const attrs = renderAttrs(panelItem, panelItemC);
+      if (attrs.dynamicstyle) {
+        if (typeof attrs.dynamicstyle === "object") {
+          tempStyle += Object.entries(attrs.dynamicstyle).map(([key, value]) => {
+            return "".concat(key, ":").concat(value, ";");
+          }).join("");
+        } else {
+          tempStyle += attrs.dynamicstyle;
+        }
+        delete attrs.dynamicstyle;
+      }
       return vue.h(component, {
         modelData: panelItem,
         controller: panelItemC,
         key: panelItem.id,
         style: tempStyle,
-        attrs: renderAttrs(panelItem, panelItemC)
+        attrs
       }, children);
     };
     vue.provide("renderPanelItem", renderPanelItem);

package/lib/panel-component/panel-container/panel-container.cjs

@@ -44,7 +44,7 @@ const PanelContainer = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
-    var _a, _b;
+    var _a, _b, _c;
     let _slot;
     const defaultSlots = ((_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)) || [];
     const content = vue.createVNode(vue.resolveComponent("iBizRow"), {
@@ -64,6 +64,30 @@ const PanelContainer = /* @__PURE__ */ vue.defineComponent({
     })) ? _slot : {
       default: () => [_slot]
     });
+    const attrs = (_c = this.$attrs) == null ? void 0 : _c.attrs;
+    if (attrs && attrs.dynamictooltip) {
+      return vue.createVNode(vue.resolveComponent("el-tooltip"), {
+        "placement": "right",
+        "popper-class": this.ns.e("dynamic-tooltip")
+      }, {
+        default: () => {
+          return vue.createVNode("div", vue.mergeProps({
+            "class": this.classArr,
+            "onClick": () => {
+              this.controller.onClick();
+            }
+          }, this.$attrs), [this.controller.model.cssStyle ? vue.createVNode("style", {
+            "type": "text/css"
+          }, [this.controller.model.cssStyle]) : null, content]);
+        },
+        content: () => {
+          return vue.createVNode("div", {
+            "class": this.ns.e("dynamic-tooltip-content"),
+            "innerHTML": attrs.dynamictooltip
+          }, null);
+        }
+      });
+    }
     return vue.createVNode("div", {
       "class": this.classArr,
       "onClick": () => {

package/lib/panel-component/panel-field/panel-field.controller.cjs

@@ -86,7 +86,7 @@ class PanelFieldController extends runtime.PanelItemController {
    */
   async validate() {
     var _a;
-    if (this.state.visible && !this.model.allowEmpty && !this.value) {
+    if (this.state.visible && this.state.required && !this.value) {
       this.state.error = ((_a = this.editor) == null ? void 0 : _a.model.placeHolder) || ibiz.i18n.t("vue3Util.panelComponent.cannotEmpty", {
         caption: this.model.caption
       });

package/lib/panel-component/teleport-placeholder/teleport-placeholder.state.cjs

@@ -7,7 +7,7 @@ class TeleportPlaceholderState extends runtime.PanelItemState {
   constructor() {
     super(...arguments);
     /**
-     * @description 可根据该参数从嵌入视图里找到占位面板成员用于渲染，通过自定义补充参数配置
+     * @description 嵌入视图中的部件可依据该参数找到传送占位面板项进行位置替换，参数默认格式为 “当前视图标识-需传送部件标识”；也可通过面板项参数（TeleportTag）来指定
      * @exposedoc
      * @type {string}
      * @memberof TeleportPlaceholderState

package/lib/plugin/plugin-factory/plugin-factory.cjs

@@ -36,12 +36,10 @@ class PluginFactory {
      */
     this.pluginCache = /* @__PURE__ */ new Map();
     /**
-     * 所有的插件
-     *
-     * @author chitanda
-     * @date 2023-02-02 16:02:55
+     * @description 所有的插件
      * @protected
-     * @type {Plugin[]}
+     * @type {{ code: Plugin; extraParams: IParams }[]}
+     * @memberof PluginFactory
      */
     this.pluginCodes = [];
     /**
@@ -118,7 +116,7 @@ class PluginFactory {
    */
   register(app) {
     this.pluginCodes.forEach((plugin) => {
-      app.use(plugin);
+      app.use(plugin.code, plugin.extraParams);
     });
   }
   /**
@@ -138,31 +136,30 @@ class PluginFactory {
     }
   }
   /**
-   * 插件刚加载完成回来，设置到目前所有的 vue 实例当中
-   *
-   * @author chitanda
-   * @date 2023-02-02 17:02:38
+   * @description 插件刚加载完成回来，设置到目前所有的 vue 实例当中
    * @protected
    * @param {Plugin} code
+   * @param {IParams} [extraParams={}]
+   * @memberof PluginFactory
    */
-  setPluginCode(code) {
-    this.pluginCodes.push(code);
-    app_hooks.AppHooks.useComponent.callSync(null, code);
+  setPluginCode(code, extraParams = {}) {
+    this.pluginCodes.push({ code, extraParams });
+    app_hooks.AppHooks.useComponent.callSync(null, code, extraParams);
   }
   /**
-   * 加载插件
-   *
-   * @author chitanda
-   * @date 2022-10-31 14:10:13
+   * @description 加载插件
    * @param {ISysPFPlugin} plugin
-   * @return {*}  {Promise<boolean>}
+   * @param {string} [appId=ibiz.env.appId]
+   * @returns {*}  {Promise<boolean>}
+   * @memberof PluginFactory
    */
-  async loadPlugin(plugin) {
+  async loadPlugin(plugin, appId = ibiz.env.appId) {
     if (plugin.runtimeObject === true) {
       const pluginRef = plugin;
       if (pluginRef) {
         const rtObjectName = pluginRef.rtobjectName;
         const rtObjectRepo = pluginRef.rtobjectRepo;
+        const replaceDefault = pluginRef.replaceDefault;
         if (this.isIgnore(rtObjectRepo)) {
           return true;
         }
@@ -181,7 +178,9 @@ class PluginFactory {
         try {
           const p = this.loadPluginRef(
             pluginRef.rtobjectName,
-            pluginRef.rtobjectRepo
+            pluginRef.rtobjectRepo,
+            appId,
+            { replaceDefault }
           );
           this.loadQueue.set(rtObjectRepo, p);
           const result = await p;
@@ -199,14 +198,15 @@ class PluginFactory {
     return false;
   }
   /**
-   * 加载应用插件
-   *
-   * @author chitanda
-   * @date 2022-10-31 16:10:57
-   * @param {IPSAppPFPluginRef} pluginRef
-   * @return {*}  {Promise<boolean>}
+   * @description 加载应用插件
+   * @param {string} rtObjectName
+   * @param {string} rtObjectRepo
+   * @param {string} [appId=ibiz.env.appId]
+   * @param {IParams} [params={}]
+   * @returns {*}  {Promise<boolean>}
+   * @memberof PluginFactory
    */
-  async loadPluginRef(rtObjectName, rtObjectRepo) {
+  async loadPluginRef(rtObjectName, rtObjectRepo, appId = ibiz.env.appId, extraParams = {}) {
     if (this.isIgnore(rtObjectRepo)) {
       return true;
     }
@@ -216,7 +216,7 @@ class PluginFactory {
     let configData = null;
     {
       const pluginPath = rtObjectRepo;
-      const configUrl = this.urlReg.test(pluginPath) ? "".concat(pluginPath, "/package.json") : "".concat(ibiz.env.pluginBaseUrl, "/").concat(index.pathBrowserify.join(pluginPath, "package.json"));
+      const configUrl = this.urlReg.test(pluginPath) ? "".concat(pluginPath, "/package.json") : "".concat(ibiz.env.runContainer === "FULLCODE" && appId !== ibiz.env.appId ? ibiz.hub.microAppConfigCenter.getPluginBaseUrl(appId) : ibiz.env.pluginBaseUrl, "/").concat(index.pathBrowserify.join(pluginPath, "package.json"));
       const res = await ibiz.net.axios({
         method: "get",
         headers: { "Access-Control-Allow-Origin": "*" },
@@ -229,6 +229,7 @@ class PluginFactory {
       }
       configData = res.data;
     }
+    Object.assign(configData, { appId, extraParams });
     const remotePlugin = new runtime.RemotePluginItem(
       rtObjectName,
       rtObjectRepo,
@@ -257,17 +258,24 @@ class PluginFactory {
    */
   async loadScript(remotePlugin) {
     const pluginPath = remotePlugin.repo;
-    const { name, system, styles = [] } = remotePlugin.config;
+    const {
+      name,
+      appId,
+      system,
+      styles = [],
+      extraParams = {}
+    } = remotePlugin.config;
     let scriptUrl = "";
     scriptUrl = index.pathBrowserify.join(pluginPath, system);
     if (scriptUrl) {
       if (this.cache.has(scriptUrl)) {
         return;
       }
+      const baseUrl = ibiz.env.runContainer === "FULLCODE" && appId !== ibiz.env.appId ? ibiz.hub.microAppConfigCenter.getPluginBaseUrl(appId) : ibiz.env.pluginBaseUrl;
       let data = null;
-      const url = this.parseUrl(scriptUrl);
+      const url = this.parseUrl(scriptUrl, baseUrl);
       const styleUrls = (typeof styles === "string" ? [styles] : styles).map(
-        (styleUrl) => this.parseUrl(index.default.join(pluginPath, styleUrl))
+        (styleUrl) => this.parseUrl(index.default.join(pluginPath, styleUrl), baseUrl)
       );
       System.addImportMap({
         imports: {
@@ -281,7 +289,7 @@ class PluginFactory {
       data = await System.import(name);
       if (data) {
         if (data.default) {
-          this.setPluginCode(data.default);
+          this.setPluginCode(data.default, extraParams);
         } else {
           throw new core.RuntimeError(
             ibiz.i18n.t("vue3Util.plugin.failedRemotePluginLoad")
@@ -341,7 +349,10 @@ class PluginFactory {
     if (!config["systemjs-importmap"]) {
       return;
     }
-    const importMap = this.handleSystemImportMap(config["systemjs-importmap"]);
+    const importMap = this.handleSystemImportMap(
+      config["systemjs-importmap"],
+      config.appId
+    );
     if (importMap.packages) {
       const pkgs = importMap.packages;
       for (const key in pkgs) {
@@ -356,22 +367,26 @@ class PluginFactory {
             ibiz.i18n.t("vue3Util.plugin.failureConfigurationLoad")
           );
         }
-        await this.loadPluginExternal(res.data);
+        const result = res.data;
+        Object.assign(result, { appId: config.appId });
+        await this.loadPluginExternal(result);
       }
     }
     System.addImportMap(importMap);
   }
   /**
-   * 处理 systemjs importmap 配置
-   *
-   * @author chitanda
-   * @date 2024-01-11 20:01:07
+   * @description 处理 systemjs importmap 配置
    * @protected
    * @param {ISystemImportMap} importMap
-   * @return {*}  {IParams}
+   * @param {string} appId
+   * @returns {*}  {(ISystemImportMap | null)}
+   * @memberof PluginFactory
    */
-  handleSystemImportMap(importMap) {
+  handleSystemImportMap(importMap, appId) {
     if (importMap) {
+      if (!importMap.baseUrl && ibiz.env.runContainer === "FULLCODE" && appId !== ibiz.env.appId) {
+        importMap.baseUrl = ibiz.hub.microAppConfigCenter.getPluginBaseUrl(appId);
+      }
       if (importMap.packages) {
         const pkgs = importMap.packages;
         for (const key in pkgs) {

package/lib/util/render/render.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var ramda = require('ramda');
+var runtime = require('@ibiz-template/runtime');
 
 "use strict";
 function renderString(value) {
@@ -26,7 +27,9 @@ const hasEmptyPanelRenderer = (c) => {
   if (!controlRenders || controlRenders.length === 0) {
     return false;
   }
-  return !!controlRenders.find((item) => item.id === "emptypanel");
+  return !!controlRenders.find(
+    (item) => item.id === runtime.PredefinedControlRender.EMPTYPANEL
+  );
 };
 
 exports.hasEmptyPanelRenderer = hasEmptyPanelRenderer;

package/lib/util/route/route.cjs

@@ -38,7 +38,7 @@ function route2routePath(route, isRouteModal = false) {
         params = void 0;
       } else {
         if (params.srfnavctx) {
-          context = JSON.parse(decodeURIComponent(params.srfnavctx));
+          context = JSON.parse(params.srfnavctx);
           delete params.srfnavctx;
         }
         if (params.srfnav) {
@@ -119,8 +119,13 @@ function getOwnRouteContext(context) {
     }
     delete ownContext.attributekeys;
   }
+  let srfKeepNull = false;
+  if (Object.prototype.hasOwnProperty.call(ownContext, "srfkeepnull")) {
+    srfKeepNull = ownContext.srfkeepnull === true || ownContext.srfkeepnull === "true";
+    delete ownContext.srfkeepnull;
+  }
   Object.keys(ownContext).forEach((key) => {
-    if (excludeKeys.includes(key) || ramda.isNil(ownContext[key])) {
+    if (excludeKeys.includes(key) || !srfKeepNull && ramda.isNil(ownContext[key])) {
       delete ownContext[key];
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-util",
-  "version": "0.7.41-alpha.1",
+  "version": "0.7.41-alpha.11",
   "description": "通用组件库(vue3)",
   "main": "lib/index.cjs",
   "types": "es/index.d.ts",
@@ -37,10 +37,10 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/cli": "^0.3.10",
-    "@ibiz-template/core": "^0.7.41-alpha.1",
-    "@ibiz-template/runtime": "^0.7.41-alpha.1",
+    "@ibiz-template/core": "^0.7.41-alpha.9",
+    "@ibiz-template/runtime": "^0.7.41-alpha.11",
     "@ibiz-template/theme": "^0.7.39",
-    "@ibiz/model-core": "^0.1.75",
+    "@ibiz/model-core": "^0.1.79",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -57,7 +57,7 @@
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
     "@ibiz-template/runtime": "^0.6.0",
-    "@ibiz/model-core": "^0.1.75",
+    "@ibiz/model-core": "^0.1.79",
     "dayjs": "^1.11.10",
     "path-browserify": "^1.0.1",
     "pinia": "^2.1.7",
@@ -67,5 +67,5 @@
     "vue": "^3.3.8",
     "vue-router": "^4.2.4"
   },
-  "gitHead": "49b4a4328c21f6b4725855f6f1a1c00a72ed8065"
+  "gitHead": "2178dbbddab047b198a6908e16ff3ee6c1a34b33"
 }