@ibiz-template/vue3-components 0.4.3 → 0.4.5

package/es/common/data-import2/data-import2.mjs

@@ -1,16 +1,12 @@
-import { isVNode, ref, watch, onMounted, resolveComponent, createVNode, computed, createTextVNode, resolveDirective, withDirectives, defineComponent } from 'vue';
+import { ref, watch, onMounted, computed, createTextVNode, createVNode, resolveComponent, resolveDirective, withDirectives, defineComponent } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
-import './data-import2.css';
 import qs from 'qs';
 import { getCookie } from 'qx-util';
 import { CoreConst } from '@ibiz-template/core';
-import '../../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.mjs';
-import { pluralLower } from '../../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.mjs';
+import { clone } from 'ramda';
+import './data-import2.css';
 
 "use strict";
-function _isSlot(s) {
-  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
-}
 async function importMapping(method, id, data) {
   let url = `extension/import_schemas`;
   if (id) {
@@ -47,20 +43,34 @@ const DataImport2 = /* @__PURE__ */ defineComponent({
     const previewinfo = ref([[]]);
     const columnMap = /* @__PURE__ */ new Map();
     const selectValues = ref([]);
-    let dataOption = [];
+    const dataOption = ref([]);
     const dataimport2 = ref();
     const select = ref();
-    let fileName = "";
+    const fileName = ref("");
     let fileid = "";
-    const ColumnMappingSave = ref(false);
-    const columnMappingSaveName = ref("");
+    const ColumnMappingSave = ref(true);
     const listValue = ref("");
     const columnMappingListMap = /* @__PURE__ */ new Map();
     const options = ref([]);
     const isNoPersonel = ref(false);
+    const clearSelect = () => {
+      const keys = [...columnMap.keys()];
+      keys.forEach((item) => {
+        const data = columnMap.get(item);
+        const cloneData = clone(data);
+        if (data && cloneData) {
+          cloneData.name = "";
+          columnMap.set(item, cloneData);
+          selectValues.value[data.index] = "";
+        }
+      });
+    };
     const watchValue = async (listvalue) => {
       if (listvalue) {
         const columnData = columnMappingListMap.get(listvalue);
+        if (!columnData) {
+          return;
+        }
         let columnMapData = columnData.fields;
         if (!columnData.fields) {
           const res = await importMapping("get", columnData.id);
@@ -75,6 +85,7 @@ const DataImport2 = /* @__PURE__ */ defineComponent({
         }
         const keys = [...columnMap.keys()];
         const captionMap = /* @__PURE__ */ new Map();
+        clearSelect();
         keys.forEach((item) => {
           const columnMapValue = columnMap.get(item);
           const lastIndex = item.lastIndexOf("-");
@@ -84,36 +95,32 @@ const DataImport2 = /* @__PURE__ */ defineComponent({
             captionMap.set(itemName, 0);
             index = 0;
           }
-          const filteredObjects = columnMapData.filter((columnitem) => columnitem.caption === itemName);
-          const newColumnValue = filteredObjects[index];
+          const filteredObjects = columnMapData && columnMapData.filter((columnitem) => columnitem.caption === itemName);
+          const newColumnValue = filteredObjects && 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 && columnMapValue) {
+              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();
       }
     };
     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()];
@@ -121,7 +128,7 @@ const DataImport2 = /* @__PURE__ */ 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,
@@ -138,20 +145,26 @@ const DataImport2 = /* @__PURE__ */ defineComponent({
         };
         if (listValue.value) {
           const columnData = columnMappingListMap.get(listValue.value);
-          const resput = await importMapping("put", columnData.id, data);
+          if (columnData && columnData.name) {
+            data.name = columnData.name;
+          }
+          const resput = await importMapping("put", columnData == null ? void 0 : columnData.id, data);
           if (resput.status === 200 && resput.ok) {
             columnMappingListMap.set(listValue.value, resput.data);
           }
         } 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 {
@@ -160,13 +173,14 @@ const DataImport2 = /* @__PURE__ */ 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 = `${pluralLower(dataEntityTag)}/asyncimportdata2?srfimporttag=${props.appDataEntity.defaultAppDEDataImportId}&srfossfileid=${fileid}&srfimportschemaid=${id}`;
+          let id = "";
+          if (data) {
+            id = data.id;
+          }
+          const dataEntityTag = props.appDataEntity.codeName2;
+          const url = `${dataEntityTag}/asyncimportdata2?srfimporttag=${props.appDataEntity.defaultAppDEDataImportId}&srfossfileid=${fileid}&srfimportschemaid=${id}`;
           await ibiz.net.request(url, {
             method: "get"
           });
@@ -204,7 +218,11 @@ const DataImport2 = /* @__PURE__ */ 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);
         });
@@ -214,71 +232,15 @@ const DataImport2 = /* @__PURE__ */ 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;
+      }
+      if (dataimport2.value && dataimport2.value.parentElement) {
+        findDialog(dataimport2.value.parentElement);
       }
-      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 createVNode(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 createVNode(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) => createVNode("tr", {
-        "key": rowIndex
-      }, [row.map((cell, cellIndex) => rowIndex === 0 ? createVNode("th", {
-        "key": cellIndex,
-        "style": {
-          border: "1px solid #e5e5e5",
-          padding: "4px",
-          "min-width": "132px"
-        }
-      }, [cell]) : createVNode("td", {
-        "key": cellIndex,
-        "style": {
-          border: "1px solid #e5e5e5",
-          padding: "4px",
-          "min-width": "132px"
-        }
-      }, [cell]))]));
-      const newRows = [createVNode("tr", {
-        "key": "newRow"
-      }, [arr[0].map((item, index) => createVNode("td", {
-        "key": index,
-        "style": {
-          border: "1px solid #e5e5e5",
-          "min-width": "132px"
-        }
-      }, [renderSelect(item, index)]))]), ...rows];
-      return createVNode("table", {
-        "style": "border-collapse:collapse;border-spacing:0"
-      }, [createVNode("tbody", null, [newRows])]);
-    };
     const headers = ref({
       Authorization: `Bearer ${getCookie(CoreConst.TOKEN)}`
     });
@@ -295,10 +257,10 @@ const DataImport2 = /* @__PURE__ */ 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;
@@ -328,29 +290,40 @@ const DataImport2 = /* @__PURE__ */ defineComponent({
           });
         }
       }
-      ColumnMappingSave.value = false;
       isLoading.value = false;
       watchValue(listValue.value);
     };
-    const renderEmpty = () => {
-      return createVNode("div", {
-        "class": ns.e("empty")
-      }, [createTextVNode("\u6682\u65E0\u6570\u636E")]);
+    const columnMappingSaveChange = (data) => {
+      ColumnMappingSave.value = data;
+    };
+    const selectValuesChange = (index, item) => {
+      selectValues.value[index] = item;
+    };
+    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 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 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 {
@@ -362,22 +335,28 @@ const DataImport2 = /* @__PURE__ */ 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 withDirectives(createVNode("div", {
       "class": [this.ns.b(), "ibiz-view"],
       "ref": "dataimport2"
@@ -399,34 +378,22 @@ const DataImport2 = /* @__PURE__ */ defineComponent({
       "class": "ibiz-control-toolbar"
     }, [createVNode("div", {
       "class": "ibiz-control-toolbar__item"
-    }, [createVNode(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 createVNode(resolveComponent("el-option"), {
-        "label": item.label,
-        "value": item.value,
-        "class": [this.ns.e("select-option")]
-      }, {
-        default: () => createVNode("div", {
-          "class": [this.ns.e("select-option-item")]
-        }, [createVNode("span", null, [item.label]), createVNode(resolveComponent("el-button"), {
-          "text": true,
-          "size": "small",
-          "onClick": (e) => this.handleDeleteOption(e, item.value),
-          "class": this.ns.e("select-option-item-button")
-        }, {
-          default: () => [createTextVNode("\u5220\u9664")]
-        })])
-      });
-    })) ? _slot2 : {
-      default: () => [_slot2]
-    })]), createVNode(resolveComponent("el-upload"), {
+    }, [this.fileName ? `\u5F53\u524D\u6587\u4EF6\u540D:${this.fileName}` : ""]), this.previewinfo[0] && this.previewinfo[0].length ? createVNode(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 ? createVNode("div", {
+      "class": "ibiz-control-toolbar__item"
+    }, [createVNode(resolveComponent("el-button"), {
+      "onClick": this.onButtonColumnMappingImportClick,
+      "disabled": this.isNoPersonel
+    }, {
+      default: () => [createTextVNode("\u5BFC\u5165\u6A21\u5F0F\u4FDD\u5B58")]
+    })]) : "", createVNode(resolveComponent("el-upload"), {
       "class": "ibiz-control-toolbar__item",
       "action": this.UploadUrl,
       "headers": this.headers,
@@ -435,25 +402,25 @@ const DataImport2 = /* @__PURE__ */ defineComponent({
       "before-upload": this.beforeUpload
     }, {
       default: () => [createVNode(resolveComponent("el-button"), null, {
-        default: () => [createTextVNode("\u6587\u4EF6\u4E0A\u4F20")]
+        default: () => [this.previewinfo[0] && this.previewinfo[0].length ? "\u91CD\u65B0\u4E0A\u4F20\u6587\u4EF6" : "\u6587\u4EF6\u4E0A\u4F20"]
       })]
-    }), createVNode("div", {
-      "class": "ibiz-control-toolbar__item"
-    }, [createVNode(resolveComponent("el-button"), {
-      "onClick": this.onButtonColumnMappingImportClick,
-      "disabled": this.isNoPersonel
-    }, {
-      default: () => [createTextVNode("\u5BFC\u5165\u6A21\u5F0F\u4FDD\u5B58")]
-    })]), createVNode("div", {
+    }), this.previewinfo[0] && this.previewinfo[0].length ? createVNode("div", {
       "class": "ibiz-control-toolbar__item"
     }, [createVNode(resolveComponent("el-button"), {
       "onClick": this.onButtonImportClick
     }, {
       default: () => [createTextVNode("\u5BFC\u5165")]
-    })])])])])]), createVNode("div", {
-      "class": [this.ns.e("template-container"), "ibiz-panel-view-content"]
-    }, [this.previewinfo[0] && this.previewinfo[0].length ? this.renderTable() : this.renderEmpty()])]), [[resolveDirective("loading"), this.isLoading]]);
+    })]) : ""])])])]), createVNode(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)]), [[resolveDirective("loading"), this.isLoading]]);
   }
 });
 
-export { DataImport2 };
+export { DataImport2, importMapping };

package/es/common/data-import2-select/data-import2-select.css

@@ -0,0 +1 @@
+.ibiz-data-import2-select__select-option{padding:var(--ibiz-spacing-none)}.ibiz-data-import2-select__select-option-item{padding:var(--ibiz-spacing-none) 30px var(--ibiz-spacing-none) 10px;display:flex;align-items:center;justify-content:space-between;height:100%}.ibiz-data-import2-select__select-option-item:hover .ibiz-data-import2-select__select-option-item-button-delete{display:block}.ibiz-data-import2-select__select-option-item-button-delete{position:absolute;right:var(--ibiz-spacing-none);display:none}.ibiz-data-import2-select__dataimport-select{margin-top:-5px}.ibiz-data-import2-select__select-option-item-button-delete-icon{color:red}.ibiz-data-import2-select__select-option-item-input{width:100%}

package/es/common/data-import2-select/data-import2-select.d.ts

@@ -0,0 +1,59 @@
+import { PropType } from 'vue';
+import './data-import2-select.scss';
+export declare const DataImport2Select: import("vue").DefineComponent<{
+    previewinfo: {
+        type: PropType<[string[]]>;
+        required: true;
+    };
+    options: {
+        type: PropType<{
+            value: string;
+            label: string;
+            oldLabel: string;
+            edit: boolean;
+            checkmark: boolean;
+            close: boolean;
+        }[]>;
+        required: true;
+    };
+    columnMappingListMap: {
+        type: PropType<Map<string, IData>>;
+        required: true;
+    };
+    listValue: {
+        type: StringConstructor;
+        required: true;
+    };
+}, {
+    ns: import("@ibiz-template/core").Namespace;
+    inputClick: (e: Event) => void;
+    editLabel: (e: Event, item: IData) => void;
+    saveLabel: (e: Event, item: IData) => Promise<void>;
+    notSaveLabel: (e: Event, item: IData) => void;
+    handleDeleteOption: (e: Event, str: string) => Promise<void>;
+    valueChange: (data: string) => void;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    previewinfo: {
+        type: PropType<[string[]]>;
+        required: true;
+    };
+    options: {
+        type: PropType<{
+            value: string;
+            label: string;
+            oldLabel: string;
+            edit: boolean;
+            checkmark: boolean;
+            close: boolean;
+        }[]>;
+        required: true;
+    };
+    columnMappingListMap: {
+        type: PropType<Map<string, IData>>;
+        required: true;
+    };
+    listValue: {
+        type: StringConstructor;
+        required: true;
+    };
+}>>, {}, {}>;