@ibiz-template/vue3-components 0.4.3 → 0.4.4

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

@@ -1,5 +1,4 @@
 import { ViewEngineBase, ViewCallTag } from '@ibiz-template/runtime';
-import { isNil, isEmpty } from 'ramda';
 
 "use strict";
 class IndexViewEngine extends ViewEngineBase {
@@ -27,7 +26,6 @@ class IndexViewEngine extends ViewEngineBase {
       this.view.slotProps.appmenu = {};
     }
     this.view.slotProps.appmenu.collapse = this.view.state.isCollapse;
-    this.setTheme();
     ibiz.util.hiddenAppLoading();
   }
   async onMounted() {
@@ -66,41 +64,6 @@ class IndexViewEngine extends ViewEngineBase {
       }
     }
   }
-  /**
-   * 根据首页viewStyle设置主题（临时）
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2023-09-05 15:27:15
-   */
-  setTheme() {
-    const viewStyle = this.view.model.viewStyle;
-    const htmlDom = document.querySelector("html");
-    let themeClass = "";
-    if (htmlDom && viewStyle) {
-      switch (viewStyle) {
-        case "DEFAULT":
-          if (!isNil(ibiz.config.theme) && !isEmpty(ibiz.config.theme)) {
-            themeClass = ibiz.config.theme;
-          } else {
-            themeClass = "light";
-          }
-          break;
-        case "STYLE2":
-          themeClass = "dark";
-          break;
-        case "STYLE3":
-          themeClass = "omni-oa";
-          break;
-        default:
-          themeClass = "light";
-          break;
-      }
-      htmlDom.classList.forEach((removeClass) => {
-        htmlDom.classList.remove(removeClass);
-      });
-      htmlDom.classList.add(themeClass);
-    }
-  }
   calcViewHeaderVisible() {
     return true;
   }

package/lib/common/col/col.cjs

@@ -36,9 +36,6 @@ const IBizCol = /* @__PURE__ */ vue.defineComponent({
     const spacingClass = vue.computed(() => {
       const ns2 = vue3Util.useNamespace("spacing");
       const classArr = [];
-      if (props.layoutPos.layout !== "FLEX") {
-        return classArr;
-      }
       const spacings = {
         top: props.layoutPos.spacingTop,
         bottom: props.layoutPos.spacingBottom,

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

@@ -2,17 +2,13 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
-require('./data-import2.css');
 var qs = require('qs');
 var qxUtil = require('qx-util');
 var core = require('@ibiz-template/core');
-require('../../node_modules/.pnpm/@ibiz-template_model-helper@0.4.3_@ibiz-template_runtime@0.4.3_ramda@0.29.1/node_modules/@ibiz-template/model-helper/out/utils/index.cjs');
-var plural = require('../../node_modules/.pnpm/@ibiz-template_model-helper@0.4.3_@ibiz-template_runtime@0.4.3_ramda@0.29.1/node_modules/@ibiz-template/model-helper/out/utils/plural/plural.cjs');
+var ramda = require('ramda');
+require('./data-import2.css');
 
 "use strict";
-function _isSlot(s) {
-  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
-}
 async function importMapping(method, id, data) {
   let url = `extension/import_schemas`;
   if (id) {
@@ -49,17 +45,28 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
     const previewinfo = vue.ref([[]]);
     const columnMap = /* @__PURE__ */ new Map();
     const selectValues = vue.ref([]);
-    let dataOption = [];
+    const dataOption = vue.ref([]);
     const dataimport2 = vue.ref();
     const select = vue.ref();
-    let fileName = "";
+    const fileName = vue.ref("");
     let fileid = "";
-    const ColumnMappingSave = vue.ref(false);
-    const columnMappingSaveName = vue.ref("");
+    const ColumnMappingSave = vue.ref(true);
     const listValue = vue.ref("");
     const columnMappingListMap = /* @__PURE__ */ new Map();
     const options = vue.ref([]);
     const isNoPersonel = vue.ref(false);
+    const clearSelect = () => {
+      const keys = [...columnMap.keys()];
+      keys.forEach((item) => {
+        const data = columnMap.get(item);
+        const cloneData = ramda.clone(data);
+        if (data) {
+          cloneData.name = "";
+          columnMap.set(item, cloneData);
+          selectValues.value[data.index] = "";
+        }
+      });
+    };
     const watchValue = async (listvalue) => {
       if (listvalue) {
         const columnData = columnMappingListMap.get(listvalue);
@@ -77,6 +84,7 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
         }
         const keys = [...columnMap.keys()];
         const captionMap = /* @__PURE__ */ new Map();
+        clearSelect();
         keys.forEach((item) => {
           const columnMapValue = columnMap.get(item);
           const lastIndex = item.lastIndexOf("-");
@@ -89,33 +97,29 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
           const filteredObjects = columnMapData.filter((columnitem) => columnitem.caption === itemName);
           const newColumnValue = filteredObjects[index];
           if (newColumnValue) {
-            captionMap.set(itemName, index + 1);
-            newColumnValue.index = columnMapValue.index;
-            columnMap.set(item, newColumnValue);
-            selectValues.value[newColumnValue.index] = newColumnValue.name;
+            const dataOptionValue = dataOption.value.find((dataOptionItem) => dataOptionItem.id === newColumnValue.name);
+            if (dataOptionValue) {
+              captionMap.set(itemName, index + 1);
+              newColumnValue.index = columnMapValue.index;
+              columnMap.set(item, newColumnValue);
+              selectValues.value[newColumnValue.index] = newColumnValue.name;
+            }
           }
         });
       } else {
-        const keys = [...columnMap.keys()];
-        keys.forEach((item) => {
-          const data = columnMap.get(item);
-          if (data) {
-            data.name = "";
-            columnMap.set(item, data);
-            selectValues.value[data.index] = "";
-          }
-        });
+        clearSelect();
       }
     };
     vue.watch(listValue, (newValue, _oldValue) => {
-      if (columnMappingSaveName.value !== newValue) {
-        ColumnMappingSave.value = false;
-      }
-      columnMappingSaveName.value = "";
       watchValue(newValue);
     });
     const onButtonColumnMappingImportClick = async () => {
       var _a;
+      const string = selectValues.value.join("");
+      if (string === "") {
+        ibiz.message.warning("\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u6620\u5C04\u5C5E\u6027");
+        return;
+      }
       if (previewinfo.value[0].length) {
         ColumnMappingSave.value = true;
         const columnMapArr = [...columnMap.values()];
@@ -123,7 +127,7 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
         const data = {
           // schame_tag: '', // 导入模式标记 不传
           // id: '', // 导入模式标识 也不用传
-          name: `${fileName.split(".")[0]}|${(/* @__PURE__ */ new Date()).toLocaleString()}`,
+          name: `${fileName.value.split(".")[0]}|${(/* @__PURE__ */ new Date()).toLocaleString()}`,
           // 导入模式名称 按照导入的名称|时间来生成
           // order_value: '', // 排序值  也不用传
           fields,
@@ -133,6 +137,8 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
           // 系统标记
           data_entity_tag: props.appDataEntity.codeName,
           // 数据实体标记
+          data_entity_tag2: props.appDataEntity.codeName2,
+          // 数据实体标记
           import_tag: props.appDataEntity.defaultAppDEDataImportId,
           // 导入标记 导入模型的代码名称
           owner_type: "PERSONAL"
@@ -140,6 +146,7 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
         };
         if (listValue.value) {
           const columnData = columnMappingListMap.get(listValue.value);
+          data.name = columnData.name;
           const resput = await importMapping("put", columnData.id, data);
           if (resput.status === 200 && resput.ok) {
             columnMappingListMap.set(listValue.value, resput.data);
@@ -147,13 +154,16 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
         } else {
           options.value.push({
             value: data.name,
-            label: data.name
+            label: data.name,
+            oldLabel: data.name,
+            edit: true,
+            checkmark: false,
+            close: false
           });
           const res = await importMapping("post", "", data);
           if (res.status === 200 && res.ok) {
             columnMappingListMap.set(data.name, res.data);
           }
-          columnMappingSaveName.value = data.name;
           listValue.value = data.name;
         }
       } else {
@@ -162,13 +172,13 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
     };
     const onButtonImportClick = async () => {
       if (previewinfo.value[0].length) {
-        if (listValue.value) {
+        if (listValue.value && ColumnMappingSave.value) {
           const data = columnMappingListMap.get(listValue.value);
           const {
             id
           } = data;
-          const dataEntityTag = data.data_entity_tag;
-          const url = `${plural.pluralLower(dataEntityTag)}/asyncimportdata2?srfimporttag=${props.appDataEntity.defaultAppDEDataImportId}&srfossfileid=${fileid}&srfimportschemaid=${id}`;
+          const dataEntityTag = data.data_entity_tag2;
+          const url = `${dataEntityTag}/asyncimportdata2?srfimporttag=${props.appDataEntity.defaultAppDEDataImportId}&srfossfileid=${fileid}&srfimportschemaid=${id}`;
           await ibiz.net.request(url, {
             method: "get"
           });
@@ -206,7 +216,11 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
         res.data.forEach((item) => {
           options.value.push({
             value: item.name,
-            label: item.name
+            label: item.name,
+            oldLabel: item.name,
+            edit: true,
+            checkmark: false,
+            close: false
           });
           columnMappingListMap.set(item.name, item);
         });
@@ -216,71 +230,13 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
       var _a;
       const dataImport = (_a = props.appDataEntity.appDEDataImports) == null ? void 0 : _a.find((importItem) => importItem.id === props.appDataEntity.defaultAppDEDataImportId);
       if (dataImport && dataImport.dedataImportItems) {
-        dataOption = dataImport.dedataImportItems;
+        dataOption.value = dataImport.dedataImportItems;
       } else if (props.appDataEntity.appDEFields) {
-        dataOption = props.appDataEntity.appDEFields;
+        dataOption.value = props.appDataEntity.appDEFields;
       }
       findDialog(dataimport2.value.parentElement);
       columnMappingListQuery();
     });
-    const renderSelect = (itemx, index) => {
-      let _slot;
-      const change = (item) => {
-        selectValues.value[index] = item;
-        const data = columnMap.get(`${itemx}-${index}`);
-        data.name = item;
-        columnMap.set(`${itemx}-${index}`, data);
-        ColumnMappingSave.value = false;
-      };
-      return vue.createVNode(vue.resolveComponent("el-select"), {
-        "modelValue": selectValues.value[index],
-        "placeholder": "\u9009\u62E9\u5F53\u524D\u5217\u5BF9\u5E94\u7684\u5BFC\u5165\u5C5E\u6027",
-        "onChange": change,
-        "key": index,
-        "popper-class": ns.e("dataimport-select"),
-        "class": ns.e("select")
-      }, _isSlot(_slot = dataOption.map((item) => {
-        return vue.createVNode(vue.resolveComponent("el-option"), {
-          "key": item.name,
-          "value": item.id,
-          "label": item.caption ? item.caption : item.logicName
-        }, null);
-      })) ? _slot : {
-        default: () => [_slot]
-      });
-    };
-    const renderTable = () => {
-      const arr = previewinfo.value;
-      const rows = arr.map((row, rowIndex) => vue.createVNode("tr", {
-        "key": rowIndex
-      }, [row.map((cell, cellIndex) => rowIndex === 0 ? vue.createVNode("th", {
-        "key": cellIndex,
-        "style": {
-          border: "1px solid #e5e5e5",
-          padding: "4px",
-          "min-width": "132px"
-        }
-      }, [cell]) : vue.createVNode("td", {
-        "key": cellIndex,
-        "style": {
-          border: "1px solid #e5e5e5",
-          padding: "4px",
-          "min-width": "132px"
-        }
-      }, [cell]))]));
-      const newRows = [vue.createVNode("tr", {
-        "key": "newRow"
-      }, [arr[0].map((item, index) => vue.createVNode("td", {
-        "key": index,
-        "style": {
-          border: "1px solid #e5e5e5",
-          "min-width": "132px"
-        }
-      }, [renderSelect(item, index)]))]), ...rows];
-      return vue.createVNode("table", {
-        "style": "border-collapse:collapse;border-spacing:0"
-      }, [vue.createVNode("tbody", null, [newRows])]);
-    };
     const headers = vue.ref({
       Authorization: `Bearer ${qxUtil.getCookie(core.CoreConst.TOKEN)}`
     });
@@ -297,10 +253,10 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
       isLoading.value = true;
     };
     const onSuccess = (response, _file, _fileList) => {
-      fileName = "";
+      fileName.value = "";
       fileid = "";
       if (response.name) {
-        fileName = response.name;
+        fileName.value = response.name;
       }
       if (response.fileid) {
         fileid = response.fileid;
@@ -330,29 +286,40 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
           });
         }
       }
-      ColumnMappingSave.value = false;
       isLoading.value = false;
       watchValue(listValue.value);
     };
-    const renderEmpty = () => {
-      return vue.createVNode("div", {
-        "class": ns.e("empty")
-      }, [vue.createTextVNode("\u6682\u65E0\u6570\u636E")]);
+    const columnMappingSaveChange = (data) => {
+      ColumnMappingSave.value = data;
+    };
+    const selectValuesChange = (index, item) => {
+      selectValues.value[index] = item;
     };
-    const handleDeleteOption = async (e, str) => {
-      e.stopPropagation();
-      const columnData = columnMappingListMap.get(str);
-      const res = await importMapping("delete", columnData.id);
-      if (res.status === 200 && res.ok) {
+    const columnMapChange = (key, data) => {
+      columnMap.set(key, data);
+    };
+    const listValueChange = (data) => {
+      listValue.value = data;
+    };
+    const columnMappingListMapChange = (key, data) => {
+      if (data) {
+        columnMappingListMap.set(key, data);
+      } else {
+        columnMappingListMap.delete(key);
+      }
+    };
+    const optionsChange = (str, data) => {
+      if (data) {
+        const index = options.value.findIndex((obj) => obj.label === str);
+        const optionValue = options.value[index];
+        Object.keys(data).forEach((key) => {
+          optionValue[key] = data[key];
+        });
+      } else {
         const index = options.value.findIndex((obj) => obj.label === str);
         if (index !== -1) {
           options.value.splice(index, 1);
         }
-        columnMappingListMap.delete(str);
-        if (listValue.value === str) {
-          listValue.value = "";
-        }
-        select.value.blur();
       }
     };
     return {
@@ -364,22 +331,28 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
       UploadUrl,
       headers,
       onSuccess,
-      renderTable,
-      renderSelect,
       previewinfo,
       selectValues,
-      renderEmpty,
       beforeUpload,
       dataimport2,
       listValue,
       options,
-      handleDeleteOption,
       select,
-      isNoPersonel
+      isNoPersonel,
+      fileName,
+      dataOption,
+      ColumnMappingSave,
+      columnMap,
+      columnMappingSaveChange,
+      selectValuesChange,
+      columnMapChange,
+      columnMappingListMap,
+      listValueChange,
+      columnMappingListMapChange,
+      optionsChange
     };
   },
   render() {
-    let _slot2;
     return vue.withDirectives(vue.createVNode("div", {
       "class": [this.ns.b(), "ibiz-view"],
       "ref": "dataimport2"
@@ -401,34 +374,22 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
       "class": "ibiz-control-toolbar"
     }, [vue.createVNode("div", {
       "class": "ibiz-control-toolbar__item"
-    }, [vue.createVNode(vue.resolveComponent("el-select"), {
-      "ref": "select",
-      "modelValue": this.listValue,
-      "onUpdate:modelValue": ($event) => this.listValue = $event,
-      "clearable": true,
-      "placeholder": "\u9009\u62E9\u5BFC\u5165\u6A21\u5F0F",
-      "disabled": !(this.previewinfo[0] && this.previewinfo[0].length),
-      "popper-class": this.ns.e("dataimport-select")
-    }, _isSlot(_slot2 = this.options.map((item) => {
-      return vue.createVNode(vue.resolveComponent("el-option"), {
-        "label": item.label,
-        "value": item.value,
-        "class": [this.ns.e("select-option")]
-      }, {
-        default: () => vue.createVNode("div", {
-          "class": [this.ns.e("select-option-item")]
-        }, [vue.createVNode("span", null, [item.label]), vue.createVNode(vue.resolveComponent("el-button"), {
-          "text": true,
-          "size": "small",
-          "onClick": (e) => this.handleDeleteOption(e, item.value),
-          "class": this.ns.e("select-option-item-button")
-        }, {
-          default: () => [vue.createTextVNode("\u5220\u9664")]
-        })])
-      });
-    })) ? _slot2 : {
-      default: () => [_slot2]
-    })]), vue.createVNode(vue.resolveComponent("el-upload"), {
+    }, [this.fileName ? `\u5F53\u524D\u6587\u4EF6\u540D:${this.fileName}` : ""]), this.previewinfo[0] && this.previewinfo[0].length ? vue.createVNode(vue.resolveComponent("data-import2-select"), {
+      "previewinfo": this.previewinfo,
+      "options": this.options,
+      "columnMappingListMap": this.columnMappingListMap,
+      "listValue": this.listValue,
+      "onListValueChange": this.listValueChange,
+      "onColumnMappingListMapChange": this.columnMappingListMapChange,
+      "onOptionsChange": this.optionsChange
+    }, null) : "", this.previewinfo[0] && this.previewinfo[0].length ? vue.createVNode("div", {
+      "class": "ibiz-control-toolbar__item"
+    }, [vue.createVNode(vue.resolveComponent("el-button"), {
+      "onClick": this.onButtonColumnMappingImportClick,
+      "disabled": this.isNoPersonel
+    }, {
+      default: () => [vue.createTextVNode("\u5BFC\u5165\u6A21\u5F0F\u4FDD\u5B58")]
+    })]) : "", vue.createVNode(vue.resolveComponent("el-upload"), {
       "class": "ibiz-control-toolbar__item",
       "action": this.UploadUrl,
       "headers": this.headers,
@@ -437,25 +398,26 @@ const DataImport2 = /* @__PURE__ */ vue.defineComponent({
       "before-upload": this.beforeUpload
     }, {
       default: () => [vue.createVNode(vue.resolveComponent("el-button"), null, {
-        default: () => [vue.createTextVNode("\u6587\u4EF6\u4E0A\u4F20")]
+        default: () => [this.previewinfo[0] && this.previewinfo[0].length ? "\u91CD\u65B0\u4E0A\u4F20\u6587\u4EF6" : "\u6587\u4EF6\u4E0A\u4F20"]
       })]
-    }), vue.createVNode("div", {
-      "class": "ibiz-control-toolbar__item"
-    }, [vue.createVNode(vue.resolveComponent("el-button"), {
-      "onClick": this.onButtonColumnMappingImportClick,
-      "disabled": this.isNoPersonel
-    }, {
-      default: () => [vue.createTextVNode("\u5BFC\u5165\u6A21\u5F0F\u4FDD\u5B58")]
-    })]), vue.createVNode("div", {
+    }), this.previewinfo[0] && this.previewinfo[0].length ? vue.createVNode("div", {
       "class": "ibiz-control-toolbar__item"
     }, [vue.createVNode(vue.resolveComponent("el-button"), {
       "onClick": this.onButtonImportClick
     }, {
       default: () => [vue.createTextVNode("\u5BFC\u5165")]
-    })])])])])]), vue.createVNode("div", {
-      "class": [this.ns.e("template-container"), "ibiz-panel-view-content"]
-    }, [this.previewinfo[0] && this.previewinfo[0].length ? this.renderTable() : this.renderEmpty()])]), [[vue.resolveDirective("loading"), this.isLoading]]);
+    })]) : ""])])])]), vue.createVNode(vue.resolveComponent("data-import2-table"), {
+      "previewinfo": this.previewinfo,
+      "selectValues": this.selectValues,
+      "dataOption": this.dataOption,
+      "columnMappingSave": this.ColumnMappingSave,
+      "columnMap": this.columnMap,
+      "onSelectValuesChange": this.selectValuesChange,
+      "onColumnMappingSaveChange": this.columnMappingSaveChange,
+      "onColumnMapChange": this.columnMapChange
+    }, null)]), [[vue.resolveDirective("loading"), this.isLoading]]);
   }
 });
 
 exports.DataImport2 = DataImport2;
+exports.importMapping = importMapping;

package/lib/common/data-import2/data-import2.css

@@ -1 +1 @@
-.ibiz-data-import2{display:flex;flex-flow:column nowrap;min-width:644px;height:568px;background:var(--ibiz-color-bg-1)}.ibiz-data-import2__data-import2-toolbar{display:flex;align-items:center;justify-content:space-between}.ibiz-data-import2__data-import2-toolbar-container{display:flex;align-items:center;justify-content:space-between}.ibiz-data-import2__template-container{height:100%}.ibiz-data-import2__empty{width:100%;height:100%;display:flex;align-items:center;justify-content:center}.ibiz-data-import2__dataimport-select{margin-top:-5px}.ibiz-data-import2__select{width:100%}.ibiz-data-import2__select-option{padding:0 0 0 20px}.ibiz-data-import2__select-option-item{display:flex;align-items:center;justify-content:center;height:100%}.ibiz-data-import2__select-option-item-button{height:100%}
+.ibiz-data-import2{display:flex;flex-flow:column nowrap;min-width:644px;height:568px;background:var(--ibiz-color-bg-1)}.ibiz-data-import2__data-import2-toolbar{display:flex;align-items:center;justify-content:space-between}.ibiz-data-import2__data-import2-toolbar-container{display:flex;align-items:center;justify-content:space-between}.ibiz-data-import2__select-option-item-button{height:100%}