@ibiz-template/vue3-util 0.4.3 → 0.4.5

package/src/panel-component/panel-container-group/panel-container-group.tsx

@@ -0,0 +1,112 @@
+import { IPanelContainer } from '@ibiz/model-core';
+import { computed, defineComponent, PropType, ref, VNode } from 'vue';
+import { PanelContainerGroupController } from './panel-container-group.controller';
+import './panel-container-group.scss';
+import { useNamespace } from '../../use';
+
+export const PanelContainerGroup = defineComponent({
+  name: 'IBizPanelContainerGroup',
+  props: {
+    modelData: {
+      type: Object as PropType<IPanelContainer>,
+      required: true,
+    },
+    controller: {
+      type: PanelContainerGroupController,
+      required: true,
+    },
+  },
+  setup(props) {
+    const ns = useNamespace('panel-container-group');
+
+    const isCollapse = ref(!props.controller.defaultExpansion);
+
+    const changeCollapse = (): void => {
+      if (!props.controller.disableClose) {
+        isCollapse.value = !isCollapse.value;
+      }
+    };
+
+    const captionText = computed(() => {
+      const { captionItemName, caption, capLanguageRes } = props.modelData;
+      if (captionItemName) {
+        return props.controller.data[captionItemName];
+      }
+      let text = caption;
+      if (capLanguageRes) {
+        text = ibiz.i18n.t(capLanguageRes.lanResTag!, caption);
+      }
+      return text;
+    });
+
+    return { ns, captionText, changeCollapse, isCollapse };
+  },
+  render() {
+    const classArr: string[] = [
+      this.ns.b(),
+      this.ns.m(this.modelData.id),
+      ...this.controller.containerClass,
+      this.ns.is('hidden', !this.controller.state.visible),
+    ];
+    if (this.modelData.showCaption === true) {
+      classArr.push(this.ns.m('show-header'));
+      classArr.push(this.ns.b('collapse'));
+      classArr.push(this.ns.is('collapse', this.isCollapse));
+      if (this.controller.disableClose) {
+        classArr.push(this.ns.bm('collapse', 'disable-close'));
+      }
+    }
+
+    // 内容区默认插槽处理，封装app-col
+    const defaultSlots: VNode[] = this.$slots.default?.() || [];
+    const content = (
+      <iBizRow slot='content' layout={this.modelData.layout}>
+        {defaultSlots.map(slot => {
+          const props = slot.props as IData;
+          if (!props || !props.controller) {
+            return slot;
+          }
+
+          return (
+            <iBizCol
+              layoutPos={props.modelData.layoutPos}
+              state={props.controller.state}
+            >
+              {slot}
+            </iBizCol>
+          );
+        })}
+      </iBizRow>
+    );
+
+    // 头部绘制
+    let header: unknown = null;
+    if (this.modelData.showCaption) {
+      header = (
+        <div class={[this.ns.b('header')]} onClick={this.changeCollapse}>
+          <div class={[this.ns.be('header', 'left')]}>
+            <div class={[this.ns.e('caption'), ...this.controller.labelClass]}>
+              {this.captionText}
+            </div>
+          </div>
+          <div class={[this.ns.be('header', 'right')]}>
+            {this.modelData.titleBarCloseMode !== undefined &&
+              this.modelData.titleBarCloseMode !== 0 &&
+              (this.isCollapse ? (
+                <ion-icon name='caret-forward-sharp' />
+              ) : (
+                <ion-icon name='caret-down-sharp' />
+              ))}
+          </div>
+        </div>
+      );
+    }
+
+    return (
+      <div class={classArr}>
+        {header}
+        <div class={[this.ns.b('content')]}>{content}</div>
+      </div>
+    );
+  },
+});

package/src/panel-component/panel-rawitem/index.ts

@@ -13,6 +13,14 @@ export const IBizPanelRawItem = withInstall(PanelRawItem, function (v: App) {
     'RAWITEM_STATIC_IMAGE',
     () => new PanelRawItemProvider(),
   );
+  registerPanelItemProvider(
+    'RAWITEM_STATIC_LABEL',
+    () => new PanelRawItemProvider(),
+  );
+  registerPanelItemProvider(
+    'RAWITEM_STATIC_TEXT',
+    () => new PanelRawItemProvider(),
+  );
 });
 
 export default IBizPanelRawItem;

package/src/panel-component/panel-tab-page/index.ts

@@ -0,0 +1,12 @@
+import { registerPanelItemProvider } from '@ibiz-template/runtime';
+import { App } from 'vue';
+import { PanelTabPage } from './panel-tab-page';
+import { PanelTabPageProvider } from './panel-tab-page.provider';
+import { withInstall } from '../../util';
+
+export const IBizPanelTabPage = withInstall(PanelTabPage, function (v: App) {
+  v.component(PanelTabPage.name, PanelTabPage);
+  registerPanelItemProvider('TABPAGE', () => new PanelTabPageProvider());
+});
+
+export default IBizPanelTabPage;

package/src/panel-component/panel-tab-page/panel-tab-page.provider.ts

@@ -0,0 +1,27 @@
+import {
+  IPanelItemProvider,
+  PanelController,
+  PanelItemController,
+} from '@ibiz-template/runtime';
+import { IPanelItem } from '@ibiz/model-core';
+
+/**
+ * 面板分页适配器
+ *
+ * @export
+ * @class PanelTabPageController
+ * @implements {IPanelItemProvider}
+ */
+export class PanelTabPageProvider implements IPanelItemProvider {
+  component: string = 'IBizPanelTabPage';
+
+  async createController(
+    panelItem: IPanelItem,
+    panel: PanelController,
+    parent: PanelItemController | undefined,
+  ): Promise<PanelItemController> {
+    const c = new PanelItemController(panelItem, panel, parent);
+    await c.init();
+    return c;
+  }
+}

package/src/panel-component/panel-tab-page/panel-tab-page.tsx

@@ -0,0 +1,55 @@
+import { computed, defineComponent, PropType, VNode } from 'vue';
+import { IPanelContainer } from '@ibiz/model-core';
+import { PanelItemController } from '@ibiz-template/runtime';
+import { useNamespace } from '../../use';
+
+export const PanelTabPage = defineComponent({
+  name: 'IBizPanelTabPage',
+  props: {
+    modelData: {
+      // IPanelTabPage 不能使用 IPanelTabPage模型 否则会类型报错
+      type: Object as PropType<IPanelContainer>,
+      required: true,
+    },
+    controller: {
+      type: PanelItemController,
+      required: true,
+    },
+  },
+  setup(props) {
+    const ns = useNamespace('panel-tab-page');
+    // 类名控制
+    const classArr = computed(() => {
+      const { id } = props.modelData;
+      const result: Array<string | false> = [ns.b(), ns.m(id)];
+      result.push(...props.controller.containerClass);
+      return result;
+    });
+    return {
+      ns,
+      classArr,
+    };
+  },
+  render() {
+    const defaultSlots: VNode[] = this.$slots.default?.() || [];
+    return (
+      <iBizRow
+        class={[this.ns.b(), this.ns.m(this.modelData.codeName), this.classArr]}
+        layout={this.modelData.layout}
+      >
+        {defaultSlots.map(slot => {
+          const props = slot.props as IData;
+          if (!props || !props.controller) {
+            return slot;
+          }
+          const c = props.controller;
+          return (
+            <iBizCol layoutPos={c.model.layoutPos} state={c.state}>
+              {slot}
+            </iBizCol>
+          );
+        })}
+      </iBizRow>
+    );
+  },
+});

package/src/plugin/plugin-factory/plugin-factory.ts

@@ -37,15 +37,6 @@ export class PluginFactory implements IPluginFactory {
    */
   protected cache: Map<string, boolean> = new Map();
 
-  /**
-   * 本地开发测试包，只在本地开发生效
-   *
-   * @author chitanda
-   * @date 2022-11-02 21:11:41
-   * @protected
-   */
-  protected devPackages: Map<string, () => Promise<unknown>> = new Map();
-
   /**
    * 插件缓存
    *
@@ -76,6 +67,55 @@ export class PluginFactory implements IPluginFactory {
    */
   protected predefinedPlugins: Map<string, IPluginItem> = new Map();
 
+  /**
+   * 忽略加载的插件规则，支持正则。配配规则为插件包地址，如：@ibiz-template-vue/vue3-plugin-*
+   *
+   * @author chitanda
+   * @date 2023-12-04 15:12:58
+   * @protected
+   * @type {((string | RegExp)[])}
+   */
+  protected ignoreRules: (string | RegExp)[] = [];
+
+  /**
+   * 插件加载队列
+   *
+   * @author chitanda
+   * @date 2023-12-05 16:12:04
+   * @protected
+   * @type {Map<string, Promise<boolean>>}
+   */
+  protected loadQueue: Map<string, Promise<boolean>> = new Map();
+
+  /**
+   * 是否忽略插件加载
+   *
+   * @author chitanda
+   * @date 2023-12-04 16:12:48
+   * @protected
+   * @param {string} pluginPath
+   * @return {*}  {boolean}
+   */
+  protected isIgnore(pluginPath: string): boolean {
+    return this.ignoreRules.some(rule => {
+      if (typeof rule === 'string') {
+        return pluginPath === rule;
+      }
+      return rule.test(pluginPath);
+    });
+  }
+
+  /**
+   * 设置本地开发忽略远程加载的插件
+   *
+   * @author chitanda
+   * @date 2023-12-04 17:12:49
+   * @param {(string | RegExp)} rule
+   */
+  setDevIgnore(rule: string | RegExp): void {
+    this.ignoreRules.push(rule);
+  }
+
   /**
    * 注册视图默认插件
    *
@@ -132,18 +172,6 @@ export class PluginFactory implements IPluginFactory {
     });
   }
 
-  /**
-   * 设置开发插件，用于本地调试
-   *
-   * @author chitanda
-   * @date 2022-11-02 21:11:56
-   * @param {string} name
-   * @param {() => Promise<unknown>} fn
-   */
-  setDevPlugin(name: string, fn: () => Promise<unknown>): void {
-    this.devPackages.set(name, fn);
-  }
-
   /**
    * 加载插件
    *
@@ -156,13 +184,35 @@ export class PluginFactory implements IPluginFactory {
     if (plugin.runtimeObject === true) {
       const pluginRef = plugin as unknown as IAppPFPluginRef;
       if (pluginRef) {
+        const rtObjectName = pluginRef.rtobjectName!;
+        const rtObjectRepo = pluginRef.rtobjectRepo!;
+        if (this.isIgnore(rtObjectRepo)) {
+          return true;
+        }
+        if (this.pluginCache.has(rtObjectName)) {
+          return true;
+        }
+        if (this.loadQueue.has(rtObjectRepo)) {
+          const p = await this.loadQueue.get(rtObjectRepo)!;
+          try {
+            const result = await p;
+            return result;
+          } catch (error) {
+            return false;
+          }
+        }
         try {
-          await this.loadPluginRef(
+          const p = this.loadPluginRef(
             pluginRef.rtobjectName!,
             pluginRef.rtobjectRepo!,
           );
+          this.loadQueue.set(rtObjectRepo, p);
+          const result = await p;
+          return result;
         } catch (error) {
           throw new RuntimeModelError(pluginRef, `配置加载失败`);
+        } finally {
+          this.loadQueue.delete(rtObjectRepo);
         }
       }
     }
@@ -181,14 +231,14 @@ export class PluginFactory implements IPluginFactory {
     rtObjectName: string,
     rtObjectRepo: string,
   ): Promise<boolean> {
+    if (this.isIgnore(rtObjectRepo)) {
+      return true;
+    }
     if (this.pluginCache.has(rtObjectName)) {
       return true;
     }
     let configData: unknown = null;
-    const fn = this.devPackages.get(rtObjectName);
-    if (fn) {
-      configData = await fn();
-    } else {
+    {
       const pluginPath: string = rtObjectRepo;
       const configUrl = this.urlReg.test(pluginPath)
         ? `${pluginPath}/package.json`
@@ -231,17 +281,9 @@ export class PluginFactory implements IPluginFactory {
    */
   protected async loadScript(remotePlugin: RemotePluginItem): Promise<void> {
     const pluginPath: string = remotePlugin.repo;
-    const { name, version, system, module, styles } = remotePlugin.config;
+    const { name, system, styles = [] } = remotePlugin.config;
     let scriptUrl = '';
-    if (this.devPackages.has(name)) {
-      scriptUrl = join(`${name}@${version}`, module);
-    } else if (ibiz.env.dev) {
-      scriptUrl = this.urlReg.test(pluginPath)
-        ? `${pluginPath}/${join(module)}`
-        : `${ibiz.env.pluginBaseUrl}/${pluginPath}/${join(module)}`;
-    } else {
-      scriptUrl = join(pluginPath, system);
-    }
+    scriptUrl = join(pluginPath, system);
     if (scriptUrl) {
       if (this.cache.has(scriptUrl)) {
         return;
@@ -251,26 +293,16 @@ export class PluginFactory implements IPluginFactory {
       const styleUrls = (typeof styles === 'string' ? [styles] : styles).map(
         styleUrl => this.parseUrl(path.join(pluginPath, styleUrl)),
       );
-      // 本地开发模式下的包引用加载
-      if (this.devPackages.has(name)) {
-        const fn = this.devPackages.get(name)!;
+      System.addImportMap({
+        imports: {
+          [name]: url,
+        },
+        styles: {
+          [name]: styleUrls,
+        },
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        data = (await fn()) as any;
-        this.cache.set(scriptUrl, true);
-      } else if (ibiz.env.dev) {
-        data = await import(/* @vite-ignore */ scriptUrl);
-      } else {
-        System.addImportMap({
-          imports: {
-            [name]: url,
-          },
-          styles: {
-            [name]: styleUrls,
-          },
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        } as any);
-        data = await System.import(name);
-      }
+      } as any);
+      data = await System.import(name);
       if (data) {
         if (data.default) {
           this.setPluginCode(data.default);