@ibiz-template/vue3-components 0.3.2 → 0.3.3

package/lib/common/data-import/data-import.cjs

@@ -16,6 +16,10 @@ const DataImport = /* @__PURE__ */ vue.defineComponent({
     appDataEntity: {
       type: Object,
       required: true
+    },
+    dataImport: {
+      type: Object,
+      required: false
     }
   },
   setup(props) {
@@ -40,14 +44,14 @@ const DataImport = /* @__PURE__ */ vue.defineComponent({
       isLoading.value = true;
       try {
         if (ibiz.env.enableMqtt) {
-          runtime.asyncImportData(selectedFile, props.appDataEntity);
+          runtime.asyncImportData(selectedFile, props.appDataEntity, props.dataImport);
           ibiz.notification.info({
             desc: "\u5F00\u59CB\u5BFC\u5165\uFF0C\u8BE6\u7EC6\u8FDB\u5EA6\u548C\u7ED3\u679C\u8BF7\u770B\u5E94\u7528\u901A\u77E5"
           });
           onCancelButtonClick();
           return;
         }
-        result = await runtime.importData(selectedFile, props.appDataEntity);
+        result = await runtime.importData(selectedFile, props.appDataEntity, props.dataImport);
         ibiz.mc.command.send({
           srfdecodename: props.appDataEntity.codeName
         }, "OBJECTCREATED");
@@ -66,13 +70,16 @@ const DataImport = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const onLinkClick = async () => {
-      var _a;
-      const templateUrl = `${props.appDataEntity.codeName2.toLowerCase()}/importtemplate`;
+      var _a, _b;
+      let templateUrl = `${props.appDataEntity.codeName2.toLowerCase()}/importtemplate`;
+      if ((_a = props.dataImport) == null ? void 0 : _a.codeName) {
+        templateUrl += `?srfimporttag=${props.dataImport.codeName}`;
+      }
       const res = await ibiz.net.request(templateUrl, {
         responseType: "blob"
       });
       if (res.status === 200) {
-        let fileName = ((_a = res.headers["content-disposition"].split(";").find((str) => str.indexOf("filename=") !== -1)) == null ? void 0 : _a.slice(9)) || "";
+        let fileName = ((_b = res.headers["content-disposition"].split(";").find((str) => str.indexOf("filename=") !== -1)) == null ? void 0 : _b.slice(9)) || "";
         fileName = decodeURIComponent(fileName);
         const blob = new Blob([res.data], {
           type: "application/vnd.ms-excel"

package/lib/control/form/form/form.cjs

@@ -6,6 +6,9 @@ var vue3Util = require('@ibiz-template/vue3-util');
 require('./form.css');
 
 "use strict";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
+}
 const FormControl = /* @__PURE__ */ vue.defineComponent({
   name: "IBizFormControl",
   props: {
@@ -79,23 +82,44 @@ const FormControl = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
+    const {
+      state,
+      model,
+      controlPanel
+    } = this.c;
+    const {
+      isCreated
+    } = state;
+    const slots = {};
+    if (isCreated) {
+      if (this.$slots.default) {
+        slots.default = () => {
+          return this.$slots.default({
+            ...this.slotProps
+          });
+        };
+      } else {
+        const key = this.c.controlPanel ? model.name : "default";
+        slots[key] = () => {
+          return vue.createVNode(vue.resolveComponent("iBizFormPage"), {
+            "modelData": this.c.model,
+            "controller": this.c
+          }, {
+            default: () => {
+              var _a;
+              return [(_a = this.c.model.deformPages) == null ? void 0 : _a.map((page) => {
+                return this.renderByDetailType(page);
+              })];
+            }
+          });
+        };
+      }
+    }
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "class": [this.ns.b()],
       "controller": this.c
-    }, {
-      default: () => [this.c.state.isCreated && [this.$slots.default ? this.$slots.default({
-        ...this.slotProps
-      }) : vue.createVNode(vue.resolveComponent("iBizFormPage"), {
-        "modelData": this.c.model,
-        "controller": this.c
-      }, {
-        default: () => {
-          var _a;
-          return [(_a = this.c.model.deformPages) == null ? void 0 : _a.map((page) => {
-            return this.renderByDetailType(page);
-          })];
-        }
-      }), this.$slots.searchButtons && this.$slots.searchButtons({})]]
+    }, _isSlot(slots) ? slots : {
+      default: () => [slots]
     });
   }
 });

package/lib/control/form/search-form/search-form.cjs

@@ -52,40 +52,11 @@ const SearchFormControl = /* @__PURE__ */ vue.defineComponent({
       return;
     }
     return vue.createVNode(vue.resolveComponent("iBizFormControl"), {
-      "class": [this.ns.b(), this.ns.is("btn-bottom", this.c.model.searchButtonPos === "BOTTOM")],
+      "class": [this.ns.b()],
       "controller": this.c,
       "onKeyup": (e) => this.c.onKeyUp(e)
     }, {
-      ...this.$slots,
-      searchButtons: () => {
-        if (this.c.model.searchButtonStyle === "NONE") {
-          return;
-        }
-        return vue.createVNode("div", {
-          "class": this.ns.b("buttons")
-        }, [this.c.model.searchButtonStyle === "SEARCHONLY" ? vue.createVNode(vue.resolveComponent("el-button"), {
-          "onClick": () => this.c.onSearchButtonClick()
-        }, {
-          default: () => [vue.createTextVNode("\u641C\u7D22")]
-        }) : vue.createVNode(vue.resolveComponent("el-dropdown"), {
-          "split-button": true,
-          "type": "primary",
-          "onClick": () => this.c.onSearchButtonClick()
-        }, {
-          default: () => vue.createVNode("span", {
-            "class": this.ns.b("label")
-          }, [vue.createTextVNode("\u641C\u7D22")]),
-          dropdown: () => {
-            return vue.createVNode(vue.resolveComponent("el-dropdown-menu"), null, {
-              default: () => [vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
-                "onClick": () => this.c.reset()
-              }, {
-                default: () => [vue.createTextVNode("\u91CD\u7F6E")]
-              })]
-            });
-          }
-        })]);
-      }
+      ...this.$slots
     });
   }
 });

package/lib/control/form/search-form/search-form.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-control-searchform-buttons{display:flex;align-items:center;justify-content:flex-end;flex-shrink:0;height:100%;margin-top:var(--ibiz-spacing-tight);margin-left:var(--ibiz-spacing-tight);text-align:right}.ibiz-control-searchform{--ibiz-control-searchform-bg-color:transparent;--ibiz-control-searchform-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);display:flex;padding:var(--ibiz-control-searchform-padding);background-color:var(--ibiz-control-searchform-bg-color)}.ibiz-control-searchform>.ibiz-form-page{flex-grow:1}.ibiz-control-searchform.is-btn-bottom{flex-direction:column}
+@charset "UTF-8";.ibiz-control-searchform-buttons{display:flex;align-items:center;justify-content:flex-end;flex-shrink:0;height:100%;margin-top:var(--ibiz-spacing-tight);margin-left:var(--ibiz-spacing-tight);text-align:right}.ibiz-control-searchform{--ibiz-control-searchform-bg-color:transparent;--ibiz-control-searchform-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);display:flex;padding:var(--ibiz-control-searchform-padding);background-color:var(--ibiz-control-searchform-bg-color)}.ibiz-control-searchform>.ibiz-form-page{flex-grow:1}

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

@@ -65,6 +65,9 @@ const PanelControl = /* @__PURE__ */ vue.defineComponent({
     provider: {
       type: Object
     },
+    container: {
+      type: Object
+    },
     data: Object,
     loadDefault: {
       type: Boolean,
@@ -72,7 +75,7 @@ const PanelControl = /* @__PURE__ */ vue.defineComponent({
     }
   },
   setup(props) {
-    const c = vue3Util.useControlController((...args) => new runtime.PanelController(...args));
+    const c = vue3Util.useControlController((...args) => new runtime.PanelController(...args, props.container));
     const ns = vue3Util.useNamespace(`control-${c.model.controlType.toLowerCase()}`);
     vue.watch(() => props.data, (newVal) => {
       if (newVal) {

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

@@ -27,12 +27,15 @@ const ViewLayoutPanelControl = /* @__PURE__ */ vue.defineComponent({
     provider: {
       type: Object
     },
+    container: {
+      type: Object
+    },
     data: Object
   },
   setup(props, {
     slots
   }) {
-    const c = vue3Util.useControlController((...args) => new runtime.ViewLayoutPanelController(...args));
+    const c = vue3Util.useControlController((...args) => new runtime.ViewLayoutPanelController(...args, props.container));
     const ns = vue3Util.useNamespace(`control-${c.model.controlType.toLowerCase()}`);
     vue.watch(() => props.data, (newVal) => {
       if (newVal) {

package/lib/panel-component/index.cjs

@@ -21,6 +21,7 @@ var index$f = require('./panel-remember-me/index.cjs');
 var index$8 = require('./index-actions/index.cjs');
 var index$g = require('./panel-container-group/index.cjs');
 var index$h = require('./user-message/index.cjs');
+var index$i = require('./searchform-buttons/index.cjs');
 var navPosIndex_state = require('./nav-pos-index/nav-pos-index.state.cjs');
 var navPosIndex_controller = require('./nav-pos-index/nav-pos-index.controller.cjs');
 var panelButton_controller = require('./panel-button/panel-button.controller.cjs');
@@ -58,6 +59,7 @@ const IBizPanelComponents = {
     v.use(index$g.IBizPanelContainerGroup);
     v.use(index$h.IBizUserMessage);
     v.use(vue3Util.IBizPanelContainerImage);
+    v.use(index$i.IBizSearchFormButtons);
   }
 };
 

package/lib/panel-component/nav-pos-index/nav-pos-index.controller.cjs

@@ -96,15 +96,11 @@ class NavPosIndexController extends runtime.PanelItemController {
     currentKey,
     fullPath
   }) {
-    if (currentKey === "") {
-      return;
-    }
     const isCurrentKeyChange = this.state.currentKey !== currentKey;
     if (isCurrentKeyChange) {
       if (this.state.cacheKeys.includes(currentKey) && this.router && this.router.currentRoute.value.matched.length === this.routeDepth + 1) {
         const lastFullPath = this.state.navViewMsgs[currentKey].fullPath;
         if (lastFullPath !== fullPath) {
-          console.log("redirect to lastFullPath", lastFullPath);
           setTimeout(() => {
             this.router.push({ path: lastFullPath });
           }, 0);
@@ -116,6 +112,9 @@ class NavPosIndexController extends runtime.PanelItemController {
         this.navTabs.state.currentKey = currentKey;
       }
     }
+    if (currentKey === "") {
+      return;
+    }
     const index = this.state.operateSort.indexOf(currentKey);
     if (index !== -1) {
       this.state.operateSort.splice(index, 1);

package/lib/panel-component/searchform-buttons/index.cjs

@@ -0,0 +1,20 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var runtime = require('@ibiz-template/runtime');
+var vue3Util = require('@ibiz-template/vue3-util');
+var searchformButtons = require('./searchform-buttons.cjs');
+var searchformButtons_provider = require('./searchform-buttons.provider.cjs');
+
+"use strict";
+const IBizSearchFormButtons = vue3Util.withInstall(searchformButtons.SearchFormButtons, function(v) {
+  v.component(searchformButtons.SearchFormButtons.name, searchformButtons.SearchFormButtons);
+  runtime.registerPanelItemProvider(
+    "RAWITEM_SEARCHFORM_BUTTONS",
+    () => new searchformButtons_provider.SearchFormButtonsProvider()
+  );
+});
+
+exports.IBizSearchFormButtons = IBizSearchFormButtons;
+exports.default = IBizSearchFormButtons;

package/lib/panel-component/searchform-buttons/searchform-buttons.cjs

@@ -0,0 +1,65 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+require('./searchform-buttons.css');
+var searchformButtons_controller = require('./searchform-buttons.controller.cjs');
+
+"use strict";
+const SearchFormButtons = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizSearchFormButtons",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: searchformButtons_controller.SearchFormButtonsController,
+      required: true
+    }
+  },
+  setup(prop) {
+    const ns = vue3Util.useNamespace("searchform-buttons");
+    const c = prop.controller;
+    const onSearchButtonClick = () => {
+      c.onSearchButtonClick();
+    };
+    const onResetButtonClick = () => {
+      c.onResetButtonClick();
+    };
+    return {
+      ns,
+      c,
+      onSearchButtonClick,
+      onResetButtonClick
+    };
+  },
+  render() {
+    return vue.createVNode("div", {
+      "class": [this.ns.b(), this.ns.m(this.modelData.id), ...this.controller.containerClass]
+    }, [this.controller.searchButtonStyle === "SEARCHONLY" ? vue.createVNode(vue.resolveComponent("el-button"), {
+      "onClick": this.onSearchButtonClick
+    }, {
+      default: () => [vue.createTextVNode("\u641C\u7D22")]
+    }) : vue.createVNode(vue.resolveComponent("el-dropdown"), {
+      "split-button": true,
+      "type": "primary",
+      "onClick": this.onSearchButtonClick
+    }, {
+      default: () => vue.createVNode("span", {
+        "class": this.ns.b("label")
+      }, [vue.createTextVNode("\u641C\u7D22")]),
+      dropdown: () => {
+        return vue.createVNode(vue.resolveComponent("el-dropdown-menu"), null, {
+          default: () => [vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
+            "onClick": this.onResetButtonClick
+          }, {
+            default: () => [vue.createTextVNode("\u91CD\u7F6E")]
+          })]
+        });
+      }
+    })]);
+  }
+});
+
+exports.SearchFormButtons = SearchFormButtons;

package/lib/panel-component/searchform-buttons/searchform-buttons.controller.cjs

@@ -0,0 +1,69 @@
+'use strict';
+
+var core = require('@ibiz-template/core');
+var runtime = require('@ibiz-template/runtime');
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class SearchFormButtonsController extends runtime.PanelItemController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 搜索表单控制器
+     * @author lxm
+     * @date 2023-11-21 04:32:58
+     * @type {ISearchFormController}
+     */
+    __publicField(this, "searchFrom");
+  }
+  /**
+   * 搜索按钮样式
+   * @author lxm
+   * @date 2023-11-21 03:25:31
+   * @type {(string | 'DEFAULT' | 'NONE' | 'SEARCHONLY' | 'USER' | 'USER2')}
+   */
+  get searchButtonStyle() {
+    return this.searchFrom.model.searchButtonStyle || "DEFAULT";
+  }
+  async onInit() {
+    await super.onInit();
+    const searchFrom = this.panel.container;
+    if (!searchFrom) {
+      throw new core.RuntimeError("\u5F53\u524D\u89C6\u56FE\u91CC\u6CA1\u6709\u627E\u5230\u53EBsearchform\u7684\u641C\u7D22\u8868\u5355");
+    }
+    this.searchFrom = searchFrom;
+  }
+  /**
+   * 点击搜索按钮
+   * @author lxm
+   * @date 2023-11-21 04:31:55
+   */
+  onSearchButtonClick() {
+    runtime.UIActionUtil.execAndResolved("search", {
+      context: this.panel.context,
+      params: this.panel.params,
+      data: [],
+      view: this.panel.view
+    });
+  }
+  /**
+   * 点击重置按钮
+   * @author lxm
+   * @date 2023-11-21 04:32:09
+   */
+  onResetButtonClick() {
+    runtime.UIActionUtil.execAndResolved("reset", {
+      context: this.panel.context,
+      params: this.panel.params,
+      data: [],
+      view: this.panel.view
+    });
+  }
+}
+
+exports.SearchFormButtonsController = SearchFormButtonsController;

package/lib/panel-component/searchform-buttons/searchform-buttons.css

@@ -0,0 +1 @@
+.ibiz-searchform-buttons{--ibiz-searchform-buttons-height:40px;height:var(--ibiz-searchform-buttons-height);margin-top:var(--ibiz-spacing-tight);margin-left:var(--ibiz-spacing-tight)}

package/lib/panel-component/searchform-buttons/searchform-buttons.provider.cjs

@@ -0,0 +1,23 @@
+'use strict';
+
+var searchformButtons_controller = require('./searchform-buttons.controller.cjs');
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class SearchFormButtonsProvider {
+  constructor() {
+    __publicField(this, "component", "IBizSearchFormButtons");
+  }
+  async createController(panelItem, panel, parent) {
+    const c = new searchformButtons_controller.SearchFormButtonsController(panelItem, panel, parent);
+    await c.init();
+    return c;
+  }
+}
+
+exports.SearchFormButtonsProvider = SearchFormButtonsProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "使用 rollup 编译 vue 组件或者 jsx",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -26,10 +26,10 @@
     "@floating-ui/dom": "^1.5.3",
     "@ibiz-template-plugin/ai-chat": "^0.0.1",
     "@ibiz-template/core": "^0.3.0",
-    "@ibiz-template/model-helper": "^0.3.2",
-    "@ibiz-template/runtime": "^0.3.2",
+    "@ibiz-template/model-helper": "^0.3.3",
+    "@ibiz-template/runtime": "^0.3.3",
     "@ibiz-template/theme": "^0.3.0",
-    "@ibiz-template/vue3-util": "^0.3.2",
+    "@ibiz-template/vue3-util": "^0.3.3",
     "@ibiz/model-core": "^0.0.20",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.4.0",
@@ -55,11 +55,11 @@
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.2",
-    "@commitlint/config-conventional": "^18.4.2",
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
     "@ibiz-template/cli": "0.3.2",
     "@types/lodash-es": "^4.17.11",
-    "@types/node": "^20.9.2",
+    "@types/node": "^20.9.3",
     "@types/qs": "^6.9.10",
     "@types/ramda": "^0.29.9",
     "husky": "^8.0.3",