@ibiz-template/vue3-components 0.7.16-alpha.0 → 0.7.17-alpha.0

package/es/panel-component/user-action/user-action.mjs

@@ -37,7 +37,7 @@ const UserAction = /* @__PURE__ */ defineComponent({
         sysImage = imgConfig[predefinedType];
       }
     }
-    const onClick = async () => {
+    const onClick = async (event) => {
       const id = props.modelData.id;
       const menuC = c.panel.view.getController("appmenu");
       if (menuC) {
@@ -54,7 +54,9 @@ const UserAction = /* @__PURE__ */ defineComponent({
           const tempContext = c.panel.context.clone();
           const tempParam = c.panel.params;
           tempContext.srfappid = targetMenu.appId || ibiz.env.appId;
-          await ibiz.commands.execute(AppFuncCommand.TAG, targetMenu.appFuncId, tempContext, tempParam, {});
+          await ibiz.commands.execute(AppFuncCommand.TAG, targetMenu.appFuncId, tempContext, tempParam, {
+            event
+          });
         }
       }
     };
@@ -68,7 +70,7 @@ const UserAction = /* @__PURE__ */ defineComponent({
   render() {
     return createVNode("div", {
       "class": this.ns.b(),
-      "onClick": this.onClick,
+      "onClick": (event) => this.onClick(event),
       "title": this.modelData.caption
     }, [createVNode(resolveComponent("i-biz-icon"), {
       "class": [this.ns.e("image")],

package/es/util/app-util/app-util.d.ts

@@ -1,5 +1,5 @@
 import { Router } from 'vue-router';
-import { IAppUtil } from '@ibiz-template/runtime';
+import { IAppUtil, IAuthResult } from '@ibiz-template/runtime';
 export declare class AppUtil implements IAppUtil {
     protected router: Router;
     /**
@@ -41,7 +41,7 @@ export declare class AppUtil implements IAppUtil {
      * @param {(IData | undefined)} [opts]
      * @return {*}  {Promise<boolean>}
      */
-    changePwd(oldPwd: string, newPwd: string, opts?: IData | undefined): Promise<boolean>;
+    changePwd(oldPwd: string, newPwd: string, opts?: IData | undefined): Promise<IAuthResult>;
     /**
      * 切换组织
      *

package/es/util/app-util/app-util.mjs

@@ -47,9 +47,10 @@ class AppUtil {
         window.history.replaceState({}, "", href);
       }
       await this.router.push(
-        "/login?ru=".concat(encodeURIComponent(
-          window.location.hash.replace("#/", "/")
-        ))
+        // `/login?ru=${encodeURIComponent(
+        //   window.location.hash.replace('#/', '/'),
+        // )}`,
+        "/login"
       );
       ibiz.util.showAppLoading();
       window.location.reload();
@@ -67,11 +68,11 @@ class AppUtil {
    * @return {*}  {Promise<boolean>}
    */
   async changePwd(oldPwd, newPwd, opts) {
-    let bol = this.validatePwd(oldPwd, newPwd, opts);
-    if (bol) {
-      bol = await ibiz.auth.changePwd(oldPwd, newPwd);
+    if (this.validatePwd(oldPwd, newPwd, opts)) {
+      const result = await ibiz.auth.changePwd(oldPwd, newPwd);
+      return result;
     }
-    return bol;
+    return { ok: false, result: {} };
   }
   /**
    * 切换组织

package/lib/editor/autocomplete/autocomplete-editor.controller.cjs

@@ -38,6 +38,14 @@ class AutoCompleteEditorController extends runtime.EditorController {
      * 自填数据项集合（已排除了value和text)
      */
     __publicField(this, "dataItems", []);
+    /**
+     * 自填列表项适配器
+     *
+     * @author zhanghengfeng
+     * @date 2024-05-21 17:05:21
+     * @type {IAcItemProvider}
+     */
+    __publicField(this, "acItemProvider");
   }
   async onInit() {
     super.onInit();
@@ -72,6 +80,9 @@ class AutoCompleteEditorController extends runtime.EditorController {
               }
             );
           }
+          if (this.deACMode.itemSysPFPluginId) {
+            this.acItemProvider = await runtime.getAcItemProvider(this.deACMode);
+          }
         }
       }
     }

package/lib/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.cjs

@@ -183,6 +183,13 @@ const IBizAutoComplete = /* @__PURE__ */ vue.defineComponent({
       default: ({
         item
       }) => {
+        if (this.c.acItemProvider) {
+          const component = vue.resolveComponent(this.c.acItemProvider.component);
+          return vue.h(component, {
+            item,
+            controller: this.c
+          });
+        }
         return vue.createVNode("div", {
           "class": [this.ns.e("transfer-item"), this.ns.is("ellipsis", isEllipsis)],
           "title": isEllipsis ? item[this.c.textName] : ""

package/lib/editor/data-picker/ibiz-mpicker/ibiz-mpicker.cjs

@@ -310,7 +310,18 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
         "key": item[this.c.keyName],
         "value": item[this.c.keyName],
         "label": item[this.c.textName]
-      }, null);
+      }, {
+        default: () => {
+          if (this.c.acItemProvider) {
+            const component = vue.resolveComponent(this.c.acItemProvider.component);
+            return vue.h(component, {
+              item,
+              controller: this.c
+            });
+          }
+          return vue.createVNode("span", null, [item[this.c.textName] != null ? item[this.c.textName] : ""]);
+        }
+      });
     })) ? _slot : {
       default: () => [_slot]
     }), !this.readonly && vue.createVNode("div", {

package/lib/editor/data-picker/ibiz-picker/ibiz-picker.cjs

@@ -207,6 +207,16 @@ const IBizPicker = /* @__PURE__ */ vue.defineComponent({
         context,
         params
       } = this.c;
+      if (this.c.acItemProvider) {
+        const component = vue.resolveComponent(this.c.acItemProvider.component);
+        return vue.h(component, {
+          item,
+          controller: this.c,
+          onClick: () => {
+            this.onACSelect(item);
+          }
+        });
+      }
       return panel ? vue.createVNode(vue.resolveComponent("iBizControlShell"), {
         "data": item,
         "modelData": panel,

package/lib/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.cjs

@@ -242,7 +242,18 @@ const IBizPickerDropDown = /* @__PURE__ */ vue.defineComponent({
         "value": item[this.c.keyName],
         "key": item[this.c.keyName],
         "label": item[this.c.textName]
-      }, null);
+      }, {
+        default: () => {
+          if (this.c.acItemProvider) {
+            const component = vue.resolveComponent(this.c.acItemProvider.component);
+            return vue.h(component, {
+              item,
+              controller: this.c
+            });
+          }
+          return vue.createVNode("span", null, [item[this.c.textName] != null ? item[this.c.textName] : ""]);
+        }
+      });
     })) ? _slot : {
       default: () => [_slot]
     });

package/lib/editor/data-picker/picker-editor.controller.cjs

@@ -68,6 +68,14 @@ class PickerEditorController extends runtime.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;
@@ -105,6 +113,9 @@ class PickerEditorController extends runtime.EditorController {
               }
             );
           }
+          if (this.deACMode.itemSysPFPluginId) {
+            this.acItemProvider = await runtime.getAcItemProvider(this.deACMode);
+          }
         }
       }
     }

package/lib/editor/list-box/ibiz-list-box/ibiz-list-box.cjs

@@ -168,9 +168,19 @@ const IBizListBox = /* @__PURE__ */ vue.defineComponent({
       "label": item.value,
       "disabled": this.disabled || this.readonly || item.disableSelect === true
     }, {
-      default: () => [vue.createVNode("span", {
-        "class": this.ns.e("text")
-      }, [item.text])]
+      default: () => {
+        const c = this.controller;
+        if (c.acItemProvider) {
+          const component = vue.resolveComponent(c.acItemProvider.component);
+          return vue.h(component, {
+            item,
+            controller: c
+          });
+        }
+        return vue.createVNode("span", {
+          "class": this.ns.e("text")
+        }, [item.text]);
+      }
     }))) ? _slot : {
       default: () => [_slot]
     }) : vue.createVNode(vue.resolveComponent("el-radio-group"), vue.mergeProps({
@@ -184,9 +194,19 @@ const IBizListBox = /* @__PURE__ */ vue.defineComponent({
         this.onSelectArrayChange(item.value);
       }
     }, {
-      default: () => [vue.createVNode("span", {
-        "class": this.ns.e("text")
-      }, [item.text])]
+      default: () => {
+        const c = this.controller;
+        if (c.acItemProvider) {
+          const component = vue.resolveComponent(c.acItemProvider.component);
+          return vue.h(component, {
+            item,
+            controller: c
+          });
+        }
+        return vue.createVNode("span", {
+          "class": this.ns.e("text")
+        }, [item.text]);
+      }
     }))) ? _slot2 : {
       default: () => [_slot2]
     })]);

package/lib/editor/list-box/list-box-picker-editor.controller.cjs

@@ -26,6 +26,22 @@ class ListBoxPickerEditorController extends runtime.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();
@@ -33,6 +49,18 @@ class ListBoxPickerEditorController extends runtime.EditorController {
       if (this.model.appDEDataSetId) {
         this.interfaceName = this.model.appDEDataSetId;
       }
+      if (this.model.appDataEntityId && this.model.appDEACModeId) {
+        this.deACMode = await runtime.getDeACMode(
+          this.model.appDEACModeId,
+          this.model.appDataEntityId,
+          this.context.srfappid
+        );
+        if (this.deACMode) {
+          if (this.deACMode.itemSysPFPluginId) {
+            this.acItemProvider = await runtime.getAcItemProvider(this.deACMode);
+          }
+        }
+      }
     }
   }
   /**