@vipl520/dk-ui 1.0.8 → 1.0.9

package/dist/index.mjs

@@ -176,7 +176,7 @@ const globalConfig = {
   // TODO 参数如果未填写自动获取
   ApiUrl: "https://independence.heiduoke.cn",
   // 默认的 API 地址
-  AccessToken: "3c388087-0f14-4f8d-8463-9fc9932ce2f6",
+  AccessToken: "b5fe9c57-24fc-44da-b7f0-e655554c31d1",
   // 用户登录后的 token
   Plaid: 16,
   // 平台ID
@@ -342,7 +342,7 @@ const request = (config, custom, loading) => {
       }
       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;
@@ -10367,6 +10367,9 @@ var _sfc_main$Y = /* @__PURE__ */ defineComponent({
     const tinymceSrc = ref("https://registry.npmmirror.com/dk-tinymce/1.0.0/files/tinymce.min.js");
     const attachmentRef = ref();
     const editorRef = ref();
+    const showDialog = computed(() => {
+      return width.value >= props.showDialogWidth;
+    });
     watch(
       () => props.modelValue,
       (newValue) => {
@@ -10430,7 +10433,7 @@ var _sfc_main$Y = /* @__PURE__ */ defineComponent({
           class: "dk-tiny-editor"
         },
         [
-          unref(width).value >= props.showDialogWidth ? (openBlock(), createElementBlock("div", _hoisted_1$I, [
+          showDialog.value ? (openBlock(), createElementBlock("div", _hoisted_1$I, [
             createVNode(unref(Editor), {
               ref_key: "editorRef",
               ref: editorRef,
@@ -10527,20 +10530,11 @@ const iconProps = {
     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
@@ -10564,12 +10558,15 @@ var _sfc_main$X = /* @__PURE__ */ defineComponent({
       return key;
     });
     const getIconifyStyle = 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 = computed(() => {
       let type = "cloud";
@@ -10710,6 +10707,10 @@ const dialogProps = {
   maxHeight: {
     type: String,
     default: ""
+  },
+  draggable: {
+    type: Boolean,
+    default: true
   }
 };
 
@@ -10746,9 +10747,7 @@ var _sfc_main$V = /* @__PURE__ */ defineComponent({
     const toggleFull = () => {
       isFullscreen.value = !unref(isFullscreen);
     };
-    const dialogHeight = ref(
-      isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight
-    );
+    const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight);
     watch(
       () => isFullscreen.value,
       async (val) => {
@@ -10778,7 +10777,7 @@ var _sfc_main$V = /* @__PURE__ */ defineComponent({
         "destroy-on-close": "",
         "append-to-body": "",
         "lock-scroll": "",
-        draggable: "",
+        draggable: _ctx.draggable,
         "close-on-click-modal": false,
         "show-close": false,
         class: "dk-dialog"
@@ -10834,7 +10833,7 @@ var _sfc_main$V = /* @__PURE__ */ defineComponent({
           ]),
           key: "0"
         } : void 0
-      ]), 1040, ["fullscreen"]);
+      ]), 1040, ["fullscreen", "draggable"]);
     };
   }
 });
@@ -10862,7 +10861,7 @@ const formProps = {
   // 显示加载
   isLoading: { default: true, type: Boolean },
   // 默认高度
-  minHeight: { default: "100px", type: [String, Number] },
+  minHeight: { default: "300px", type: String },
   // 是否为弹窗
   isDialog: { default: false, type: Boolean },
   // 弹窗显示后获取formData
@@ -10870,7 +10869,12 @@ const formProps = {
   // 弹窗配置
   dialog: {
     default: () => {
-      return {};
+      return {
+        width: "800px",
+        fullscreen: false,
+        minHeight: "200px",
+        draggable: true
+      };
     },
     type: Object
   }
@@ -10968,7 +10972,6 @@ var _sfc_main$U = /* @__PURE__ */ defineComponent({
     const fApi = ref();
     const loading = ref(true);
     const buttonLoading = ref(false);
-    const minHeight = computed(() => isNumber(props.minHeight) ? `${props.minHeight}px` : props.minHeight);
     const showDialog = ref(false);
     const formConfig = computed(() => ({ ...config, ...props.extraConfig }));
     const { width } = useWindowSize();
@@ -10980,6 +10983,58 @@ var _sfc_main$U = /* @__PURE__ */ defineComponent({
         emit("update:modelValue", val || {});
       }
     );
+    const dialogWidth = 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 = 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 = 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 = 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;
@@ -11068,16 +11123,17 @@ var _sfc_main$U = /* @__PURE__ */ defineComponent({
         modelValue: showDialog.value,
         "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => showDialog.value = $event),
         title: _formData.value?.title ? _formData.value?.title : "\u8868\u5355",
-        width: unref(width).value < 768 ? "100%" : "800px",
-        "default-fullscreen": unref(width).value < 768,
+        width: dialogWidth.value,
+        "default-fullscreen": isFullscreen.value,
         "min-height": "200px",
+        draggable: draggable.value,
         "append-to-body": ""
       }, {
         default: withCtx(() => [
           createElementVNode(
             "div",
             {
-              style: normalizeStyle({ minHeight: minHeight.value }),
+              style: normalizeStyle(dialogStyle.value),
               class: "dk-form"
             },
             [
@@ -11088,6 +11144,7 @@ var _sfc_main$U = /* @__PURE__ */ defineComponent({
                 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"]),
@@ -11118,16 +11175,15 @@ var _sfc_main$U = /* @__PURE__ */ defineComponent({
             ],
             4
             /* STYLE */
-          ),
-          createCommentVNode('    <div v-else :style="{ minHeight }"></div>')
+          )
         ]),
         _: 3
         /* FORWARDED */
-      }, 8, ["modelValue", "title", "width", "default-fullscreen"])) : (openBlock(), createElementBlock("div", _hoisted_1$F, [
+      }, 8, ["modelValue", "title", "width", "default-fullscreen", "draggable"])) : (openBlock(), createElementBlock("div", _hoisted_1$F, [
         createElementVNode(
           "div",
           {
-            style: normalizeStyle({ minHeight: minHeight.value }),
+            style: normalizeStyle({ minHeight: _ctx.minHeight }),
             class: "dk-form"
           },
           [
@@ -11406,13 +11462,13 @@ const _hoisted_10$5 = ["onClick"];
 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__ */ createElementVNode(
+const _hoisted_15$3 = ["onClick", "onContextmenu"];
+const _hoisted_16$3 = { class: "file" };
+const _hoisted_17$2 = /* @__PURE__ */ createElementVNode(
   "div",
   { class: "u-m-t-30" },
   [
@@ -11447,6 +11503,7 @@ var _sfc_main$S = /* @__PURE__ */ defineComponent({
     const chooseFileKey = ref([]);
     const chooseFileList = ref([]);
     const chooseFileId = ref([]);
+    const globalConfig = getGlobalConfig();
     const uploadUrl = ref(globalConfig.ApiUrl);
     const headers = ref({
       "Access-Token": globalConfig.AccessToken
@@ -11841,7 +11898,7 @@ var _sfc_main$S = /* @__PURE__ */ defineComponent({
           ]),
           createCommentVNode(" \u5217\u8868"),
           createElementVNode("div", _hoisted_13$3, [
-            loading.value || list.value.length > 0 ? withDirectives((openBlock(), createElementBlock("div", _hoisted_14$2, [
+            loading.value || list.value.length > 0 ? withDirectives((openBlock(), createElementBlock("div", _hoisted_14$3, [
               createElementVNode(
                 "ul",
                 {
@@ -11859,7 +11916,7 @@ var _sfc_main$S = /* @__PURE__ */ defineComponent({
                         onClick: ($event) => chooseAttachment(item, key),
                         onContextmenu: withModifiers(($event) => contextMenuId.value = item.id, ["prevent"])
                       }, [
-                        createElementVNode("div", _hoisted_16$1, [
+                        createElementVNode("div", _hoisted_16$3, [
                           item.type === 1 ? (openBlock(), createBlock(_component_el_image, {
                             key: 0,
                             class: "file",
@@ -11867,7 +11924,7 @@ var _sfc_main$S = /* @__PURE__ */ defineComponent({
                             fit: "contain"
                           }, {
                             placeholder: withCtx(() => [
-                              _hoisted_17$1
+                              _hoisted_17$2
                             ]),
                             _: 2
                             /* DYNAMIC */
@@ -11906,7 +11963,7 @@ var _sfc_main$S = /* @__PURE__ */ defineComponent({
                             /* STABLE */
                           })
                         ])
-                      ], 42, _hoisted_15$2);
+                      ], 42, _hoisted_15$3);
                     }),
                     128
                     /* KEYED_FRAGMENT */
@@ -12103,9 +12160,10 @@ var _sfc_main$Q = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");
       const _component_el_input = resolveComponent("el-input");
+      const _component_dk_icon = resolveComponent("dk-icon");
+      const _component_el_image = resolveComponent("el-image");
       const _component_Picture = resolveComponent("Picture");
       const _component_el_icon = resolveComponent("el-icon");
-      const _component_el_image = resolveComponent("el-image");
       const _component_Close = resolveComponent("Close");
       const _component_Plus = resolveComponent("Plus");
       const _component_dk_attachment_dialog = resolveComponent("dk-attachment-dialog");
@@ -12150,13 +12208,7 @@ var _sfc_main$Q = /* @__PURE__ */ defineComponent({
                 }, {
                   error: withCtx(() => [
                     createElementVNode("div", _hoisted_2$s, [
-                      createVNode(_component_el_icon, null, {
-                        default: withCtx(() => [
-                          createVNode(_component_Picture)
-                        ]),
-                        _: 1
-                        /* STABLE */
-                      })
+                      createVNode(_component_dk_icon, { icon: "Picture" })
                     ])
                   ]),
                   _: 1
@@ -12170,13 +12222,7 @@ var _sfc_main$Q = /* @__PURE__ */ defineComponent({
                 createElementVNode("em", {
                   onClick: _cache[1] || (_cache[1] = ($event) => input.value = "")
                 }, [
-                  createVNode(_component_el_icon, null, {
-                    default: withCtx(() => [
-                      createVNode(_component_Close)
-                    ]),
-                    _: 1
-                    /* STABLE */
-                  })
+                  createVNode(_component_dk_icon, { icon: "Close" })
                 ])
               ])
             ],
@@ -14006,16 +14052,16 @@ const _hoisted_11$3 = /* @__PURE__ */ createElementVNode(
 );
 const _hoisted_12$3 = { class: "anchor-wrapper" };
 const _hoisted_13$2 = ["onMousedown"];
-const _hoisted_14$1 = /* @__PURE__ */ createElementVNode(
+const _hoisted_14$2 = /* @__PURE__ */ 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"];
@@ -14438,10 +14484,10 @@ var _sfc_main$D = /* @__PURE__ */ defineComponent({
                       /* STABLE_FRAGMENT */
                     ))
                   ]),
-                  _hoisted_14$1,
+                  _hoisted_14$2,
                   createCommentVNode("\u5916\u8FB9\u8DDD Margin END"),
                   createCommentVNode("\u5185\u8FB9\u8DDD Padding"),
-                  createElementVNode("div", _hoisted_15$1, [
+                  createElementVNode("div", _hoisted_15$2, [
                     createElementVNode(
                       "div",
                       {
@@ -14460,7 +14506,7 @@ var _sfc_main$D = /* @__PURE__ */ defineComponent({
                                   title: item.title,
                                   class: normalizeClass(`anchor-tip-${item.position} value-indicator`),
                                   onDblclick: ($event) => onDblclick(item.value, key + 4)
-                                }, toDisplayString(getValue(styles[item.value])), 43, _hoisted_16),
+                                }, toDisplayString(getValue(styles[item.value])), 43, _hoisted_16$2),
                                 withDirectives(createElementVNode("input", {
                                   ref_for: true,
                                   ref_key: "inputField",
@@ -14470,7 +14516,7 @@ var _sfc_main$D = /* @__PURE__ */ defineComponent({
                                     "input-box anchor-tip-" + item.position + (showStyles[item.value] ? " show" : "")
                                   ),
                                   onBlur: ($event) => onBlur(item.value)
-                                }, null, 42, _hoisted_17), [
+                                }, null, 42, _hoisted_17$1), [
                                   [vModelText, styles[item.value]]
                                 ]),
                                 (openBlock(), createElementBlock("svg", {
@@ -23157,6 +23203,10 @@ const tableProps = {
   tableApi: {
     default: "",
     type: String
+  },
+  cacheTable: {
+    default: true,
+    type: Boolean
   }
   // ...ElTableNext.props,
 };
@@ -26185,6 +26235,9 @@ class dkTableApi {
   controllerUrl;
   actionUrl;
   constructor(controllerUrl) {
+    if (!controllerUrl.endsWith("/")) {
+      controllerUrl += "/";
+    }
     this.controllerUrl = controllerUrl;
     this.actionUrl = /* @__PURE__ */ new Map([
       ["index", controllerUrl + "index"],
@@ -26344,20 +26397,26 @@ class dkTableApi {
    * @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 = reactive({
     ref: void 0,
     pk: "id",
@@ -26415,6 +26474,9 @@ class dkTable {
     this.api = new dkTableApi(url);
     this.before = before;
     this.after = after;
+    this.buttonCallback = (event, data) => {
+      console.warn("\u8BF7\u8C03\u7528onClickButton((event,data)=>{})", event, data);
+    };
   }
   /**
    * 表格内部鉴权方法
@@ -26475,6 +26537,9 @@ class dkTable {
     } 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(() => {
@@ -26541,6 +26606,9 @@ class dkTable {
     });
     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=公共搜索
@@ -26643,7 +26711,7 @@ class dkTable {
       [
         "default",
         () => {
-          console.warn("No action defined");
+          this.buttonCallback(event, data);
         }
       ]
     ]);
@@ -26697,6 +26765,7 @@ class dkTable {
     if (this.form.operateIds.length > 0) {
       this.toggleForm("Edit", this.form.operateIds);
     }
+    this.getIndex();
   };
   /**
    * 排序
@@ -26802,6 +26871,13 @@ class dkTable {
         () => {
           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));
+          }
         }
       ],
       [
@@ -27751,23 +27827,29 @@ const _hoisted_8$4 = {
   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__ */ createElementVNode(
+const _hoisted_13$1 = /* @__PURE__ */ 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__ */ defineComponent({
   __name: "ComSearch",
   setup(__props) {
@@ -27814,6 +27896,11 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
               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;
@@ -27843,6 +27930,7 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _component_el_col = resolveComponent("el-col");
       const _component_el_date_picker = resolveComponent("el-date-picker");
+      const _component_el_time_picker = resolveComponent("el-time-picker");
       const _component_el_input = resolveComponent("el-input");
       const _component_el_checkbox = resolveComponent("el-checkbox");
       const _component_el_option = resolveComponent("el-option");
@@ -27959,21 +28047,58 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
                                 ],
                                 2112
                                 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+                              )) : item.render == "time" && (item.operator == "RANGE" || item.operator == "NOT RANGE") ? (openBlock(), createElementBlock(
+                                Fragment,
+                                { key: 2 },
+                                [
+                                  createCommentVNode("\u65F6\u95F4\u8303\u56F4"),
+                                  createVNode(_component_el_col, {
+                                    span: spans.value.datetime
+                                  }, {
+                                    default: withCtx(() => [
+                                      createElementVNode("div", _hoisted_7$4, [
+                                        item.comSearchShowLabel !== false ? (openBlock(), createElementBlock(
+                                          "div",
+                                          _hoisted_8$4,
+                                          toDisplayString(item.label),
+                                          1
+                                          /* TEXT */
+                                        )) : createCommentVNode("v-if", true),
+                                        createElementVNode("div", _hoisted_9$3, [
+                                          createVNode(_component_el_time_picker, {
+                                            modelValue: unref(DkTable).comSearch.form[item.prop],
+                                            "onUpdate:modelValue": ($event) => 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 */
                               )) : (openBlock(), createBlock(_component_el_col, {
-                                key: 2,
+                                key: 3,
                                 span: spans.value.common
                               }, {
                                 default: withCtx(() => [
-                                  createElementVNode("div", _hoisted_7$4, [
+                                  createElementVNode("div", _hoisted_10$2, [
                                     item.comSearchShowLabel !== false ? (openBlock(), createElementBlock(
                                       "div",
-                                      _hoisted_8$4,
+                                      _hoisted_11$1,
                                       toDisplayString(item.label),
                                       1
                                       /* TEXT */
                                     )) : createCommentVNode("v-if", true),
                                     createCommentVNode(" \u6570\u5B57\u8303\u56F4 "),
-                                    item.operator == "RANGE" || item.operator == "NOT RANGE" ? (openBlock(), createElementBlock("div", _hoisted_9$3, [
+                                    item.operator == "RANGE" || item.operator == "NOT RANGE" ? (openBlock(), createElementBlock("div", _hoisted_12$1, [
                                       createVNode(_component_el_input, {
                                         modelValue: unref(DkTable).comSearch.form[item.prop + "-start"],
                                         "onUpdate:modelValue": ($event) => unref(DkTable).comSearch.form[item.prop + "-start"] = $event,
@@ -27981,7 +28106,7 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
                                         type: "string",
                                         clearable: true
                                       }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder"]),
-                                      _hoisted_10$2,
+                                      _hoisted_13$1,
                                       createVNode(_component_el_input, {
                                         modelValue: unref(DkTable).comSearch.form[item.prop + "-end"],
                                         "onUpdate:modelValue": ($event) => unref(DkTable).comSearch.form[item.prop + "-end"] = $event,
@@ -27994,7 +28119,7 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
                                       { key: 2 },
                                       [
                                         createCommentVNode(" \u662F\u5426 [NOT] NULL "),
-                                        createElementVNode("div", _hoisted_11$1, [
+                                        createElementVNode("div", _hoisted_14$1, [
                                           createVNode(_component_el_checkbox, {
                                             modelValue: unref(DkTable).comSearch.form[item.prop],
                                             "onUpdate:modelValue": ($event) => unref(DkTable).comSearch.form[item.prop] = $event,
@@ -28005,7 +28130,7 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
                                       ],
                                       2112
                                       /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-                                    )) : item.operator ? (openBlock(), createElementBlock("div", _hoisted_12$1, [
+                                    )) : item.operator ? (openBlock(), createElementBlock("div", _hoisted_15$1, [
                                       createCommentVNode(" \u65F6\u95F4\u7B5B\u9009 "),
                                       item.render == "datetime" || item.comSearchRender == "date" ? (openBlock(), createBlock(_component_el_date_picker, {
                                         key: 0,
@@ -28017,9 +28142,20 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
                                         placeholder: item.operatorPlaceholder,
                                         "default-value": unref(DkTable).comSearch.form[item.prop + "-default"] ? 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 ? (openBlock(), createElementBlock(
+                                      }, null, 8, ["modelValue", "onUpdate:modelValue", "type", "value-format", "placeholder", "default-value"])) : createCommentVNode("v-if", true),
+                                      createCommentVNode(" \u5E74\u7B5B\u9009 "),
+                                      item.render == "year" ? (openBlock(), createBlock(_component_el_date_picker, {
+                                        key: 1,
+                                        modelValue: unref(DkTable).comSearch.form[item.prop],
+                                        "onUpdate:modelValue": ($event) => 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 ? (openBlock(), createElementBlock(
                                         Fragment,
-                                        { key: 1 },
+                                        { key: 2 },
                                         [
                                           createCommentVNode(" tag\u3001tags\u3001select "),
                                           createVNode(_component_el_select, {
@@ -28051,7 +28187,7 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
                                         /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                       )) : item.comSearchRender == "remoteSelect" ? (openBlock(), createElementBlock(
                                         Fragment,
-                                        { key: 2 },
+                                        { key: 3 },
                                         [
                                           createCommentVNode(" \u8FDC\u7A0B select "),
                                           createVNode(_component_dk_select, {
@@ -28064,7 +28200,7 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
                                         /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                       )) : item.render == "switch" ? (openBlock(), createElementBlock(
                                         Fragment,
-                                        { key: 3 },
+                                        { key: 4 },
                                         [
                                           createCommentVNode(" \u5F00\u5173 "),
                                           createVNode(_component_el_select, {
@@ -28111,7 +28247,7 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
                                         /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                       )) : (openBlock(), createElementBlock(
                                         Fragment,
-                                        { key: 4 },
+                                        { key: 5 },
                                         [
                                           createCommentVNode(" \u5B57\u7B26\u4E32 "),
                                           createVNode(_component_el_input, {
@@ -28148,13 +28284,13 @@ var _sfc_main$d = /* @__PURE__ */ defineComponent({
                     sm: 6
                   }, {
                     default: withCtx(() => [
-                      createElementVNode("div", _hoisted_13$1, [
+                      createElementVNode("div", _hoisted_16$1, [
                         withDirectives((openBlock(), createBlock(_component_el_button, {
                           type: "primary",
                           onClick: onComSearch
                         }, {
                           default: withCtx(() => [
-                            createTextVNode(" \u641C\u7D22 ")
+                            createTextVNode(" \u641C\u7D22")
                           ]),
                           _: 1
                           /* STABLE */
@@ -28253,9 +28389,17 @@ var _sfc_main$c = /* @__PURE__ */ defineComponent({
     const DkTable = inject("DkTable");
     const columnDisplay = 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 = computed(() => DkTable.table.selection.length > 0);
@@ -28609,21 +28753,23 @@ const _hoisted_6$2 = { key: 5 };
 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"
 };
@@ -28838,8 +28984,22 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
             1
             /* TEXT */
           )) : createCommentVNode("v-if", true),
+          _ctx.field.render == "time" ? (openBlock(), createElementBlock(
+            "div",
+            _hoisted_9$1,
+            toDisplayString(fieldValue.value),
+            1
+            /* TEXT */
+          )) : createCommentVNode("v-if", true),
+          _ctx.field.render == "year" ? (openBlock(), createElementBlock(
+            "div",
+            _hoisted_10,
+            toDisplayString(fieldValue.value),
+            1
+            /* TEXT */
+          )) : createCommentVNode("v-if", true),
           createCommentVNode(" color "),
-          _ctx.field.render == "color" ? (openBlock(), createElementBlock("div", _hoisted_9$1, [
+          _ctx.field.render == "color" ? (openBlock(), createElementBlock("div", _hoisted_11, [
             createElementVNode(
               "div",
               {
@@ -28853,7 +29013,7 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
           ])) : createCommentVNode("v-if", true),
           createCommentVNode(" \u81EA\u5B9A\u4E49\u7EC4\u4EF6/\u51FD\u6570\u6E32\u67D3 "),
           _ctx.field.render == "customRender" ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.field.customRender), {
-            key: 9,
+            key: 11,
             "render-row": _ctx.row,
             "render-field": _ctx.field,
             "render-value": fieldValue.value,
@@ -28862,7 +29022,7 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
           }, null, 8, ["render-row", "render-field", "render-value", "render-column", "render-index"])) : createCommentVNode("v-if", true),
           createCommentVNode(" \u6309\u94AE\u7EC4 "),
           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 ? (openBlock(), createElementBlock("div", _hoisted_10, [
+          _ctx.field.render == "buttons" && _ctx.field.buttons ? (openBlock(), createElementBlock("div", _hoisted_12, [
             (openBlock(true), createElementBlock(
               Fragment,
               null,
@@ -28890,7 +29050,7 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
                             }, null, 8, ["icon"]),
                             btn.text ? (openBlock(), createElementBlock(
                               "div",
-                              _hoisted_11,
+                              _hoisted_13,
                               toDisplayString(btn.text),
                               1
                               /* TEXT */
@@ -28906,7 +29066,9 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
                           key: 1,
                           disabled: !(btn.title && !btn.disabledTip),
                           content: btn.title ?? "",
-                          placement: "top"
+                          placement: "top",
+                          "hide-after": 0,
+                          "show-after": 100
                         }, {
                           default: withCtx(() => [
                             withDirectives((openBlock(), createBlock(_component_el_button, mergeProps({
@@ -28922,7 +29084,7 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
                                 }, null, 8, ["icon"]),
                                 btn.text ? (openBlock(), createElementBlock(
                                   "div",
-                                  _hoisted_12,
+                                  _hoisted_14,
                                   toDisplayString(btn.text),
                                   1
                                   /* TEXT */
@@ -28942,10 +29104,12 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
                           key: 2,
                           disabled: btn.disabled && btn.disabled(_ctx.row, _ctx.field)
                         }, btn.popconfirm, {
+                          "hide-after": 0,
+                          "show-after": 100,
                           onConfirm: ($event) => onButtonClick(btn)
                         }), {
                           reference: withCtx(() => [
-                            createElementVNode("div", _hoisted_13, [
+                            createElementVNode("div", _hoisted_15, [
                               createVNode(_component_el_tooltip, {
                                 disabled: !btn.title,
                                 content: btn.title ?? "",
@@ -28963,7 +29127,7 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
                                       }, null, 8, ["icon"]),
                                       btn.text ? (openBlock(), createElementBlock(
                                         "div",
-                                        _hoisted_14,
+                                        _hoisted_16,
                                         toDisplayString(btn.text),
                                         1
                                         /* TEXT */
@@ -28988,6 +29152,8 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
                           key: 3,
                           disabled: !(btn.title && !btn.disabledTip),
                           content: btn.title ?? "",
+                          "hide-after": 0,
+                          "show-after": 100,
                           placement: "top"
                         }, {
                           default: withCtx(() => [
@@ -29002,7 +29168,7 @@ var _sfc_main$b = /* @__PURE__ */ defineComponent({
                                 }, null, 8, ["icon"]),
                                 btn.text ? (openBlock(), createElementBlock(
                                   "div",
-                                  _hoisted_15,
+                                  _hoisted_17,
                                   toDisplayString(btn.text),
                                   1
                                   /* TEXT */
@@ -29313,7 +29479,7 @@ var _sfc_main$9 = /* @__PURE__ */ defineComponent({
     const DkTable = new dkTable(props.tableApi);
     provide("DkTable", DkTable);
     onMounted(() => {
-      DkTable.getTable(false)?.then(() => {
+      DkTable.getTable(props.cacheTable)?.then(() => {
         DkTable.getIndex()?.then(() => {
           nextTick(() => {
             DkTable.dragSort();
@@ -29331,6 +29497,9 @@ var _sfc_main$9 = /* @__PURE__ */ defineComponent({
     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,
@@ -29458,7 +29627,8 @@ var _sfc_main$9 = /* @__PURE__ */ defineComponent({
               onSelectAll,
               onSelect,
               onSelectionChange,
-              onSortChange
+              onSortChange,
+              onCellDblclick: ondblclick
             }), {
               default: withCtx(() => [
                 renderSlot(_ctx.$slots, "columnPrepend"),
@@ -29534,10 +29704,7 @@ var _sfc_main$9 = /* @__PURE__ */ defineComponent({
                 onSizeChange: onTableSizeChange,
                 onCurrentChange: onTableCurrentChange
               }, null, 8, ["current-page", "page-size", "page-sizes", "total"])
-            ]),
-            createCommentVNode("    <div>"),
-            createCommentVNode('      <el-button @click="test()">\u6D4B\u8BD5</el-button>'),
-            createCommentVNode("    </div>")
+            ])
           ]),
           createVNode(_component_dk_form, {
             ref_key: "FormRef",