@ibiz-template/vue3-components 0.7.15 → 0.7.16

package/es/editor/data-picker/picker-editor.controller.d.ts

@@ -1,5 +1,5 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { EditorController, IViewConfig } from '@ibiz-template/runtime';
+import { EditorController, IViewConfig, IAcItemProvider } from '@ibiz-template/runtime';
 import { IAppDEACMode, IDEACModeDataItem, IPicker } from '@ibiz/model-core';
 /**
  * 数据选择编辑器控制器
@@ -59,6 +59,14 @@ export declare class PickerEditorController extends EditorController<IPicker> {
     objectIdField: string | undefined;
     objectNameField: string | undefined;
     objectValueField: string | undefined;
+    /**
+     * 自填列表项适配器
+     *
+     * @author zhanghengfeng
+     * @date 2024-05-21 17:05:50
+     * @type {IAcItemProvider}
+     */
+    acItemProvider?: IAcItemProvider;
     protected onInit(): Promise<void>;
     /**
      * 初始化noAc和noButton

package/es/editor/data-picker/picker-editor.controller.mjs

@@ -1,5 +1,5 @@
 import { RuntimeModelError } from '@ibiz-template/core';
-import { EditorController, getDeACMode, OpenAppViewCommand } from '@ibiz-template/runtime';
+import { EditorController, getDeACMode, getAcItemProvider, OpenAppViewCommand } from '@ibiz-template/runtime';
 import { mergeDeepLeft } from 'ramda';
 
 "use strict";
@@ -66,6 +66,14 @@ class PickerEditorController extends EditorController {
     __publicField(this, "objectNameField", "");
     // 对象值属性
     __publicField(this, "objectValueField", "");
+    /**
+     * 自填列表项适配器
+     *
+     * @author zhanghengfeng
+     * @date 2024-05-21 17:05:50
+     * @type {IAcItemProvider}
+     */
+    __publicField(this, "acItemProvider");
   }
   async onInit() {
     var _a, _b, _c, _d;
@@ -103,6 +111,9 @@ class PickerEditorController extends EditorController {
               }
             );
           }
+          if (this.deACMode.itemSysPFPluginId) {
+            this.acItemProvider = await getAcItemProvider(this.deACMode);
+          }
         }
       }
     }

package/es/editor/list-box/ibiz-list-box/ibiz-list-box.mjs

@@ -1,4 +1,4 @@
-import { isVNode, computed, ref, watch, resolveComponent, mergeProps, createVNode, defineComponent } from 'vue';
+import { isVNode, computed, ref, watch, resolveComponent, mergeProps, h, createVNode, defineComponent } from 'vue';
 import { getListBoxProps, getEditorEmits, useNamespace, useCodeListListen, useFocusAndBlur } from '@ibiz-template/vue3-util';
 import { isNil } from 'ramda';
 import './ibiz-list-box.css';
@@ -166,9 +166,19 @@ const IBizListBox = /* @__PURE__ */ defineComponent({
       "label": item.value,
       "disabled": this.disabled || this.readonly || item.disableSelect === true
     }, {
-      default: () => [createVNode("span", {
-        "class": this.ns.e("text")
-      }, [item.text])]
+      default: () => {
+        const c = this.controller;
+        if (c.acItemProvider) {
+          const component = resolveComponent(c.acItemProvider.component);
+          return h(component, {
+            item,
+            controller: c
+          });
+        }
+        return createVNode("span", {
+          "class": this.ns.e("text")
+        }, [item.text]);
+      }
     }))) ? _slot : {
       default: () => [_slot]
     }) : createVNode(resolveComponent("el-radio-group"), mergeProps({
@@ -182,9 +192,19 @@ const IBizListBox = /* @__PURE__ */ defineComponent({
         this.onSelectArrayChange(item.value);
       }
     }, {
-      default: () => [createVNode("span", {
-        "class": this.ns.e("text")
-      }, [item.text])]
+      default: () => {
+        const c = this.controller;
+        if (c.acItemProvider) {
+          const component = resolveComponent(c.acItemProvider.component);
+          return h(component, {
+            item,
+            controller: c
+          });
+        }
+        return createVNode("span", {
+          "class": this.ns.e("text")
+        }, [item.text]);
+      }
     }))) ? _slot2 : {
       default: () => [_slot2]
     })]);

package/es/editor/list-box/list-box-picker-editor.controller.d.ts

@@ -1,6 +1,6 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { EditorController } from '@ibiz-template/runtime';
-import { IListBoxPicker } from '@ibiz/model-core';
+import { EditorController, IAcItemProvider } from '@ibiz-template/runtime';
+import { IAppDEACMode, IListBoxPicker } from '@ibiz/model-core';
 /**
  * 列表框picker编辑器控制器
  * @return {*}
@@ -20,6 +20,22 @@ export declare class ListBoxPickerEditorController extends EditorController<ILis
      * 数据集codeName
      */
     interfaceName: string;
+    /**
+     * 实体自填模式模型
+     *
+     * @author zhanghengfeng
+     * @date 2024-05-21 17:05:03
+     * @type {IAppDEACMode}
+     */
+    deACMode?: IAppDEACMode;
+    /**
+     * 自填列表项适配器
+     *
+     * @author zhanghengfeng
+     * @date 2024-05-21 17:05:25
+     * @type {IAcItemProvider}
+     */
+    acItemProvider?: IAcItemProvider;
     protected onInit(): Promise<void>;
     /**
      * 加载实体数据集数据

package/es/editor/list-box/list-box-picker-editor.controller.mjs

@@ -1,5 +1,5 @@
 import { RuntimeModelError } from '@ibiz-template/core';
-import { EditorController } from '@ibiz-template/runtime';
+import { EditorController, getDeACMode, getAcItemProvider } from '@ibiz-template/runtime';
 import { mergeDeepLeft } from 'ramda';
 
 "use strict";
@@ -24,6 +24,22 @@ class ListBoxPickerEditorController extends EditorController {
      * 数据集codeName
      */
     __publicField(this, "interfaceName", "");
+    /**
+     * 实体自填模式模型
+     *
+     * @author zhanghengfeng
+     * @date 2024-05-21 17:05:03
+     * @type {IAppDEACMode}
+     */
+    __publicField(this, "deACMode");
+    /**
+     * 自填列表项适配器
+     *
+     * @author zhanghengfeng
+     * @date 2024-05-21 17:05:25
+     * @type {IAcItemProvider}
+     */
+    __publicField(this, "acItemProvider");
   }
   async onInit() {
     super.onInit();
@@ -31,6 +47,18 @@ class ListBoxPickerEditorController extends EditorController {
       if (this.model.appDEDataSetId) {
         this.interfaceName = this.model.appDEDataSetId;
       }
+      if (this.model.appDataEntityId && this.model.appDEACModeId) {
+        this.deACMode = await getDeACMode(
+          this.model.appDEACModeId,
+          this.model.appDataEntityId,
+          this.context.srfappid
+        );
+        if (this.deACMode) {
+          if (this.deACMode.itemSysPFPluginId) {
+            this.acItemProvider = await getAcItemProvider(this.deACMode);
+          }
+        }
+      }
     }
   }
   /**

package/es/locale/en/index.d.ts

@@ -732,6 +732,7 @@ declare const _default: {
                 viewPlugin: string;
                 correspondViewTypeStyle: string;
                 toolbarItem: string;
+                acItem: string;
             };
         };
         service: {

package/es/locale/en/index.mjs

@@ -738,7 +738,8 @@ var index = {
         frontEndPluginNode: "Cannot find interface logic front-end plugin node, plugin {pluginKey} corresponding adapter",
         viewPlugin: "Cannot find the adapter corresponding to the view plugin {pluginKey}.",
         correspondViewTypeStyle: "Cannot find an adapter for view type: [{viewType}] corresponding to view style: [{viewStyle}].",
-        toolbarItem: "Cannot find the adapter corresponding to the toolbar item plugin {pluginKey}."
+        toolbarItem: "Cannot find the adapter corresponding to the toolbar item plugin {pluginKey}.",
+        acItem: "Cannot find the adapter corresponding to the ac item plugin {pluginKey}."
       }
     },
     service: {

package/es/locale/index.d.ts

@@ -1,9 +1,37 @@
 import { I18n } from '@ibiz-template/core';
 declare const i18n: import("vue-i18n").I18n<{}, {}, {}, string, false>;
 export declare class IBizI18n implements I18n {
+    /**
+     * html元素
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:58
+     * @protected
+     * @type {HTMLElement}
+     */
     protected html: HTMLElement;
+    /**
+     * 默认语言
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:13
+     * @protected
+     * @type {string}
+     */
     protected defaultLang: string;
+    /**
+     * 语言资源映射表
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:38
+     * @protected
+     */
     protected langMap: Map<string, () => Promise<IData>>;
+    /**
+     * Creates an instance of IBizI18n.
+     * @author tony001
+     * @date 2024-05-20 22:05:50
+     */
     constructor();
     /**
      * 初始化加载默认多语言文件
@@ -22,16 +50,59 @@ export declare class IBizI18n implements I18n {
      */
     setLangConfigs(languages: Record<string, () => Promise<IData>>): void;
     /**
-     * 设置
+     * 设置语言
      *
      * @author chitanda
      * @date 2023-08-24 16:08:42
      * @param {string} lang
      */
     setLang(lang: string): void;
+    /**
+     * 获取语言
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:05
+     * @return {*}  {string}
+     */
     getLang(): string;
+    /**
+     * 格式化
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:00
+     * @param {string} tag
+     * @param {(IParams | undefined)} [options]
+     * @return {*}  {string}
+     */
     t(tag: string, options?: IParams | undefined): string;
+    /**
+     * 格式化
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:05
+     * @param {string} tag
+     * @param {(string | undefined)} [defaultMsg]
+     * @param {IParams} [options]
+     * @return {*}  {string}
+     */
     t(tag: string, defaultMsg?: string | undefined, options?: IParams): string;
+    /**
+     * 合并语言资源
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:01
+     * @param {IParams} data
+     */
+    mergeLocaleMessage(data: IParams): void;
+    /**
+     * 合并指定语言资源
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:21
+     * @param {string} lang
+     * @param {IParams} data
+     */
+    mergeLocaleMessage(lang: string, data: IParams): void;
 }
 declare const iBizI18n: IBizI18n;
 export { i18n, iBizI18n };

package/es/locale/index.mjs

@@ -12,9 +12,37 @@ const i18n = createI18n({
   locale: "zh-CN"
 });
 class IBizI18n {
+  /**
+   * Creates an instance of IBizI18n.
+   * @author tony001
+   * @date 2024-05-20 22:05:50
+   */
   constructor() {
+    /**
+     * html元素
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:58
+     * @protected
+     * @type {HTMLElement}
+     */
     __publicField(this, "html");
+    /**
+     * 默认语言
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:13
+     * @protected
+     * @type {string}
+     */
     __publicField(this, "defaultLang");
+    /**
+     * 语言资源映射表
+     *
+     * @author tony001
+     * @date 2024-05-20 22:05:38
+     * @protected
+     */
     __publicField(this, "langMap", /* @__PURE__ */ new Map());
     this.defaultLang = "zh-CN";
     this.html = document.querySelector("html");
@@ -56,7 +84,7 @@ class IBizI18n {
     });
   }
   /**
-   * 设置
+   * 设置语言
    *
    * @author chitanda
    * @date 2023-08-24 16:08:42
@@ -73,9 +101,26 @@ class IBizI18n {
       }
     });
   }
+  /**
+   * 获取语言
+   *
+   * @author tony001
+   * @date 2024-05-20 22:05:05
+   * @return {*}  {string}
+   */
   getLang() {
     return this.html.getAttribute("lang") || this.defaultLang;
   }
+  /**
+   * 格式化
+   *
+   * @author tony001
+   * @date 2024-05-20 22:05:44
+   * @param {unknown} tag
+   * @param {unknown} [defaultMsg]
+   * @param {unknown} [options]
+   * @return {*}  {string}
+   */
   t(tag, defaultMsg, options) {
     return i18n.global.t(
       tag,
@@ -83,6 +128,24 @@ class IBizI18n {
       options
     );
   }
+  /**
+   * 合并语言资源
+   * @param lang
+   * @param data
+   */
+  mergeLocaleMessage(dataOrLang, data) {
+    if (typeof dataOrLang === "string") {
+      const lang = dataOrLang;
+      i18n.global.mergeLocaleMessage(lang, data);
+    } else {
+      const langData = dataOrLang;
+      if (langData && Object.keys(langData).length > 0) {
+        Object.keys(langData).forEach((key) => {
+          i18n.global.mergeLocaleMessage(key, langData[key]);
+        });
+      }
+    }
+  }
 }
 const iBizI18n = new IBizI18n();
 

package/es/locale/zh-CN/index.d.ts

@@ -730,6 +730,7 @@ declare const _default: {
                 viewPlugin: string;
                 correspondViewTypeStyle: string;
                 toolbarItem: string;
+                acItem: string;
             };
         };
         service: {

package/es/locale/zh-CN/index.mjs

@@ -736,7 +736,8 @@ var index = {
         frontEndPluginNode: "\u627E\u4E0D\u5230\u754C\u9762\u903B\u8F91\u524D\u7AEF\u63D2\u4EF6\u8282\u70B9\uFF0C\u63D2\u4EF6{pluginKey}\u5BF9\u5E94\u7684\u9002\u914D\u5668",
         viewPlugin: "\u627E\u4E0D\u5230\u89C6\u56FE\u63D2\u4EF6{pluginKey}\u5BF9\u5E94\u7684\u9002\u914D\u5668",
         correspondViewTypeStyle: "\u627E\u4E0D\u5230\u89C6\u56FE\u7C7B\u578B\uFF1A[{viewType}]\u7684\u89C6\u56FE\u6837\u5F0F\uFF1A[{viewStyle}]\u5BF9\u5E94\u7684\u9002\u914D\u5668",
-        toolbarItem: "\u627E\u4E0D\u5230\u5DE5\u5177\u680F\u9879\u63D2\u4EF6{pluginKey}\u5BF9\u5E94\u7684\u9002\u914D\u5668"
+        toolbarItem: "\u627E\u4E0D\u5230\u5DE5\u5177\u680F\u9879\u63D2\u4EF6{pluginKey}\u5BF9\u5E94\u7684\u9002\u914D\u5668",
+        acItem: "\u627E\u4E0D\u5230\u81EA\u586B\u5217\u8868\u9879\u63D2\u4EF6{pluginKey}\u5BF9\u5E94\u7684\u9002\u914D\u5668"
       }
     },
     service: {

package/es/view-engine/edit-view.engine.mjs

@@ -97,7 +97,11 @@ class EditViewEngine extends ViewEngineBase {
     };
     this.form.evt.on("onLoadSuccess", (event) => {
       formDataStateChange(event);
-      this.view.state.srfactiveviewdata = event.data[0];
+      const data = event.data[0];
+      this.view.state.srfactiveviewdata = data;
+      if (data.srfreadonly) {
+        this.view.context.srfreadonly = true;
+      }
       evt.emit("onDataChange", { ...event, actionType: "LOAD" });
     });
     this.form.evt.on("onLoadDraftSuccess", (event) => {

package/es/view-engine/opt-view.engine.mjs

@@ -64,7 +64,11 @@ class OptViewEngine extends ViewEngineBase {
       }
     };
     this.form.evt.on("onLoadSuccess", (event) => {
-      this.view.state.srfactiveviewdata = event.data[0];
+      const data = event.data[0];
+      this.view.state.srfactiveviewdata = data;
+      if (data.srfreadonly) {
+        this.view.context.srfreadonly = true;
+      }
       formDataStateChange(event);
     });
     this.form.evt.on("onLoadDraftSuccess", (event) => {

package/lib/control/drbar/drbar.cjs

@@ -150,13 +150,14 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
     const {
       isCreated,
       drBarItems,
-      selectedItem
+      selectedItem,
+      isCalculatedPermission
     } = this.c.state;
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "controller": this.c,
       "class": this.ns.b()
     }, {
-      default: () => [isCreated && vue.createVNode(vue.resolveComponent("el-menu"), {
+      default: () => [isCreated && isCalculatedPermission && vue.createVNode(vue.resolveComponent("el-menu"), {
         "class": this.ns.e("menu"),
         "mode": this.showMode,
         "default-active": selectedItem,

package/lib/control/drbar/drbar.controller.cjs

@@ -119,6 +119,78 @@ class DRBarController extends runtime.ControlController {
     this.initDRBarItems();
     await this.initCounter();
   }
+  /**
+   * 通过计数器数据，计算项状态
+   *
+   * @author zhanghengfeng
+   * @date 2024-05-16 18:05:14
+   * @param {IData} [_data]
+   * @param {boolean} [reset=true]
+   */
+  calcItemStateByCounter(_data, reset = true) {
+    this.state.drBarItems.forEach((item) => {
+      var _a;
+      if ((_a = item.children) == null ? void 0 : _a.length) {
+        item.children.forEach((childItem) => {
+          const visible = runtime.calcItemVisibleByCounter(childItem, this.counter);
+          if (visible !== void 0) {
+            childItem.visible = visible;
+          }
+        });
+        item.visible = item.children.some((childItem) => childItem.visible);
+      } else {
+        const visible = runtime.calcItemVisibleByCounter(item, this.counter);
+        if (visible !== void 0) {
+          item.visible = visible;
+        }
+      }
+    });
+    if (this.state.selectedItem && reset) {
+      const { visible, defaultVisibleItem } = this.getItemVisibleState(
+        this.state.selectedItem
+      );
+      if (!visible && defaultVisibleItem) {
+        this.handleSelectChange(defaultVisibleItem.tag);
+      }
+    }
+  }
+  /**
+   * 获取对应项的显示状态
+   *
+   * @author zhanghengfeng
+   * @date 2024-05-16 17:05:15
+   * @param {string} key
+   * @return {*}  {{
+   *     visible: boolean;
+   *     defaultVisibleItem?: IDRBarItemsState;
+   *   }}
+   */
+  getItemVisibleState(key) {
+    let visible = true;
+    let defaultVisibleItem;
+    this.state.drBarItems.forEach((item) => {
+      if (item.children) {
+        if (!defaultVisibleItem) {
+          defaultVisibleItem = item.children.find((child) => child.visible);
+        }
+        const drBarItem = item.children.find((child) => child.tag === key);
+        if (drBarItem) {
+          visible = !!drBarItem.visible;
+        }
+      } else {
+        if (!defaultVisibleItem && item.visible) {
+          defaultVisibleItem = item;
+        }
+        if (item.tag === key) {
+          visible = !!item.visible;
+        }
+      }
+    });
+    return {
+      visible,
+      defaultVisibleItem
+    };
+  }
   /**
    * 计算关系界面组权限
    *
@@ -126,16 +198,19 @@ class DRBarController extends runtime.ControlController {
    * @memberof DRBarController
    */
   async calcPermitted(item) {
+    var _a;
     let permitted = true;
-    if (item.dataAccessAction) {
-      const app = await ibiz.hub.getApp(this.context.srfappid);
-      const data = this.getData().length > 0 ? this.getData()[0] : void 0;
-      permitted = await app.authority.calcByDataAccessAction(
-        item.dataAccessAction,
-        this.context,
-        data,
-        this.model.appDataEntityId
-      );
+    const data = ((_a = this.getData()) == null ? void 0 : _a.length) ? this.getData()[0] : void 0;
+    const visible = await runtime.calcItemVisible(
+      item,
+      this.context,
+      this.params,
+      this.model.appDataEntityId,
+      this.model.appId,
+      data
+    );
+    if (visible !== void 0) {
+      permitted = visible;
     }
     item.visible = permitted;
   }
@@ -161,6 +236,8 @@ class DRBarController extends runtime.ControlController {
         }
       })
     );
+    this.calcItemStateByCounter({}, false);
+    this.state.isCalculatedPermission = true;
   }
   /**
    * 加载完成
@@ -172,7 +249,11 @@ class DRBarController extends runtime.ControlController {
     await super.onMounted();
     if (this.form) {
       this.form.evt.on("onLoadSuccess", async (event) => {
-        this.view.state.srfactiveviewdata = event.data[0];
+        const data = event.data[0];
+        this.view.state.srfactiveviewdata = data;
+        if (data.srfreadonly) {
+          this.view.context.srfreadonly = true;
+        }
         await this.calcDrBarItemsState();
         this.handleFormChange();
         this.doDefaultSelect();
@@ -252,6 +333,7 @@ class DRBarController extends runtime.ControlController {
       if (item.capLanguageRes) {
         itemCaption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
       }
+      const { enableMode, testAppDELogicId, testScriptCode } = item;
       return {
         tag: item.id,
         caption: itemCaption,
@@ -260,7 +342,10 @@ class DRBarController extends runtime.ControlController {
         counterId: item.counterId,
         visible: false,
         // 默认不显示
-        dataAccessAction: item.dataAccessAction || void 0
+        dataAccessAction: item.dataAccessAction || void 0,
+        enableMode,
+        testAppDELogicId,
+        testScriptCode
       };
     };
     if (dedrbarGroups && dedrctrlItems) {
@@ -423,7 +508,13 @@ class DRBarController extends runtime.ControlController {
     }
     if (key) {
       const isRoutePushed = !!this.routeDepth && runtime.hasSubRoute(this.routeDepth);
-      this.handleSelectChange(key, isRoutePushed);
+      const { visible, defaultVisibleItem } = this.getItemVisibleState(key);
+      if (!visible && defaultVisibleItem) {
+        key = defaultVisibleItem.tag;
+        this.handleSelectChange(key);
+      } else {
+        this.handleSelectChange(key, isRoutePushed);
+      }
       this.state.defaultItem = key;
     }
   }
@@ -443,6 +534,8 @@ class DRBarController extends runtime.ControlController {
         this.context,
         { ...this.params }
       );
+      this.calcItemStateByCounter = this.calcItemStateByCounter.bind(this);
+      this.counter.onChange(this.calcItemStateByCounter);
     }
   }
   /**
@@ -456,6 +549,7 @@ class DRBarController extends runtime.ControlController {
   async onDestroyed() {
     await super.onDestroyed();
     if (this.counter) {
+      this.counter.offChange(this.calcItemStateByCounter);
       this.counter.destroy();
     }
   }

package/lib/control/drtab/drtab.cjs

@@ -96,13 +96,14 @@ const DRTabControl = /* @__PURE__ */ vue.defineComponent({
     let _slot;
     const {
       isCreated,
-      drTabPages
+      drTabPages,
+      isCalculatedPermission
     } = this.c.state;
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "controller": this.c,
       "class": this.ns.b()
     }, {
-      default: () => [isCreated && vue.createVNode(vue.resolveComponent("el-tabs"), {
+      default: () => [isCreated && isCalculatedPermission && vue.createVNode(vue.resolveComponent("el-tabs"), {
         "modelValue": this.c.state.activeName,
         "onUpdate:modelValue": ($event) => this.c.state.activeName = $event,
         "onTabChange": this.handleTabChange