@vipl520/dk-ui 1.0.8 → 1.0.10

package/dist/index.js

@@ -189,7 +189,7 @@
     // TODO 参数如果未填写自动获取
     ApiUrl: "https://independence.heiduoke.cn",
     // 默认的 API 地址
-    AccessToken: "3c388087-0f14-4f8d-8463-9fc9932ce2f6",
+    AccessToken: "b5fe9c57-24fc-44da-b7f0-e655554c31d1",
     // 用户登录后的 token
     Plaid: 16,
     // 平台ID
@@ -355,7 +355,7 @@
         }
         config2.headers["Access-Token"] = getGlobalConfig().AccessToken;
         config2.headers["Project-Type"] = getGlobalConfig().ProjectType;
-        config2.headers.addon = getGlobalConfig().AddonName;
+        config2.headers["Addon-Name"] = getGlobalConfig().AddonName;
         config2.headers.Plaid = getGlobalConfig().Plaid;
         config2.params = config2.params || {};
         config2.params._ajax = 1;
@@ -10380,6 +10380,9 @@
       const tinymceSrc = require$$0.ref("https://registry.npmmirror.com/dk-tinymce/1.0.0/files/tinymce.min.js");
       const attachmentRef = require$$0.ref();
       const editorRef = require$$0.ref();
+      const showDialog = require$$0.computed(() => {
+        return width.value >= props.showDialogWidth;
+      });
       require$$0.watch(
         () => props.modelValue,
         (newValue) => {
@@ -10443,7 +10446,7 @@
             class: "dk-tiny-editor"
           },
           [
-            require$$0.unref(width).value >= props.showDialogWidth ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_1$I, [
+            showDialog.value ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_1$I, [
               require$$0.createVNode(require$$0.unref(Editor), {
                 ref_key: "editorRef",
                 ref: editorRef,
@@ -10540,20 +10543,11 @@
       type: String
     },
     // icon color
-    color: {
-      default: "",
-      type: String
-    },
+    color: String,
     // icon size
-    size: {
-      default: 14,
-      type: Number
-    },
+    size: Number,
     // icon hover
-    hoverColor: {
-      default: "",
-      type: String
-    },
+    hoverColor: String,
     showEl: {
       default: true,
       type: Boolean
@@ -10577,12 +10571,15 @@
         return key;
       });
       const getIconifyStyle = require$$0.computed(() => {
-        const { color, size } = props;
-        return {
-          fontSize: `${size}px`,
-          color,
-          "--hover-color": props.hoverColor
-        };
+        const { color, size, hoverColor } = props;
+        const style = {};
+        if (color)
+          style.color = color;
+        if (size)
+          style.fontSize = `${size}px`;
+        if (hoverColor)
+          style["--hover-color"] = hoverColor;
+        return style;
       });
       const iconType = require$$0.computed(() => {
         let type = "cloud";
@@ -10723,6 +10720,10 @@
     maxHeight: {
       type: String,
       default: ""
+    },
+    draggable: {
+      type: Boolean,
+      default: true
     }
   };
 
@@ -10759,9 +10760,7 @@
       const toggleFull = () => {
         isFullscreen.value = !require$$0.unref(isFullscreen);
       };
-      const dialogHeight = require$$0.ref(
-        isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight
-      );
+      const dialogHeight = require$$0.ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight);
       require$$0.watch(
         () => isFullscreen.value,
         async (val) => {
@@ -10791,7 +10790,7 @@
           "destroy-on-close": "",
           "append-to-body": "",
           "lock-scroll": "",
-          draggable: "",
+          draggable: _ctx.draggable,
           "close-on-click-modal": false,
           "show-close": false,
           class: "dk-dialog"
@@ -10847,7 +10846,7 @@
             ]),
             key: "0"
           } : void 0
-        ]), 1040, ["fullscreen"]);
+        ]), 1040, ["fullscreen", "draggable"]);
       };
     }
   });
@@ -10875,7 +10874,7 @@
     // 显示加载
     isLoading: { default: true, type: Boolean },
     // 默认高度
-    minHeight: { default: "100px", type: [String, Number] },
+    minHeight: { default: "300px", type: String },
     // 是否为弹窗
     isDialog: { default: false, type: Boolean },
     // 弹窗显示后获取formData
@@ -10883,7 +10882,12 @@
     // 弹窗配置
     dialog: {
       default: () => {
-        return {};
+        return {
+          width: "800px",
+          fullscreen: false,
+          minHeight: "200px",
+          draggable: true
+        };
       },
       type: Object
     }
@@ -10981,7 +10985,6 @@
       const fApi = require$$0.ref();
       const loading = require$$0.ref(true);
       const buttonLoading = require$$0.ref(false);
-      const minHeight = require$$0.computed(() => isNumber(props.minHeight) ? `${props.minHeight}px` : props.minHeight);
       const showDialog = require$$0.ref(false);
       const formConfig = require$$0.computed(() => ({ ...config, ...props.extraConfig }));
       const { width } = core.useWindowSize();
@@ -10993,6 +10996,58 @@
           emit("update:modelValue", val || {});
         }
       );
+      const dialogWidth = require$$0.computed(() => {
+        let defaultWidth = "800px";
+        if (props.dialog?.width) {
+          defaultWidth = props.dialog?.width;
+        }
+        if (_formData.value?.config?.width) {
+          defaultWidth = _formData.value?.config?.width;
+        }
+        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;
+        }
+        if (_formData.value?.config?.maxHeight) {
+          style.maxHeight = _formData.value?.config?.maxHeight;
+        }
+        return style;
+      });
+      const draggable = require$$0.computed(() => {
+        let draggable2 = true;
+        if (props.dialog?.draggable) {
+          draggable2 = props.dialog?.draggable;
+        }
+        if (_formData.value?.config?.draggable !== void 0) {
+          draggable2 = _formData.value?.config?.draggable;
+        }
+        return draggable2;
+      });
+      const isFullscreen = require$$0.computed(() => {
+        let defaultFullscreen = false;
+        if (props.dialog?.width) {
+          defaultFullscreen = props.dialog?.fullscreen;
+        }
+        if (_formData.value?.config?.fullscreen) {
+          defaultFullscreen = _formData.value?.config?.fullscreen;
+        }
+        if (width.value < 768) {
+          defaultFullscreen = true;
+        }
+        return defaultFullscreen;
+      });
       const setFormData = (formData) => {
         value.value = null;
         _formData.value = formData;
@@ -11081,16 +11136,17 @@
           modelValue: showDialog.value,
           "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => showDialog.value = $event),
           title: _formData.value?.title ? _formData.value?.title : "\u8868\u5355",
-          width: require$$0.unref(width).value < 768 ? "100%" : "800px",
-          "default-fullscreen": require$$0.unref(width).value < 768,
+          width: dialogWidth.value,
+          "default-fullscreen": isFullscreen.value,
           "min-height": "200px",
+          draggable: draggable.value,
           "append-to-body": ""
         }, {
           default: require$$0.withCtx(() => [
             require$$0.createElementVNode(
               "div",
               {
-                style: require$$0.normalizeStyle({ minHeight: minHeight.value }),
+                style: require$$0.normalizeStyle(dialogStyle.value),
                 class: "dk-form"
               },
               [
@@ -11101,6 +11157,7 @@
                   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"]),
@@ -11131,16 +11188,15 @@
               ],
               4
               /* STYLE */
-            ),
-            require$$0.createCommentVNode('    <div v-else :style="{ minHeight }"></div>')
+            )
           ]),
           _: 3
           /* FORWARDED */
-        }, 8, ["modelValue", "title", "width", "default-fullscreen"])) : (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_1$F, [
+        }, 8, ["modelValue", "title", "width", "default-fullscreen", "draggable"])) : (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_1$F, [
           require$$0.createElementVNode(
             "div",
             {
-              style: require$$0.normalizeStyle({ minHeight: minHeight.value }),
+              style: require$$0.normalizeStyle({ minHeight: _ctx.minHeight }),
               class: "dk-form"
             },
             [
@@ -11419,13 +11475,13 @@
   const _hoisted_11$4 = { class: "ml-10px" };
   const _hoisted_12$4 = { class: "op" };
   const _hoisted_13$3 = { class: "attachment-container" };
-  const _hoisted_14$2 = {
+  const _hoisted_14$3 = {
     key: 0,
     class: "p2"
   };
-  const _hoisted_15$2 = ["onClick", "onContextmenu"];
-  const _hoisted_16$1 = { class: "file" };
-  const _hoisted_17$1 = /* @__PURE__ */ require$$0.createElementVNode(
+  const _hoisted_15$3 = ["onClick", "onContextmenu"];
+  const _hoisted_16$3 = { class: "file" };
+  const _hoisted_17$2 = /* @__PURE__ */ require$$0.createElementVNode(
     "div",
     { class: "u-m-t-30" },
     [
@@ -11460,6 +11516,7 @@
       const chooseFileKey = require$$0.ref([]);
       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({
         "Access-Token": globalConfig.AccessToken
@@ -11854,7 +11911,7 @@
             ]),
             require$$0.createCommentVNode(" \u5217\u8868"),
             require$$0.createElementVNode("div", _hoisted_13$3, [
-              loading.value || list.value.length > 0 ? require$$0.withDirectives((require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_14$2, [
+              loading.value || list.value.length > 0 ? require$$0.withDirectives((require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_14$3, [
                 require$$0.createElementVNode(
                   "ul",
                   {
@@ -11872,7 +11929,7 @@
                           onClick: ($event) => chooseAttachment(item, key),
                           onContextmenu: require$$0.withModifiers(($event) => contextMenuId.value = item.id, ["prevent"])
                         }, [
-                          require$$0.createElementVNode("div", _hoisted_16$1, [
+                          require$$0.createElementVNode("div", _hoisted_16$3, [
                             item.type === 1 ? (require$$0.openBlock(), require$$0.createBlock(_component_el_image, {
                               key: 0,
                               class: "file",
@@ -11880,7 +11937,7 @@
                               fit: "contain"
                             }, {
                               placeholder: require$$0.withCtx(() => [
-                                _hoisted_17$1
+                                _hoisted_17$2
                               ]),
                               _: 2
                               /* DYNAMIC */
@@ -11919,7 +11976,7 @@
                               /* STABLE */
                             })
                           ])
-                        ], 42, _hoisted_15$2);
+                        ], 42, _hoisted_15$3);
                       }),
                       128
                       /* KEYED_FRAGMENT */
@@ -12116,9 +12173,10 @@
       return (_ctx, _cache) => {
         const _component_el_button = require$$0.resolveComponent("el-button");
         const _component_el_input = require$$0.resolveComponent("el-input");
+        const _component_dk_icon = require$$0.resolveComponent("dk-icon");
+        const _component_el_image = require$$0.resolveComponent("el-image");
         const _component_Picture = require$$0.resolveComponent("Picture");
         const _component_el_icon = require$$0.resolveComponent("el-icon");
-        const _component_el_image = require$$0.resolveComponent("el-image");
         const _component_Close = require$$0.resolveComponent("Close");
         const _component_Plus = require$$0.resolveComponent("Plus");
         const _component_dk_attachment_dialog = require$$0.resolveComponent("dk-attachment-dialog");
@@ -12163,13 +12221,7 @@
                   }, {
                     error: require$$0.withCtx(() => [
                       require$$0.createElementVNode("div", _hoisted_2$s, [
-                        require$$0.createVNode(_component_el_icon, null, {
-                          default: require$$0.withCtx(() => [
-                            require$$0.createVNode(_component_Picture)
-                          ]),
-                          _: 1
-                          /* STABLE */
-                        })
+                        require$$0.createVNode(_component_dk_icon, { icon: "Picture" })
                       ])
                     ]),
                     _: 1
@@ -12183,13 +12235,7 @@
                   require$$0.createElementVNode("em", {
                     onClick: _cache[1] || (_cache[1] = ($event) => input.value = "")
                   }, [
-                    require$$0.createVNode(_component_el_icon, null, {
-                      default: require$$0.withCtx(() => [
-                        require$$0.createVNode(_component_Close)
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    })
+                    require$$0.createVNode(_component_dk_icon, { icon: "Close" })
                   ])
                 ])
               ],
@@ -14019,16 +14065,16 @@
   );
   const _hoisted_12$3 = { class: "anchor-wrapper" };
   const _hoisted_13$2 = ["onMousedown"];
-  const _hoisted_14$1 = /* @__PURE__ */ require$$0.createElementVNode(
+  const _hoisted_14$2 = /* @__PURE__ */ require$$0.createElementVNode(
     "span",
     { class: "title" },
     " \u5916\u8FB9\u8DDD ",
     -1
     /* HOISTED */
   );
-  const _hoisted_15$1 = { class: "thumnail border" };
-  const _hoisted_16 = ["title", "onDblclick"];
-  const _hoisted_17 = ["onUpdate:modelValue", "onBlur"];
+  const _hoisted_15$2 = { class: "thumnail border" };
+  const _hoisted_16$2 = ["title", "onDblclick"];
+  const _hoisted_17$1 = ["onUpdate:modelValue", "onBlur"];
   const _hoisted_18 = ["width", "height", "viewBox", "data-link-anchor", "innerHTML"];
   const _hoisted_19 = { class: "anchor-wrapper" };
   const _hoisted_20 = ["onMousedown"];
@@ -14451,10 +14497,10 @@
                         /* STABLE_FRAGMENT */
                       ))
                     ]),
-                    _hoisted_14$1,
+                    _hoisted_14$2,
                     require$$0.createCommentVNode("\u5916\u8FB9\u8DDD Margin END"),
                     require$$0.createCommentVNode("\u5185\u8FB9\u8DDD Padding"),
-                    require$$0.createElementVNode("div", _hoisted_15$1, [
+                    require$$0.createElementVNode("div", _hoisted_15$2, [
                       require$$0.createElementVNode(
                         "div",
                         {
@@ -14473,7 +14519,7 @@
                                     title: item.title,
                                     class: require$$0.normalizeClass(`anchor-tip-${item.position} value-indicator`),
                                     onDblclick: ($event) => onDblclick(item.value, key + 4)
-                                  }, require$$0.toDisplayString(getValue(styles[item.value])), 43, _hoisted_16),
+                                  }, require$$0.toDisplayString(getValue(styles[item.value])), 43, _hoisted_16$2),
                                   require$$0.withDirectives(require$$0.createElementVNode("input", {
                                     ref_for: true,
                                     ref_key: "inputField",
@@ -14483,7 +14529,7 @@
                                       "input-box anchor-tip-" + item.position + (showStyles[item.value] ? " show" : "")
                                     ),
                                     onBlur: ($event) => onBlur(item.value)
-                                  }, null, 42, _hoisted_17), [
+                                  }, null, 42, _hoisted_17$1), [
                                     [require$$0.vModelText, styles[item.value]]
                                   ]),
                                   (require$$0.openBlock(), require$$0.createElementBlock("svg", {
@@ -23170,6 +23216,10 @@
     tableApi: {
       default: "",
       type: String
+    },
+    cacheTable: {
+      default: true,
+      type: Boolean
     }
     // ...ElTableNext.props,
   };
@@ -26198,6 +26248,9 @@
     controllerUrl;
     actionUrl;
     constructor(controllerUrl) {
+      if (!controllerUrl.endsWith("/")) {
+        controllerUrl += "/";
+      }
       this.controllerUrl = controllerUrl;
       this.actionUrl = /* @__PURE__ */ new Map([
         ["index", controllerUrl + "index"],
@@ -26357,20 +26410,26 @@
      * @param targetId
      */
     sortableApi(id, targetId) {
-      return request({
-        url: this.actionUrl.get("sortable"),
-        method: "post",
-        data: {
-          id,
-          targetId
+      return request(
+        {
+          url: this.actionUrl.get("sortable"),
+          method: "post",
+          data: {
+            id,
+            targetId
+          }
+        },
+        {
+          code_error_show: true
         }
-      });
+      );
     }
   }
 
   class dkTable {
     url;
     api;
+    buttonCallback;
     table = require$$0.reactive({
       ref: void 0,
       pk: "id",
@@ -26428,6 +26487,9 @@
       this.api = new dkTableApi(url);
       this.before = before;
       this.after = after;
+      this.buttonCallback = (event, data) => {
+        console.warn("\u8BF7\u8C03\u7528onClickButton((event,data)=>{})", event, data);
+      };
     }
     /**
      * 表格内部鉴权方法
@@ -26488,6 +26550,9 @@
       } else {
         return this.api.table().then((res) => {
           this.table.column = res.data.column;
+          if (res.data.pk) {
+            this.table.pk = res.data.pk;
+          }
           storage.set(this.url + "_table", JSON.stringify(res.data));
           this.runAfter("getTable", { res });
         }).finally(() => {
@@ -26554,6 +26619,9 @@
       });
       return ids;
     }
+    onClickButton(callback) {
+      this.buttonCallback = callback;
+    }
     /**
      * 表格内的事件统一响应
      * @param event 事件:selection-change=选中项改变,page-size-change=每页数量改变,current-page-change=翻页,sort-change=排序,edit=编辑,delete=删除,field-change=单元格值改变,com-search=公共搜索
@@ -26656,7 +26724,7 @@
         [
           "default",
           () => {
-            console.warn("No action defined");
+            this.buttonCallback(event, data);
           }
         ]
       ]);
@@ -26710,6 +26778,7 @@
       if (this.form.operateIds.length > 0) {
         this.toggleForm("Edit", this.form.operateIds);
       }
+      this.getIndex();
     };
     /**
      * 排序
@@ -26815,6 +26884,13 @@
           () => {
             const columnKey = getArrayKey(this.table.column, "prop", data.field);
             this.table.column[columnKey].show = data.value;
+            if (this.url) {
+              const key = this.url + "show_column";
+              const cachedData = storage.get(key) || "{}";
+              const cachedTableData = JSON.parse(cachedData);
+              cachedTableData[data.field] = data.value;
+              storage.set(key, JSON.stringify(cachedTableData));
+            }
           }
         ],
         [
@@ -27764,23 +27840,29 @@
     key: 0,
     class: "com-search-col-label"
   };
-  const _hoisted_9$3 = {
+  const _hoisted_9$3 = { class: "com-search-col-input-range" };
+  const _hoisted_10$2 = { class: "com-search-col" };
+  const _hoisted_11$1 = {
+    key: 0,
+    class: "com-search-col-label"
+  };
+  const _hoisted_12$1 = {
     key: 1,
     class: "com-search-col-input-range"
   };
-  const _hoisted_10$2 = /* @__PURE__ */ require$$0.createElementVNode(
+  const _hoisted_13$1 = /* @__PURE__ */ require$$0.createElementVNode(
     "div",
     { class: "range-separator" },
     "\u5230",
     -1
     /* HOISTED */
   );
-  const _hoisted_11$1 = { class: "com-search-col-input" };
-  const _hoisted_12$1 = {
+  const _hoisted_14$1 = { class: "com-search-col-input" };
+  const _hoisted_15$1 = {
     key: 3,
     class: "com-search-col-input"
   };
-  const _hoisted_13$1 = { class: "com-search-col pl-20" };
+  const _hoisted_16$1 = { class: "com-search-col pl-20" };
   var _sfc_main$d = /* @__PURE__ */ require$$0.defineComponent({
     __name: "ComSearch",
     setup(__props) {
@@ -27827,6 +27909,11 @@
                 val = DkTable.comSearch.form[key][0] + "," + DkTable.comSearch.form[key][1];
               }
             }
+          } else if (fieldDataTemp.render == "time" && (fieldDataTemp.operator == "RANGE" || fieldDataTemp.operator == "NOT RANGE")) {
+            if (DkTable.comSearch.form[key] && DkTable.comSearch.form[key].length >= 2) {
+              val = DkTable.comSearch.form[key][0] + "," + DkTable.comSearch.form[key][1];
+              console.log("val", val, DkTable.comSearch.form[key]);
+            }
           } else if (fieldDataTemp.operator == "RANGE" || fieldDataTemp.operator == "NOT RANGE") {
             if (!DkTable.comSearch.form[key + "-start"] && !DkTable.comSearch.form[key + "-end"]) {
               continue;
@@ -27856,6 +27943,7 @@
       return (_ctx, _cache) => {
         const _component_el_col = require$$0.resolveComponent("el-col");
         const _component_el_date_picker = require$$0.resolveComponent("el-date-picker");
+        const _component_el_time_picker = require$$0.resolveComponent("el-time-picker");
         const _component_el_input = require$$0.resolveComponent("el-input");
         const _component_el_checkbox = require$$0.resolveComponent("el-checkbox");
         const _component_el_option = require$$0.resolveComponent("el-option");
@@ -27972,21 +28060,58 @@
                                   ],
                                   2112
                                   /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+                                )) : item.render == "time" && (item.operator == "RANGE" || item.operator == "NOT RANGE") ? (require$$0.openBlock(), require$$0.createElementBlock(
+                                  require$$0.Fragment,
+                                  { key: 2 },
+                                  [
+                                    require$$0.createCommentVNode("\u65F6\u95F4\u8303\u56F4"),
+                                    require$$0.createVNode(_component_el_col, {
+                                      span: spans.value.datetime
+                                    }, {
+                                      default: require$$0.withCtx(() => [
+                                        require$$0.createElementVNode("div", _hoisted_7$4, [
+                                          item.comSearchShowLabel !== false ? (require$$0.openBlock(), require$$0.createElementBlock(
+                                            "div",
+                                            _hoisted_8$4,
+                                            require$$0.toDisplayString(item.label),
+                                            1
+                                            /* TEXT */
+                                          )) : require$$0.createCommentVNode("v-if", true),
+                                          require$$0.createElementVNode("div", _hoisted_9$3, [
+                                            require$$0.createVNode(_component_el_time_picker, {
+                                              modelValue: require$$0.unref(DkTable).comSearch.form[item.prop],
+                                              "onUpdate:modelValue": ($event) => require$$0.unref(DkTable).comSearch.form[item.prop] = $event,
+                                              "is-range": "",
+                                              "range-separator": "\u5230",
+                                              format: "HH:mm:ss",
+                                              "value-format": "HH:mm:ss",
+                                              "start-placeholder": "\u5F00\u59CB\u65F6\u95F4",
+                                              "end-placeholder": "\u7ED3\u675F\u65F6\u95F4"
+                                            }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                                          ])
+                                        ])
+                                      ]),
+                                      _: 2
+                                      /* DYNAMIC */
+                                    }, 1032, ["span"])
+                                  ],
+                                  2112
+                                  /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                 )) : (require$$0.openBlock(), require$$0.createBlock(_component_el_col, {
-                                  key: 2,
+                                  key: 3,
                                   span: spans.value.common
                                 }, {
                                   default: require$$0.withCtx(() => [
-                                    require$$0.createElementVNode("div", _hoisted_7$4, [
+                                    require$$0.createElementVNode("div", _hoisted_10$2, [
                                       item.comSearchShowLabel !== false ? (require$$0.openBlock(), require$$0.createElementBlock(
                                         "div",
-                                        _hoisted_8$4,
+                                        _hoisted_11$1,
                                         require$$0.toDisplayString(item.label),
                                         1
                                         /* TEXT */
                                       )) : require$$0.createCommentVNode("v-if", true),
                                       require$$0.createCommentVNode(" \u6570\u5B57\u8303\u56F4 "),
-                                      item.operator == "RANGE" || item.operator == "NOT RANGE" ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_9$3, [
+                                      item.operator == "RANGE" || item.operator == "NOT RANGE" ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_12$1, [
                                         require$$0.createVNode(_component_el_input, {
                                           modelValue: require$$0.unref(DkTable).comSearch.form[item.prop + "-start"],
                                           "onUpdate:modelValue": ($event) => require$$0.unref(DkTable).comSearch.form[item.prop + "-start"] = $event,
@@ -27994,7 +28119,7 @@
                                           type: "string",
                                           clearable: true
                                         }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder"]),
-                                        _hoisted_10$2,
+                                        _hoisted_13$1,
                                         require$$0.createVNode(_component_el_input, {
                                           modelValue: require$$0.unref(DkTable).comSearch.form[item.prop + "-end"],
                                           "onUpdate:modelValue": ($event) => require$$0.unref(DkTable).comSearch.form[item.prop + "-end"] = $event,
@@ -28007,7 +28132,7 @@
                                         { key: 2 },
                                         [
                                           require$$0.createCommentVNode(" \u662F\u5426 [NOT] NULL "),
-                                          require$$0.createElementVNode("div", _hoisted_11$1, [
+                                          require$$0.createElementVNode("div", _hoisted_14$1, [
                                             require$$0.createVNode(_component_el_checkbox, {
                                               modelValue: require$$0.unref(DkTable).comSearch.form[item.prop],
                                               "onUpdate:modelValue": ($event) => require$$0.unref(DkTable).comSearch.form[item.prop] = $event,
@@ -28018,7 +28143,7 @@
                                         ],
                                         2112
                                         /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-                                      )) : item.operator ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_12$1, [
+                                      )) : item.operator ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_15$1, [
                                         require$$0.createCommentVNode(" \u65F6\u95F4\u7B5B\u9009 "),
                                         item.render == "datetime" || item.comSearchRender == "date" ? (require$$0.openBlock(), require$$0.createBlock(_component_el_date_picker, {
                                           key: 0,
@@ -28030,9 +28155,20 @@
                                           placeholder: item.operatorPlaceholder,
                                           "default-value": require$$0.unref(DkTable).comSearch.form[item.prop + "-default"] ? require$$0.unref(DkTable).comSearch.form[item.prop + "-default"] : /* @__PURE__ */ new Date(),
                                           teleported: false
-                                        }, null, 8, ["modelValue", "onUpdate:modelValue", "type", "value-format", "placeholder", "default-value"])) : (item.render == "tag" || item.render == "tags" || item.comSearchRender == "select") && item.replaceValue ? (require$$0.openBlock(), require$$0.createElementBlock(
+                                        }, null, 8, ["modelValue", "onUpdate:modelValue", "type", "value-format", "placeholder", "default-value"])) : require$$0.createCommentVNode("v-if", true),
+                                        require$$0.createCommentVNode(" \u5E74\u7B5B\u9009 "),
+                                        item.render == "year" ? (require$$0.openBlock(), require$$0.createBlock(_component_el_date_picker, {
+                                          key: 1,
+                                          modelValue: require$$0.unref(DkTable).comSearch.form[item.prop],
+                                          "onUpdate:modelValue": ($event) => require$$0.unref(DkTable).comSearch.form[item.prop] = $event,
+                                          class: "datetime-picker",
+                                          type: "year",
+                                          "value-format": "YYYY",
+                                          style: { "width": "100%" },
+                                          placeholder: item.operatorPlaceholder
+                                        }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder"])) : (item.render == "tag" || item.render == "tags" || item.comSearchRender == "select") && item.replaceValue ? (require$$0.openBlock(), require$$0.createElementBlock(
                                           require$$0.Fragment,
-                                          { key: 1 },
+                                          { key: 2 },
                                           [
                                             require$$0.createCommentVNode(" tag\u3001tags\u3001select "),
                                             require$$0.createVNode(_component_el_select, {
@@ -28064,7 +28200,7 @@
                                           /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                         )) : item.comSearchRender == "remoteSelect" ? (require$$0.openBlock(), require$$0.createElementBlock(
                                           require$$0.Fragment,
-                                          { key: 2 },
+                                          { key: 3 },
                                           [
                                             require$$0.createCommentVNode(" \u8FDC\u7A0B select "),
                                             require$$0.createVNode(_component_dk_select, {
@@ -28077,7 +28213,7 @@
                                           /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                         )) : item.render == "switch" ? (require$$0.openBlock(), require$$0.createElementBlock(
                                           require$$0.Fragment,
-                                          { key: 3 },
+                                          { key: 4 },
                                           [
                                             require$$0.createCommentVNode(" \u5F00\u5173 "),
                                             require$$0.createVNode(_component_el_select, {
@@ -28124,7 +28260,7 @@
                                           /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                         )) : (require$$0.openBlock(), require$$0.createElementBlock(
                                           require$$0.Fragment,
-                                          { key: 4 },
+                                          { key: 5 },
                                           [
                                             require$$0.createCommentVNode(" \u5B57\u7B26\u4E32 "),
                                             require$$0.createVNode(_component_el_input, {
@@ -28161,13 +28297,13 @@
                       sm: 6
                     }, {
                       default: require$$0.withCtx(() => [
-                        require$$0.createElementVNode("div", _hoisted_13$1, [
+                        require$$0.createElementVNode("div", _hoisted_16$1, [
                           require$$0.withDirectives((require$$0.openBlock(), require$$0.createBlock(_component_el_button, {
                             type: "primary",
                             onClick: onComSearch
                           }, {
                             default: require$$0.withCtx(() => [
-                              require$$0.createTextVNode(" \u641C\u7D22 ")
+                              require$$0.createTextVNode(" \u641C\u7D22")
                             ]),
                             _: 1
                             /* STABLE */
@@ -28266,9 +28402,17 @@
       const DkTable = require$$0.inject("DkTable");
       const columnDisplay = require$$0.computed(() => {
         const columnDisplayArr = [];
+        let cachedTableData = {};
+        if (DkTable.url) {
+          cachedTableData = JSON.parse(storage.get(DkTable.url + "show_column") || "{}");
+        }
         for (const item of DkTable.table.column) {
+          if (cachedTableData[item.prop] !== void 0) {
+            item.show = cachedTableData[item.prop];
+          }
           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);
@@ -28622,21 +28766,23 @@
   const _hoisted_7$2 = { key: 6 };
   const _hoisted_8$2 = { key: 7 };
   const _hoisted_9$1 = { key: 8 };
-  const _hoisted_10 = { key: 10 };
-  const _hoisted_11 = {
+  const _hoisted_10 = { key: 9 };
+  const _hoisted_11 = { key: 10 };
+  const _hoisted_12 = { key: 12 };
+  const _hoisted_13 = {
     key: 0,
     class: "table-operate-text"
   };
-  const _hoisted_12 = {
+  const _hoisted_14 = {
     key: 0,
     class: "table-operate-text"
   };
-  const _hoisted_13 = { class: "dk-tooltip-button" };
-  const _hoisted_14 = {
+  const _hoisted_15 = { class: "dk-tooltip-button" };
+  const _hoisted_16 = {
     key: 0,
     class: "table-operate-text"
   };
-  const _hoisted_15 = {
+  const _hoisted_17 = {
     key: 0,
     class: "table-operate-text"
   };
@@ -28851,8 +28997,22 @@
               1
               /* TEXT */
             )) : require$$0.createCommentVNode("v-if", true),
+            _ctx.field.render == "time" ? (require$$0.openBlock(), require$$0.createElementBlock(
+              "div",
+              _hoisted_9$1,
+              require$$0.toDisplayString(fieldValue.value),
+              1
+              /* TEXT */
+            )) : require$$0.createCommentVNode("v-if", true),
+            _ctx.field.render == "year" ? (require$$0.openBlock(), require$$0.createElementBlock(
+              "div",
+              _hoisted_10,
+              require$$0.toDisplayString(fieldValue.value),
+              1
+              /* TEXT */
+            )) : require$$0.createCommentVNode("v-if", true),
             require$$0.createCommentVNode(" color "),
-            _ctx.field.render == "color" ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_9$1, [
+            _ctx.field.render == "color" ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_11, [
               require$$0.createElementVNode(
                 "div",
                 {
@@ -28866,7 +29026,7 @@
             ])) : require$$0.createCommentVNode("v-if", true),
             require$$0.createCommentVNode(" \u81EA\u5B9A\u4E49\u7EC4\u4EF6/\u51FD\u6570\u6E32\u67D3 "),
             _ctx.field.render == "customRender" ? (require$$0.openBlock(), require$$0.createBlock(require$$0.resolveDynamicComponent(_ctx.field.customRender), {
-              key: 9,
+              key: 11,
               "render-row": _ctx.row,
               "render-field": _ctx.field,
               "render-value": fieldValue.value,
@@ -28875,7 +29035,7 @@
             }, null, 8, ["render-row", "render-field", "render-value", "render-column", "render-index"])) : require$$0.createCommentVNode("v-if", true),
             require$$0.createCommentVNode(" \u6309\u94AE\u7EC4 "),
             require$$0.createCommentVNode(" \u53EA\u5BF9\u9ED8\u8BA4\u7684\u7F16\u8F91\u3001\u5220\u9664\u3001\u6392\u5E8F\u6309\u94AE\u8FDB\u884C\u9274\u6743\uFF0C\u5176\u4ED6\u6309\u94AE\u8BF7\u901A\u8FC7 display \u5C5E\u6027\u63A7\u5236\u6309\u94AE\u662F\u5426\u663E\u793A "),
-            _ctx.field.render == "buttons" && _ctx.field.buttons ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_10, [
+            _ctx.field.render == "buttons" && _ctx.field.buttons ? (require$$0.openBlock(), require$$0.createElementBlock("div", _hoisted_12, [
               (require$$0.openBlock(true), require$$0.createElementBlock(
                 require$$0.Fragment,
                 null,
@@ -28903,7 +29063,7 @@
                               }, null, 8, ["icon"]),
                               btn.text ? (require$$0.openBlock(), require$$0.createElementBlock(
                                 "div",
-                                _hoisted_11,
+                                _hoisted_13,
                                 require$$0.toDisplayString(btn.text),
                                 1
                                 /* TEXT */
@@ -28919,7 +29079,9 @@
                             key: 1,
                             disabled: !(btn.title && !btn.disabledTip),
                             content: btn.title ?? "",
-                            placement: "top"
+                            placement: "top",
+                            "hide-after": 0,
+                            "show-after": 100
                           }, {
                             default: require$$0.withCtx(() => [
                               require$$0.withDirectives((require$$0.openBlock(), require$$0.createBlock(_component_el_button, require$$0.mergeProps({
@@ -28935,7 +29097,7 @@
                                   }, null, 8, ["icon"]),
                                   btn.text ? (require$$0.openBlock(), require$$0.createElementBlock(
                                     "div",
-                                    _hoisted_12,
+                                    _hoisted_14,
                                     require$$0.toDisplayString(btn.text),
                                     1
                                     /* TEXT */
@@ -28955,10 +29117,12 @@
                             key: 2,
                             disabled: btn.disabled && btn.disabled(_ctx.row, _ctx.field)
                           }, btn.popconfirm, {
+                            "hide-after": 0,
+                            "show-after": 100,
                             onConfirm: ($event) => onButtonClick(btn)
                           }), {
                             reference: require$$0.withCtx(() => [
-                              require$$0.createElementVNode("div", _hoisted_13, [
+                              require$$0.createElementVNode("div", _hoisted_15, [
                                 require$$0.createVNode(_component_el_tooltip, {
                                   disabled: !btn.title,
                                   content: btn.title ?? "",
@@ -28976,7 +29140,7 @@
                                         }, null, 8, ["icon"]),
                                         btn.text ? (require$$0.openBlock(), require$$0.createElementBlock(
                                           "div",
-                                          _hoisted_14,
+                                          _hoisted_16,
                                           require$$0.toDisplayString(btn.text),
                                           1
                                           /* TEXT */
@@ -29001,6 +29165,8 @@
                             key: 3,
                             disabled: !(btn.title && !btn.disabledTip),
                             content: btn.title ?? "",
+                            "hide-after": 0,
+                            "show-after": 100,
                             placement: "top"
                           }, {
                             default: require$$0.withCtx(() => [
@@ -29015,7 +29181,7 @@
                                   }, null, 8, ["icon"]),
                                   btn.text ? (require$$0.openBlock(), require$$0.createElementBlock(
                                     "div",
-                                    _hoisted_15,
+                                    _hoisted_17,
                                     require$$0.toDisplayString(btn.text),
                                     1
                                     /* TEXT */
@@ -29326,7 +29492,7 @@
       const DkTable = new dkTable(props.tableApi);
       require$$0.provide("DkTable", DkTable);
       require$$0.onMounted(() => {
-        DkTable.getTable(false)?.then(() => {
+        DkTable.getTable(props.cacheTable)?.then(() => {
           DkTable.getIndex()?.then(() => {
             require$$0.nextTick(() => {
               DkTable.dragSort();
@@ -29344,6 +29510,9 @@
       const onTableCurrentChange = (val) => {
         DkTable.onTableAction("current-page-change", { page: val });
       };
+      const ondblclick = (row) => {
+        DkTable.toggleForm("Edit", [row[DkTable.table.pk]]);
+      };
       const onSortChange = ({ order, prop }) => {
         DkTable.onTableAction("sort-change", {
           prop,
@@ -29471,7 +29640,8 @@
                 onSelectAll,
                 onSelect,
                 onSelectionChange,
-                onSortChange
+                onSortChange,
+                onCellDblclick: ondblclick
               }), {
                 default: require$$0.withCtx(() => [
                   require$$0.renderSlot(_ctx.$slots, "columnPrepend"),
@@ -29547,10 +29717,7 @@
                   onSizeChange: onTableSizeChange,
                   onCurrentChange: onTableCurrentChange
                 }, null, 8, ["current-page", "page-size", "page-sizes", "total"])
-              ]),
-              require$$0.createCommentVNode("    <div>"),
-              require$$0.createCommentVNode('      <el-button @click="test()">\u6D4B\u8BD5</el-button>'),
-              require$$0.createCommentVNode("    </div>")
+              ])
             ]),
             require$$0.createVNode(_component_dk_form, {
               ref_key: "FormRef",