@ibiz-template/vue3-components 0.7.41-alpha.15 → 0.7.41-alpha.17

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

@@ -6,9 +6,6 @@ var runtime = require('@ibiz-template/runtime');
 require('./medit-view-panel.css');
 
 "use strict";
-function _isSlot(s) {
-  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
-}
 const MEditViewPanelControl = /* @__PURE__ */ vue.defineComponent({
   name: "IBizMEditViewPanelControl",
   props: {
@@ -92,37 +89,47 @@ const MEditViewPanelControl = /* @__PURE__ */ vue.defineComponent({
   render() {
     const viewShell = vue.resolveComponent("IBizViewShell");
     const renderTabTop = () => {
-      let _slot;
       return vue.createVNode(vue.resolveComponent("el-tabs"), {
         "class": this.ns.b("tabs"),
+        "addable": true,
         "modelValue": this.c.state.activeTab,
         "onUpdate:modelValue": ($event) => this.c.state.activeTab = $event,
-        "onTabChange": this.onTabChange
-      }, _isSlot(_slot = this.c.state.panelUiItems.map((item) => {
-        return vue.createVNode(vue.resolveComponent("el-tab-pane"), {
-          "key": item.id + item.srfmajortext,
-          "name": item.id
-        }, {
-          label: () => {
-            return vue.createVNode("div", {
-              "class": this.ns.b("tab-label")
-            }, [vue.createVNode("span", null, [item.srfmajortext]), vue.createVNode("ion-icon", {
-              "name": "close-outline",
-              "onClick": (event) => this.handleTabDelete(item, event)
-            }, null)]);
-          },
-          default: () => {
-            return this.c.state.activeTab === item.id && vue.h(viewShell, {
-              context: item.context,
-              params: item.params,
-              viewId: this.c.model.embeddedAppViewId,
-              onDataChange: (args) => this.c.onViewDataChange(args, item.id),
-              onCreated: (event) => this.c.onViewCreated(event, item.id)
+        "onTabChange": this.onTabChange,
+        "onTabAdd": () => this.c.handleAdd()
+      }, {
+        addIcon: () => {
+          return vue.createVNode(vue.resolveComponent("el-button"), null, {
+            default: () => [vue.createVNode("ion-icon", {
+              "name": "add"
+            }, null), ibiz.i18n.t("app.add")]
+          });
+        },
+        default: () => {
+          return this.c.state.panelUiItems.map((item) => {
+            return vue.createVNode(vue.resolveComponent("el-tab-pane"), {
+              "key": item.id + item.srfmajortext,
+              "name": item.id
+            }, {
+              label: () => {
+                return vue.createVNode("div", {
+                  "class": this.ns.b("tab-label")
+                }, [vue.createVNode("span", null, [item.srfmajortext]), vue.createVNode("ion-icon", {
+                  "name": "close-outline",
+                  "onClick": (event) => this.handleTabDelete(item, event)
+                }, null)]);
+              },
+              default: () => {
+                return this.c.state.activeTab === item.id && vue.h(viewShell, {
+                  context: item.context,
+                  params: item.params,
+                  viewId: this.c.model.embeddedAppViewId,
+                  onDataChange: (args) => this.c.onViewDataChange(args, item.id),
+                  onCreated: (event) => this.c.onViewCreated(event, item.id)
+                });
+              }
             });
-          }
-        });
-      })) ? _slot : {
-        default: () => [_slot]
+          });
+        }
       });
     };
     const renderRow = () => {

package/lib/control/medit-view-panel/medit-view-panel.css

@@ -1 +1 @@
-.ibiz-control-multieditviewpanel{--ibiz-control-multieditviewpanel-btn-width:150px;display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:space-between;width:100%;height:100%}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content{flex-grow:1;width:100%;height:100%;overflow-y:scroll}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-item{display:flex;position:relative;width:100%;margin-bottom:var(--ibiz-spacing-tight)}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-item>.ibiz-view .ibiz-panel-view-header{padding-right:var(--ibiz-spacing-loose)}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-item .ibiz-control-multieditviewpanel-close{display:flex;justify-content:center;position:absolute;top:calc(var(--ibiz-spacing-tight) + var(--ibiz-spacing-tight) + var(--ibiz-height-control-default)/ 2 - .5em);right:0}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-item .ibiz-control-multieditviewpanel-close>ion-icon:hover{color:var(--ibiz-color-primary);cursor:pointer}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-tabs .el-tabs__nav .el-tabs__item .ibiz-control-multieditviewpanel-tab-label{display:flex;align-items:center;justify-content:space-between}
+.ibiz-control-multieditviewpanel{--ibiz-control-multieditviewpanel-btn-width:150px;display:flex;flex-flow:column nowrap;align-items:stretch;justify-content:space-between;width:100%;height:100%}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content{flex-grow:1;width:100%;height:100%;overflow-y:scroll}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-item{display:flex;position:relative;width:100%;margin-bottom:var(--ibiz-spacing-tight)}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-item>.ibiz-view .ibiz-panel-view-header{padding-right:var(--ibiz-spacing-loose)}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-item .ibiz-control-multieditviewpanel-close{display:flex;justify-content:center;position:absolute;top:calc(var(--ibiz-spacing-tight) + var(--ibiz-spacing-tight) + var(--ibiz-height-control-default)/ 2 - .5em);right:0}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-item .ibiz-control-multieditviewpanel-close>ion-icon:hover{color:var(--ibiz-color-primary);cursor:pointer}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-tabs .el-tabs__nav .el-tabs__item .ibiz-control-multieditviewpanel-tab-label{display:flex;align-items:center;justify-content:space-between}.ibiz-control-multieditviewpanel .ibiz-control-multieditviewpanel-content .ibiz-control-multieditviewpanel-tabs .el-tabs__new-tab{display:flex;align-items:center;width:auto;height:var(--el-tabs-header-height);margin:0;border:0;border-bottom:2px solid var(--el-border-color-light)}

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

@@ -96,22 +96,42 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
         }, 100);
       }
     };
-    const handleOpenViewClose = (result) => {
+    const handleOpenViewClose = async (result) => {
       const selects = [];
       if (result && Array.isArray(result)) {
-        result.forEach((select) => {
+        const calcPromises = result.map(async (select) => {
+          const item = select;
+          if (select.srfnodeid) {
+            Object.assign(item, select._deData);
+          }
+          const dataItems = await c.calcFillDataItems(item);
+          const res = {};
+          dataItems.forEach((dataItem) => {
+            Object.assign(res, {
+              [dataItem.id]: dataItem.value
+            });
+          });
+          return res;
+        });
+        const dataItemsList = await Promise.all(calcPromises);
+        result.forEach((select, _index) => {
           Object.assign(select, {
             [c.keyName]: select[c.keyName] ? select[c.keyName] : select.srfkey,
             [c.textName]: select[c.textName] ? select[c.textName] : select.srfmajortext
           });
+          const data = dataItemsList[_index];
           if (c.model.valueType === "OBJECTS") {
-            selects.push(c.handleObjectParams(select));
+            selects.push({
+              ...c.handleObjectParams(select),
+              ...data
+            });
           } else if (c.objectIdField) {
             selects.push(select[c.keyName]);
           } else {
             selects.push({
               [c.keyName]: select[c.keyName],
-              [c.textName]: select[c.textName]
+              [c.textName]: select[c.textName],
+              ...data
             });
           }
           const index = items.value.findIndex((item) => Object.is(item[c.keyName], select[c.keyName]));
@@ -146,7 +166,7 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
         handleOpenViewClose(res);
       }
     };
-    const onSelect = (selects) => {
+    const onSelect = async (selects) => {
       setEditable(false);
       if (selects.includes("empty")) {
         resetCurValue();
@@ -154,7 +174,7 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
       }
       const val = [];
       let value = null;
-      selects.forEach((select) => {
+      const selections = selects.map((select) => {
         let index = items.value.findIndex((item2) => Object.is(item2[c.keyName], select));
         let item = {};
         if (index >= 0) {
@@ -165,14 +185,33 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
             item = selectItems.value[index];
           }
         }
+        return item;
+      });
+      const calcPromises = selections.map(async (select) => {
+        const dataItems = await c.calcFillDataItems(select);
+        const res = {};
+        dataItems.forEach((dataItem) => {
+          Object.assign(res, {
+            [dataItem.id]: dataItem.value
+          });
+        });
+        return res;
+      });
+      const dataItemsList = await Promise.all(calcPromises);
+      selections.forEach((item, index) => {
+        const data = dataItemsList[index];
         if (c.model.valueType === "OBJECTS") {
-          val.push(c.handleObjectParams(item));
+          val.push({
+            ...c.handleObjectParams(item),
+            ...data
+          });
         } else if (c.objectIdField) {
           val.push(item[c.keyName]);
         } else {
           val.push({
             [c.keyName]: item[c.keyName],
-            [c.textName]: item[c.textName]
+            [c.textName]: item[c.textName],
+            ...data
           });
         }
       });

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

@@ -40,6 +40,10 @@ class UploadEditorController extends runtime.EditorController {
      * 下载参数
      */
     __publicField(this, "exportParams");
+    /**
+     * 上传文件信息的映射规则字符串，格式为"源键:目标键;源键2:目标键2"
+     */
+    __publicField(this, "infoMap", "");
     /**
      * 自适应预览
      * 只读状态下且配置了编辑器参数autoPreview ，加载完图片后自动调整大小达到预览态，且禁用图片hover工具栏
@@ -48,10 +52,44 @@ class UploadEditorController extends runtime.EditorController {
      * @memberof UploadEditorController
      */
     __publicField(this, "autoPreview", false);
+    /**
+     * 根据配置的映射关系转换对象属性
+     * 将源对象的指定属性，按照映射规则映射到新对象的目标属性
+     *
+     * @param {IData} [_data={}] - 源数据对象，包含需要被映射的原始属性
+     * @param {string} [infoMap=''] - 映射规则字符串，格式为"源键:目标键;源键2:目标键2"
+     * @param {boolean} [isEmit=false] - 是否为抛值时处理，抛值时将源键替换为目标键
+     * @returns {IData} 转换后的新对象，仅包含映射规则中定义的属性
+     *
+     * @example
+     * // isEmit=false
+     * // 源对象：{ filesize:'10000', fileext:'.gif', folder:'file' };
+     * // 映射规则：'filesize:size;fileext:ext;folder:folder';
+     * // 转换结果: { size:'10000', ext:'.gif', folder:'file' }
+     *
+     * // isEmit=true
+     * // 源对象：{ filesize:'10000', fileext:'.gif', folder:'file' };
+     * // 映射规则：'filesize:size;fileext:ext;folder:folder';
+     * // 转换结果: { size:undefined, ext:undefined, folder:'file' }
+     */
+    __publicField(this, "transformInfoMap", (_data = {}, infoMap = "", isEmit = false) => {
+      const result = {};
+      const mappings = infoMap.split(";");
+      mappings.forEach((mapping) => {
+        let [sourceKey, targetKey] = mapping.split(":");
+        if (isEmit)
+          sourceKey = targetKey;
+        if (sourceKey && targetKey) {
+          Object.assign(result, { [targetKey]: _data[sourceKey] });
+        }
+      });
+      return result;
+    });
   }
   async onInit() {
     var _a;
     await super.onInit();
+    this.infoMap = ibiz.config.uploadEditor.infoMap;
     if ((_a = this.model.editorType) == null ? void 0 : _a.includes("PICTURE")) {
       this.accept = "image/*";
     }
@@ -76,7 +114,8 @@ class UploadEditorController extends runtime.EditorController {
         isdrag,
         uploadparams,
         exportparams,
-        autopreview
+        autopreview,
+        infomap
       } = this.editorParams;
       if (isDrag) {
         this.isDrag = Boolean(isDrag);
@@ -99,6 +138,9 @@ class UploadEditorController extends runtime.EditorController {
       if (size) {
         this.size = Number(size);
       }
+      if (infomap) {
+        this.infoMap = infomap;
+      }
       if (uploadParams) {
         try {
           this.uploadParams = JSON.parse(uploadParams);

package/lib/editor/upload/use/use-iview-upload.cjs

@@ -113,7 +113,13 @@ function useIViewUpload(props, valueChange, c) {
   );
   const emitValue = () => {
     const _files = [...files.value, ...uploadCache.cacheFiles];
-    const value = _files.length > 0 ? JSON.stringify(_files.map((file) => ({ name: file.name, id: file.id }))) : null;
+    const value = _files.length > 0 ? JSON.stringify(
+      _files.map((file) => ({
+        name: file.name,
+        id: file.id,
+        ...c.transformInfoMap(file, c.infoMap, true)
+      }))
+    ) : null;
     uploadCache.cacheFiles = [];
     valueChange(value);
   };
@@ -138,7 +144,8 @@ function useIViewUpload(props, valueChange, c) {
     }
     uploadCache.cacheFiles.push({
       name: response.filename,
-      id: response.fileid
+      id: response.fileid,
+      ...c.transformInfoMap(response, c.infoMap)
     });
     if (response.name.split(".").pop() === "svg") {
       const blob = svgBlob.get(response.name);

package/lib/locale/en/index.cjs

@@ -35,7 +35,9 @@ var index = {
     retract: "Retract",
     pleaseEnterAccount: "Please enter account number",
     pleaseEnterPassword: "Please enter password",
-    aiError: "System encountered an exception, please try again later"
+    aiError: "System encountered an exception, please try again later",
+    fullscreen: "Fullscreen",
+    cancelFullscreen: "Cancel fullscreen"
   },
   // 视图
   view: {
@@ -315,7 +317,8 @@ var index = {
         tip: "All Day",
         today: "Today",
         tomorrow: "To Morrow",
-        nextweek: "Next Week"
+        nextweek: "Next Week",
+        selectdate: "Select Date"
       },
       calendarmonth: {
         lastmonth: "Last Month",
@@ -353,7 +356,9 @@ var index = {
           friday: "Fri",
           saturday: "Sat",
           sunday: "Sun"
-        }
+        },
+        selectWeekRange: "Select week range",
+        weekFormat: "ww [Week] of YYYY"
       }
     },
     chart: {
@@ -553,6 +558,9 @@ var index = {
     gridSetting: {
       hideControl: "Column selection"
     },
+    kanbanSetting: {
+      hideGroup: "Group selection"
+    },
     ganttSetting: {
       resultDefault: "Restore defaults",
       headerCaption: "Header display attributes",

package/lib/locale/zh-CN/index.cjs

@@ -35,7 +35,9 @@ var index = {
     retract: "\u6536\u8D77",
     pleaseEnterAccount: "\u8BF7\u8F93\u5165\u8D26\u53F7",
     pleaseEnterPassword: "\u8BF7\u8F93\u5165\u5BC6\u7801",
-    aiError: "\u7CFB\u7EDF\u53D1\u751F\u5F02\u5E38\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5"
+    aiError: "\u7CFB\u7EDF\u53D1\u751F\u5F02\u5E38\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5",
+    fullscreen: "\u5168\u5C4F",
+    cancelFullscreen: "\u53D6\u6D88\u5168\u5C4F"
   },
   // 视图
   view: {
@@ -316,7 +318,8 @@ var index = {
         },
         tip: "\u5168\u5929",
         tomorrow: "\u660E\u5929",
-        nextweek: "\u4E0B\u5468"
+        nextweek: "\u4E0B\u5468",
+        selectdate: "\u9009\u62E9\u65E5\u671F"
       },
       calendarmonth: {
         weeks: {
@@ -349,7 +352,9 @@ var index = {
           friday: "\u5468\u4E94",
           saturday: "\u5468\u516D",
           sunday: "\u5468\u65E5"
-        }
+        },
+        selectWeekRange: "\u9009\u62E9\u5468\u8303\u56F4",
+        weekFormat: "YYYY\u5E74\u7B2Cww\u5468"
       }
     },
     chart: {
@@ -549,6 +554,9 @@ var index = {
     gridSetting: {
       hideControl: "\u5217\u9009\u62E9"
     },
+    kanbanSetting: {
+      hideGroup: "\u5206\u7EC4\u9009\u62E9"
+    },
     ganttSetting: {
       resultDefault: "\u6062\u590D\u9ED8\u8BA4\u503C",
       headerCaption: "\u8868\u5934\u663E\u793A\u5C5E\u6027",