@vipl520/dk-ui 1.0.10 → 1.0.12

package/dist/index.js

@@ -187,13 +187,13 @@
 
   const globalConfig = {
     // TODO 参数如果未填写自动获取
-    ApiUrl: "https://independence.heiduoke.cn",
+    ApiUrl: "",
     // 默认的 API 地址
-    AccessToken: "b5fe9c57-24fc-44da-b7f0-e655554c31d1",
+    AccessToken: "",
     // 用户登录后的 token
-    Plaid: 16,
+    Plaid: 0,
     // 平台ID
-    AddonName: "demo_wx",
+    AddonName: "",
     ProjectType: "addon"
   };
   function setGlobalConfig(newConfig) {
@@ -379,14 +379,14 @@
           customOptions.code_error_show && elementPlus.ElMessage.error(res.msg);
           switch (code) {
             case -1:
-              return Promise.reject(res);
             case 401:
-              break;
+            case 402:
+            case 403:
+              return Promise.reject(res);
             default:
               return Promise.reject(response.data || { msg: "\u672A\u77E5\u9519\u8BEF" });
           }
         }
-        return res;
       },
       (error) => {
         console.log("error", error);
@@ -10296,12 +10296,16 @@
     });
   }
   function getAttachmentGroupList(type) {
-    console.log("typetypetype", type);
-    return request({
-      method: "get",
-      url: "/adminapi/attachment/group",
-      params: { type }
-    });
+    return request(
+      {
+        method: "get",
+        url: "/adminapi/attachment/group",
+        params: { type }
+      },
+      {
+        code_error_show: true
+      }
+    );
   }
   function delAttachmentGroup(id) {
     return request(
@@ -10724,6 +10728,10 @@
     draggable: {
       type: Boolean,
       default: true
+    },
+    zIndex: {
+      type: Number,
+      default: 1299
     }
   };
 
@@ -10793,7 +10801,8 @@
           draggable: _ctx.draggable,
           "close-on-click-modal": false,
           "show-close": false,
-          class: "dk-dialog"
+          class: "dk-dialog",
+          "z-index": props.zIndex
         }), require$$0.createSlots({
           header: require$$0.withCtx(({ close }) => [
             require$$0.renderSlot(_ctx.$slots, "header", {}, () => [
@@ -10846,7 +10855,7 @@
             ]),
             key: "0"
           } : void 0
-        ]), 1040, ["fullscreen", "draggable"]);
+        ]), 1040, ["fullscreen", "draggable", "z-index"]);
       };
     }
   });
@@ -10874,7 +10883,7 @@
     // 显示加载
     isLoading: { default: true, type: Boolean },
     // 默认高度
-    minHeight: { default: "300px", type: String },
+    minHeight: { default: "100px", type: String },
     // 是否为弹窗
     isDialog: { default: false, type: Boolean },
     // 弹窗显示后获取formData
@@ -10885,8 +10894,7 @@
         return {
           width: "800px",
           fullscreen: false,
-          minHeight: "200px",
-          draggable: true
+          draggable: false
         };
       },
       type: Object
@@ -10998,56 +11006,48 @@
       );
       const dialogWidth = require$$0.computed(() => {
         let defaultWidth = "800px";
+        const config2 = _formData.value?.config || {};
+        if (config2?.width) {
+          return config2?.width;
+        }
         if (props.dialog?.width) {
           defaultWidth = props.dialog?.width;
         }
-        if (_formData.value?.config?.width) {
-          defaultWidth = _formData.value?.config?.width;
+        if (config2?.defaultWidth) {
+          defaultWidth = config2?.defaultWidth;
         }
-        return width.value < 768 ? "100%" : defaultWidth;
-      });
-      const dialogStyle = require$$0.computed(() => {
-        const style = {
-          minHeight: void 0,
-          maxHeight: void 0
-        };
-        if (props.dialog?.minHeight) {
-          style.minHeight = props.dialog?.minHeight;
-        }
-        if (props.dialog?.maxHeight) {
-          style.maxHeight = props.dialog?.maxHeight;
-        }
-        if (_formData.value?.config?.minHeight) {
-          style.minHeight = _formData.value?.config?.minHeight;
+        let minWidth = 768;
+        if (!defaultWidth.endsWith("%")) {
+          minWidth = parseInt(defaultWidth);
         }
-        if (_formData.value?.config?.maxHeight) {
-          style.maxHeight = _formData.value?.config?.maxHeight;
-        }
-        return style;
+        return width.value < minWidth ? "100%" : defaultWidth;
       });
-      const draggable = require$$0.computed(() => {
-        let draggable2 = true;
-        if (props.dialog?.draggable) {
-          draggable2 = props.dialog?.draggable;
+      const dialogStyle = require$$0.computed(() => {
+        if (_formData.value?.config?.style) {
+          return _formData.value?.config?.style;
         }
-        if (_formData.value?.config?.draggable !== void 0) {
-          draggable2 = _formData.value?.config?.draggable;
+        if (props.dialog?.style) {
+          return props.dialog?.style;
         }
-        return draggable2;
+        return {};
       });
       const isFullscreen = require$$0.computed(() => {
         let defaultFullscreen = false;
+        const autoFullscreen = _formData.value?.config?.autoFullscreen !== false;
         if (props.dialog?.width) {
           defaultFullscreen = props.dialog?.fullscreen;
         }
         if (_formData.value?.config?.fullscreen) {
           defaultFullscreen = _formData.value?.config?.fullscreen;
         }
-        if (width.value < 768) {
+        if (width.value < 768 && autoFullscreen) {
           defaultFullscreen = true;
         }
         return defaultFullscreen;
       });
+      const dialogProps = require$$0.computed(() => {
+        return Object.assign(props.dialog, _formData.value?.config?.dialog);
+      });
       const setFormData = (formData) => {
         value.value = null;
         _formData.value = formData;
@@ -11073,7 +11073,6 @@
             loading.value = false;
           }).catch((res) => {
             loading.value = false;
-            console.error(res);
           });
         }
       };
@@ -11131,17 +11130,15 @@
       });
       return (_ctx, _cache) => {
         const _component_DkDialog = require$$0.resolveComponent("DkDialog");
-        return props.isDialog ? (require$$0.openBlock(), require$$0.createBlock(_component_DkDialog, {
+        return props.isDialog ? (require$$0.openBlock(), require$$0.createBlock(_component_DkDialog, require$$0.mergeProps({
           key: 0,
           modelValue: showDialog.value,
           "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => showDialog.value = $event),
           title: _formData.value?.title ? _formData.value?.title : "\u8868\u5355",
           width: dialogWidth.value,
           "default-fullscreen": isFullscreen.value,
-          "min-height": "200px",
-          draggable: draggable.value,
-          "append-to-body": ""
-        }, {
+          "min-height": "200px"
+        }, dialogProps.value, { "append-to-body": "" }), {
           default: require$$0.withCtx(() => [
             require$$0.createElementVNode(
               "div",
@@ -11157,7 +11154,6 @@
                   rule: _formData.value.rules,
                   "handle-icon": false,
                   class: "formBox",
-                  style: { "padding": "10px" },
                   "onUpdate:api": _cache[1] || (_cache[1] = ($event) => fApi.value = $event),
                   "onUpdate:value": _cache[2] || (_cache[2] = ($event) => value.value = $event)
                 }, null, 8, ["modelValue", "option", "rule"]),
@@ -11175,7 +11171,7 @@
                         onClick: checkForm
                       }, {
                         default: require$$0.withCtx(() => [
-                          require$$0.createTextVNode(" \u63D0\u4EA4 ")
+                          require$$0.createTextVNode(" \u63D0\u4EA4")
                         ]),
                         _: 1
                         /* STABLE */
@@ -11192,7 +11188,7 @@
           ]),
           _: 3
           /* FORWARDED */
-        }, 8, ["modelValue", "title", "width", "default-fullscreen", "draggable"])) : (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_1$F, [
+        }, 16, ["modelValue", "title", "width", "default-fullscreen"])) : (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_1$F, [
           require$$0.createElementVNode(
             "div",
             {
@@ -11224,7 +11220,7 @@
                       onClick: checkForm
                     }, {
                       default: require$$0.withCtx(() => [
-                        require$$0.createTextVNode(" \u63D0\u4EA4 ")
+                        require$$0.createTextVNode(" \u63D0\u4EA4")
                       ]),
                       _: 1
                       /* STABLE */
@@ -11517,10 +11513,10 @@
       const chooseFileList = require$$0.ref([]);
       const chooseFileId = require$$0.ref([]);
       const globalConfig = getGlobalConfig();
-      const uploadUrl = require$$0.ref(globalConfig.ApiUrl);
-      const headers = require$$0.ref({
+      const uploadUrl = globalConfig.ApiUrl + "/adminapi/attachment/upload";
+      const headers = {
         "Access-Token": globalConfig.AccessToken
-      });
+      };
       const upload = require$$0.ref();
       const data = require$$0.reactive({
         type: _type.value,
@@ -11534,6 +11530,7 @@
         });
       };
       const handleUploadSuccess = (res) => {
+        console.log("res", res);
         if (res.code === 0) {
           elementPlus.ElMessage.success(res.msg);
           onGetAttachmentList();
@@ -11657,7 +11654,6 @@
           count.value = res.msg;
           loading.value = false;
         } catch (e) {
-          console.log(e);
         }
       };
       const clearChoose = () => {
@@ -11789,11 +11785,11 @@
                 ref_key: "upload",
                 ref: upload,
                 class: "dk-upload-button",
-                action: uploadUrl.value,
+                action: uploadUrl,
                 multiple: "",
                 data,
                 "show-file-list": false,
-                headers: headers.value,
+                headers,
                 "on-success": handleUploadSuccess,
                 accept: _accept.value,
                 "list-type": "text"
@@ -11810,7 +11806,7 @@
                 ]),
                 _: 1
                 /* STABLE */
-              }, 8, ["action", "data", "headers", "accept"])
+              }, 8, ["data", "accept"])
             ])
           ]),
           require$$0.createCommentVNode("\u5185\u90E8"),
@@ -26276,62 +26272,92 @@
      * 获取表格配置
      */
     table() {
-      return request({
-        url: this.actionUrl.get("table"),
-        method: "post"
-      });
+      return request(
+        {
+          url: this.actionUrl.get("table"),
+          method: "post"
+        },
+        {
+          code_error_show: true
+        }
+      );
     }
     /**
      * 获取表格配置
      */
     recycleTable() {
-      return request({
-        url: this.actionUrl.get("recycleTable"),
-        method: "post"
-      });
+      return request(
+        {
+          url: this.actionUrl.get("recycleTable"),
+          method: "post"
+        },
+        {
+          code_error_show: true
+        }
+      );
     }
     /**
      * 获取表单
      */
     form(id) {
-      return request({
-        url: this.actionUrl.get("form"),
-        method: "post",
-        data: { id }
-      });
+      return request(
+        {
+          url: this.actionUrl.get("form"),
+          method: "post",
+          data: { id }
+        },
+        {
+          code_error_show: true
+        }
+      );
     }
     /**
      * 获取表格列表
      * @param filter
      */
     index(filter = {}) {
-      return request({
-        url: this.actionUrl.get("index"),
-        method: "get",
-        params: filter
-      });
+      return request(
+        {
+          url: this.actionUrl.get("index"),
+          method: "get",
+          params: filter
+        },
+        {
+          code_error_show: true
+        }
+      );
     }
     /**
      * 回收站列表
      * @param filter
      */
     recycle(filter = {}) {
-      return request({
-        url: this.actionUrl.get("recycle"),
-        method: "get",
-        params: filter
-      });
+      return request(
+        {
+          url: this.actionUrl.get("recycle"),
+          method: "get",
+          params: filter
+        },
+        {
+          code_error_show: true
+        }
+      );
     }
     /**
      * 编辑
      * @param params
      */
     edit(params) {
-      return request({
-        url: this.actionUrl.get("edit"),
-        method: "get",
-        params
-      });
+      return request(
+        {
+          url: this.actionUrl.get("edit"),
+          method: "get",
+          params
+        },
+        {
+          code_error_show: true
+        }
+      );
     }
     /**
      * 删除
@@ -26347,7 +26373,8 @@
           }
         },
         {
-          code_success_show: true
+          code_success_show: true,
+          code_error_show: true
         }
       );
     }
@@ -26365,7 +26392,8 @@
           }
         },
         {
-          code_success_show: true
+          code_success_show: true,
+          code_error_show: true
         }
       );
     }
@@ -26383,7 +26411,8 @@
           }
         },
         {
-          code_success_show: true
+          code_success_show: true,
+          code_error_show: true
         }
       );
     }
@@ -26400,7 +26429,8 @@
           data
         },
         {
-          code_success_show: true
+          code_success_show: true,
+          code_error_show: true
         }
       );
     }
@@ -28206,8 +28236,10 @@
                                             require$$0.createVNode(_component_dk_select, {
                                               modelValue: require$$0.unref(DkTable).comSearch.form[item.prop],
                                               "onUpdate:modelValue": ($event) => require$$0.unref(DkTable).comSearch.form[item.prop] = $event,
+                                              filterable: "",
+                                              placeholder: item.operatorPlaceholder,
                                               "remote-url": item.remoteUrl
-                                            }, null, 8, ["modelValue", "onUpdate:modelValue", "remote-url"])
+                                            }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "remote-url"])
                                           ],
                                           2112
                                           /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
@@ -28412,7 +28444,6 @@
           }
           item.type === "selection" || item.render === "buttons" || item.enableColumnDisplayControl === false ? "" : columnDisplayArr.push(item);
         }
-        console.log("columnDisplayArr", columnDisplayArr);
         return columnDisplayArr;
       });
       const enableBatchOpt = require$$0.computed(() => DkTable.table.selection.length > 0);
@@ -29410,7 +29441,6 @@
               onSelectionChange
             }, {
               default: require$$0.withCtx(() => [
-                require$$0.createCommentVNode('      <template v-for="(item, key) in DkTable.recycleTable.column">'),
                 (require$$0.openBlock(true), require$$0.createElementBlock(
                   require$$0.Fragment,
                   null,
@@ -29429,7 +29459,7 @@
                 require$$0.createCommentVNode("      </template>"),
                 require$$0.createVNode(_component_el_table_column, {
                   label: "\u64CD\u4F5C",
-                  width: "100"
+                  align: "right"
                 }, {
                   default: require$$0.withCtx(({ row }) => [
                     require$$0.createVNode(_component_el_button, {
@@ -29503,7 +29533,6 @@
         DkTable.table.ref = TableRef.value;
         DkTable.form.ref = FormRef.value;
       });
-      require$$0.ref(false);
       const onTableSizeChange = (val) => {
         DkTable.onTableAction("page-size-change", { size: val });
       };
@@ -30063,10 +30092,10 @@
     emits: ["update:modelValue", "change", "visible-change", "remove-tag", "clear", "blur", "focus"],
     setup(__props, { emit }) {
       const props = __props;
-      console.log("options", props.placeholder);
       const internalValue = require$$0.ref(props.modelValue);
-      const internalOptions = require$$0.ref(props.options || []);
+      const internalOptions = require$$0.ref(props.options || {});
       require$$0.watch(internalValue, (newValue) => {
+        console.log("new", newValue);
         emit("update:modelValue", newValue);
       });
       const remoteMethod = (query) => {
@@ -30101,7 +30130,7 @@
         }, { ...props }, {
           "remote-method": remoteMethod,
           remote: "",
-          placeholder: "\u8BF7\u9009\u62E9",
+          placeholder: "c\u6D4B\u8BD5",
           options: internalOptions.value,
           style: { "width": "100%" },
           onChange: handleChange,