@fangzhongya/fang-ui 0.0.67 → 0.0.69

package/dist/components/box-adjust/src/data.cjs

@@ -5,11 +5,11 @@ const data = require("../../box/src/data.cjs");
 const dataProps = buildProps.buildProps({
   ...data.dataProps,
   /**
-   * @props { String, Boolean } drag='.box-title-name' ( )
+   * @props { String } drag='.box-title-name' ( )
    * 可拖拽的元素样式
    */
   drag: {
-    type: [String, Boolean]
+    type: String
   },
   /**
    * @props { Boolean } often= ( )

package/dist/components/box-adjust/src/data.d.ts

@@ -2,11 +2,11 @@ import { ExtractPublicPropTypes } from 'vue';
 import { FunctConfig } from '../../../utils/enums';
 export declare const dataProps: {
     /**
-     * @props { String, Boolean } drag='.box-title-name' ( )
+     * @props { String } drag='.box-title-name' ( )
      * 可拖拽的元素样式
      */
     drag: {
-        type: (BooleanConstructor | StringConstructor)[];
+        type: StringConstructor;
     };
     /**
      * @props { Boolean } often= ( )

package/dist/components/box-adjust/src/data.js

@@ -3,11 +3,11 @@ import { dataProps as dataProps$1, dataEmits as dataEmits$1, dataSlot as dataSlo
 const dataProps = buildProps({
   ...dataProps$1,
   /**
-   * @props { String, Boolean } drag='.box-title-name' ( )
+   * @props { String } drag='.box-title-name' ( )
    * 可拖拽的元素样式
    */
   drag: {
-    type: [String, Boolean]
+    type: String
   },
   /**
    * @props { Boolean } often= ( )

package/dist/components/box-adjust/src/index2.cjs

@@ -3,7 +3,6 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const data = require("./data.cjs");
 const index = require("../../../hooks/cssname/index.cjs");
-require("../../../hooks/locale/index.cjs");
 const index$3 = require("../../box-title/index.cjs");
 const index$2 = require("../../box-mask/index.cjs");
 const index$1 = require("../../box-teleport/index.cjs");

package/dist/components/box-adjust/src/index2.js

@@ -1,7 +1,6 @@
 import { defineComponent, shallowRef, watch, createBlock, openBlock, unref, withCtx, withDirectives, createCommentVNode, createElementBlock, normalizeClass, createVNode, renderSlot, createElementVNode, vShow } from "vue";
 import { dataExpose, dataSlot, dataEmits, dataProps } from "./data.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
-import "../../../hooks/locale/index.js";
 import { BoxTitle } from "../../box-title/index.js";
 import { BoxMask } from "../../box-mask/index.js";
 import { BoxTeleport } from "../../box-teleport/index.js";

package/dist/components/global-config/src/data.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const buildProps = require("../../../utils/vues/buildProps.cjs");
-require("../../../utils/vues/definePropType.cjs");
 const enums = require("../../../utils/enums.cjs");
 const dataProps = buildProps.buildProps({
   /**
@@ -16,6 +15,7 @@ const dataProps = buildProps.buildProps({
   },
   /**
    * @props { Number } size='default' ('large' | 'default' | 'small')
+   * 大小
    */
   size: {
     type: String,

package/dist/components/global-config/src/data.d.ts

@@ -15,6 +15,7 @@ export declare const dataProps: {
     };
     /**
      * @props { Number } size='default' ('large' | 'default' | 'small')
+     * 大小
      */
     size: {
         type: () => "large" | "default" | "small";

package/dist/components/global-config/src/data.js

@@ -1,5 +1,4 @@
 import { buildProps } from "../../../utils/vues/buildProps.js";
-import "../../../utils/vues/definePropType.js";
 import { DefaultConfig } from "../../../utils/enums.js";
 const dataProps = buildProps({
   /**
@@ -14,6 +13,7 @@ const dataProps = buildProps({
   },
   /**
    * @props { Number } size='default' ('large' | 'default' | 'small')
+   * 大小
    */
   size: {
     type: String,

package/dist/components/index.scss

@@ -86,6 +86,7 @@
 @use './select-scroll/index.scss' as *;
 @use './selector/index.scss' as *;
 @use './selects/index.scss' as *;
+@use './switchs/index.scss' as *;
 @use './text/index.scss' as *;
 @use './list/index.scss' as *;
 @use './lists/index.scss' as *;
@@ -94,5 +95,4 @@
 @use './tables/index.scss' as *;
 @use './tablesp/index.scss' as *;
 @use './tabless/index.scss' as *;
-@use './tablesv/index.scss' as *;
-@use './tablesvp/index.scss' as *;
+@use './tablesv/index.scss' as *;

package/dist/components/index2.scss

@@ -86,6 +86,7 @@
 @use './select-scroll/style/index.scss' as *;
 @use './selector/style/index.scss' as *;
 @use './selects/style/index2.scss' as *;
+@use './switchs/style/index2.scss' as *;
 @use './text/style/index.scss' as *;
 @use './list/style/index.scss' as *;
 @use './lists/style/index.scss' as *;
@@ -94,5 +95,4 @@
 @use './tables/style/index2.scss' as *;
 @use './tablesp/style/index2.scss' as *;
 @use './tabless/style/index2.scss' as *;
-@use './tablesv/style/index2.scss' as *;
-@use './tablesvp/style/index2.scss' as *;
+@use './tablesv/style/index2.scss' as *;

package/dist/components/page/index.css

@@ -290,14 +290,77 @@
   display: flex;
   margin-right: 20px;
 }
-.page-operations > .el-button {
+.page-operations .el-button {
   margin-left: 2px;
   margin-right: 2px;
   padding-left: 5px;
   padding-right: 5px;
 }
+.page-operations .el-button:first-child {
+  margin-left: 0;
+}
+.page-operations .el-button:last-child {
+  margin-right: 0;
+}
 .page-footer {
   padding: 10px;
   text-align: right;
   background-color: #f5f5f5;
+}
+.page .set-column {
+  margin-left: 10px;
+}
+.page .set-column .set-column-dialog-main {
+  font-size: 16px;
+  display: flex;
+}
+.page .set-column .set-column-dialog-main .set-column-title {
+  height: 40px;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.page .set-column .set-column-dialog-main .set-column-title .set-column-title-all {
+  margin-right: 20px;
+}
+.page .set-column .set-column-dialog-main .set-column-check {
+  flex: 1;
+}
+.page .set-column .set-column-dialog-main .set-column-check .set-column-check-list {
+  padding: 10px;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  overflow-y: auto;
+}
+.page .set-column .set-column-dialog-main .set-column-check .set-column-check-list .set-column-check-list-li {
+  margin-right: 0;
+  width: 33%;
+  height: 40px;
+}
+.page .set-column .set-column-dialog-main .set-column-already {
+  border-left: 1px solid #999;
+  padding-left: 20px;
+  width: 240px;
+}
+.page .set-column .set-column-dialog-main .set-column-already .set-column-already-list {
+  padding: 10px 10px 10px 0;
+}
+.page .set-column .set-column-dialog-main .set-column-already .set-column-already-list .set-column-already-li {
+  height: 40px;
+  line-height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1px solid #ccc;
+}
+.page .set-column .set-column-dialog-main .set-column-already .set-column-already-list .set-column-already-li:first-child {
+  border-top: 1px solid #ccc;
+}
+.page .set-column .set-column-dialog-main .set-column-already .set-column-already-list .set-column-already-li .set-column-already-li-v {
+  display: flex;
+  flex: 1;
+  align-items: center;
 }

package/dist/components/page/index.scss

@@ -46,11 +46,17 @@ $page: 'page';
 		}
 	}
 	&-operations {
-		& > .el-button {
+		.#{el('button')} {
 			margin-left: 2px;
 			margin-right: 2px;
 			padding-left: 5px;
 			padding-right: 5px;
+			&:first-child {
+				margin-left: 0;
+			}
+			&:last-child {
+				margin-right: 0;
+			}
 		}
 	}
 
@@ -59,4 +65,63 @@ $page: 'page';
 		text-align: right;
 		background-color: #f5f5f5;
 	}
+
+	$set-column: 'set-column';
+	.#{$set-column} {
+		margin-left: 10px;
+		.#{$set-column}-dialog-main {
+			font-size: 16px;
+			display: flex;
+			.#{$set-column}-title {
+				height: 40px;
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.#{$set-column}-title-all {
+					margin-right: 20px;
+				}
+			}
+			.#{$set-column}-check {
+				flex: 1;
+				.#{$set-column}-check-list {
+					padding: 10px;
+					box-sizing: border-box;
+					display: flex;
+					flex-direction: row;
+					flex-wrap: wrap;
+					overflow-y: auto;
+					.#{$set-column}-check-list-li {
+						margin-right: 0;
+						width: 33%;
+						height: 40px;
+					}
+				}
+			}
+			.#{$set-column}-already {
+				border-left: 1px solid #999;
+				padding-left: 20px;
+				width: 240px;
+				.#{$set-column}-already-list {
+					padding: 10px 10px 10px 0;
+					.#{$set-column}-already-li {
+						height: 40px;
+						line-height: 40px;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						border-bottom: 1px solid #ccc;
+						&:first-child {
+							border-top: 1px solid #ccc;
+						}
+						.#{$set-column}-already-li-v {
+							display: flex;
+							flex: 1;
+							align-items: center;
+						}
+					}
+				}
+			}
+		}
+	}
 }

package/dist/components/page/src/index2.cjs

@@ -10,9 +10,10 @@ const index$7 = require("../../buttons/index.cjs");
 const index$3 = require("../../message/index.cjs");
 const index$2 = require("../../message-box/index.cjs");
 const data = require("./data.cjs");
-const setColumn = require("./set-column.cjs");
+require("./set-column.cjs");
 const urls = require("../../common/urls.cjs");
 const index = require("../../../hooks/locale/index.cjs");
+const setColumn_vue_vue_type_script_setup_true_lang = require("./set-column2.cjs");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
   props: data.dataProps,
@@ -193,7 +194,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         arr.push({
           prop: "operation",
           label: getLocale("page.operation"),
-          width: 156,
+          width: 150,
           fixed: true
         });
       }
@@ -678,7 +679,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 }, null, 8, ["options"]),
                 vue.renderSlot(_ctx.$slots, dataSlot.top)
               ], 2),
-              props.config.setColumn ? (vue.openBlock(), vue.createBlock(setColumn.default, {
+              props.config.setColumn ? (vue.openBlock(), vue.createBlock(setColumn_vue_vue_type_script_setup_true_lang.default, {
                 key: 0,
                 modelValue: setList.value,
                 "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => setList.value = $event),

package/dist/components/page/src/index2.js

@@ -8,9 +8,10 @@ import { Buttons } from "../../buttons/index.js";
 import { Message } from "../../message/index.js";
 import { MessageBox } from "../../message-box/index.js";
 import { dataEmits, dataProps } from "./data.js";
-import SetColumn from "./set-column.js";
+import "./set-column.js";
 import { comHandle } from "../../common/urls.js";
 import { useLocale } from "../../../hooks/locale/index.js";
+import _sfc_main$1 from "./set-column2.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: dataProps,
@@ -191,7 +192,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         arr.push({
           prop: "operation",
           label: getLocale("page.operation"),
-          width: 156,
+          width: 150,
           fixed: true
         });
       }
@@ -676,7 +677,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }, null, 8, ["options"]),
                 renderSlot(_ctx.$slots, dataSlot.top)
               ], 2),
-              props.config.setColumn ? (openBlock(), createBlock(SetColumn, {
+              props.config.setColumn ? (openBlock(), createBlock(_sfc_main$1, {
                 key: 0,
                 modelValue: setList.value,
                 "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => setList.value = $event),

package/dist/components/page/src/set-column.cjs

@@ -1,7 +1,4 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const setColumn_vue_vue_type_script_setup_true_lang = require("./set-column2.cjs");
-;/* empty css              */
-const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.cjs");
-const SetColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(setColumn_vue_vue_type_script_setup_true_lang.default, [["__scopeId", "data-v-ad509651"]]);
-exports.default = SetColumn;
+exports.default = setColumn_vue_vue_type_script_setup_true_lang.default;

package/dist/components/page/src/set-column.js

@@ -1,7 +1,4 @@
 import _sfc_main from "./set-column2.js";
-/* empty css            */
-import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.js";
-const SetColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ad509651"]]);
 export {
-  SetColumn as default
+  _sfc_main as default
 };

package/dist/components/page/src/set-column2.cjs

@@ -2,15 +2,12 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const Draggable = require("vuedraggable");
-const index$2 = require("../../dialogs/index.cjs");
-const index$4 = require("../../no-data/index.cjs");
-const index = require("../../../hooks/cssname/index.cjs");
-const index$3 = require("element-plus/es/components/checkbox/index");
-const index$1 = require("element-plus/es/components/button/index");
-const _hoisted_1 = {
-  key: 1,
-  class: "no-data"
-};
+const index$3 = require("../../dialogs/index.cjs");
+const index$5 = require("../../no-data/index.cjs");
+const index$4 = require("../../checkbox/index.cjs");
+const index$2 = require("../../button/index.cjs");
+const index$1 = require("../../../hooks/cssname/index.cjs");
+const index = require("../../../hooks/locale/index.cjs");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "set-column",
   props: {
@@ -21,15 +18,20 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     },
     list: {
-      type: Array
+      type: Array,
+      default() {
+        return [];
+      }
     }
   },
   emits: ["update:modelValue"],
   setup(__props, { emit: __emit }) {
+    const { getLocale } = index.useLocale();
     const props = __props;
     const emit = __emit;
-    const cs = index.useCssName("set-column");
+    const cs = index$1.useCssName("set-column");
     const dialogVisible = vue.ref(false);
+    const isall = vue.ref(false);
     const value = vue.ref([...props.modelValue]);
     vue.watch(
       () => props.modelValue,
@@ -38,8 +40,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
     );
     const onOpen = () => {
+      var _a;
       value.value = [...props.modelValue];
       dialogVisible.value = true;
+      if (value.value.length == ((_a = props.list) == null ? void 0 : _a.length)) {
+        isall.value = true;
+      }
     };
     const isChecked = (item) => {
       return value.value.map((o) => o.prop).includes(item.prop);
@@ -56,31 +62,45 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const drag = vue.ref(false);
     const onChange = (item, is) => {
+      var _a;
       if (is) {
         value.value.push(item);
+        if (value.value.length == ((_a = props.list) == null ? void 0 : _a.length)) {
+          isall.value = true;
+        }
       } else {
         const v = value.value.map((o) => o.prop);
         value.value.splice(v.indexOf(item.prop), 1);
+        isall.value = false;
       }
     };
     const onDelete = (item, index2) => {
       value.value.splice(index2, 1);
+      isall.value = false;
+    };
+    const onAllChange = (is) => {
+      if (is) {
+        value.value = [...props.list];
+      } else {
+        value.value = [];
+      }
     };
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", {
         class: vue.normalizeClass(vue.unref(cs).z())
       }, [
-        vue.createVNode(vue.unref(index$1.ElButton), { onClick: onOpen }, {
-          default: vue.withCtx(() => [..._cache[4] || (_cache[4] = [
-            vue.createTextVNode("列设置", -1)
-          ])]),
+        vue.createVNode(vue.unref(index$2.Button), { onClick: onOpen }, {
+          default: vue.withCtx(() => [
+            vue.createTextVNode(vue.toDisplayString(vue.unref(getLocale)("setColumn.name")), 1)
+          ]),
           _: 1
         }),
-        vue.createVNode(vue.unref(index$2.Dialogs), {
+        vue.createVNode(vue.unref(index$3.Dialogs), {
           class: vue.normalizeClass(vue.unref(cs).z("dialog")),
           modelValue: dialogVisible.value,
-          "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => dialogVisible.value = $event),
-          title: "设置显示字段",
+          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => dialogVisible.value = $event),
+          width: 900,
+          title: vue.unref(getLocale)("setColumn.title"),
           onConfirm: onSubmit
         }, {
           default: vue.withCtx(() => [
@@ -92,13 +112,29 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               }, [
                 vue.createElementVNode("div", {
                   class: vue.normalizeClass(vue.unref(cs).z("title"))
-                }, "可选字段", 2),
+                }, [
+                  vue.createElementVNode("span", null, vue.toDisplayString(vue.unref(getLocale)("setColumn.optional")), 1),
+                  vue.createElementVNode("span", {
+                    class: vue.normalizeClass(vue.unref(cs).z("title-all"))
+                  }, [
+                    vue.createVNode(vue.unref(index$4.Checkbox), {
+                      modelValue: isall.value,
+                      "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isall.value = $event),
+                      onChange: onAllChange
+                    }, {
+                      default: vue.withCtx(() => [
+                        vue.createTextVNode(vue.toDisplayString(vue.unref(getLocale)("setColumn.all")), 1)
+                      ]),
+                      _: 1
+                    }, 8, ["modelValue"])
+                  ], 2)
+                ], 2),
                 (vue.openBlock(), vue.createElementBlock("div", {
                   class: vue.normalizeClass(vue.unref(cs).z("check-list")),
                   key: value.value.length
                 }, [
-                  props.list && props.list.length > 0 ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(props.list, (item, index2) => {
-                    return vue.openBlock(), vue.createBlock(vue.unref(index$3.ElCheckbox), {
+                  props.list.length > 0 ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(props.list, (item, index2) => {
+                    return vue.openBlock(), vue.createBlock(vue.unref(index$4.Checkbox), {
                       class: vue.normalizeClass(vue.unref(cs).z("check-list-li")),
                       key: index2,
                       label: item.label,
@@ -106,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                       checked: isChecked(item),
                       onChange: (is) => onChange(item, Boolean(is))
                     }, null, 8, ["class", "label", "value", "checked", "onChange"]);
-                  }), 128)) : (vue.openBlock(), vue.createBlock(vue.unref(index$4.NoData), { key: 1 }))
+                  }), 128)) : (vue.openBlock(), vue.createBlock(vue.unref(index$5.NoData), { key: 1 }))
                 ], 2))
               ], 2),
               vue.createElementVNode("div", {
@@ -114,46 +150,50 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               }, [
                 vue.createElementVNode("div", {
                   class: vue.normalizeClass(vue.unref(cs).z("title"))
-                }, "已选字段", 2),
+                }, vue.toDisplayString(vue.unref(getLocale)("setColumn.selected")), 3),
                 vue.createElementVNode("div", {
                   class: vue.normalizeClass(vue.unref(cs).z("already-list"))
                 }, [
                   value.value && value.value.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(Draggable), vue.mergeProps({ key: 0 }, dragOptions, {
-                    onStart: _cache[0] || (_cache[0] = ($event) => drag.value = true),
-                    onEnd: _cache[1] || (_cache[1] = ($event) => drag.value = false),
+                    onStart: _cache[1] || (_cache[1] = ($event) => drag.value = true),
+                    onEnd: _cache[2] || (_cache[2] = ($event) => drag.value = false),
                     modelValue: value.value,
-                    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => value.value = $event),
+                    "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => value.value = $event),
                     "item-key": (value2) => value2,
                     handle: ".handle"
                   }), {
                     item: vue.withCtx(({ element, index: index2 }) => [
                       vue.createElementVNode("div", {
-                        class: vue.normalizeClass(vue.unref(cs).z("already-li"))
+                        class: vue.normalizeClass(["handle", vue.unref(cs).z("already-li")])
                       }, [
                         vue.createElementVNode("div", {
-                          class: vue.normalizeClass(["handle", vue.unref(cs).z("already-li-v")])
+                          class: vue.normalizeClass(vue.unref(cs).z("already-li-v"))
                         }, [
                           vue.createElementVNode("div", null, vue.toDisplayString(element.label), 1)
                         ], 2),
-                        vue.createVNode(vue.unref(index$1.ElButton), {
+                        vue.createVNode(vue.unref(index$2.Button), {
                           text: "",
+                          type: "danger",
                           onClick: vue.withModifiers(($event) => onDelete(element, index2), ["stop"])
                         }, {
-                          default: vue.withCtx(() => [..._cache[5] || (_cache[5] = [
-                            vue.createTextVNode(" 删除 ", -1)
-                          ])]),
+                          default: vue.withCtx(() => [
+                            vue.createTextVNode(vue.toDisplayString(vue.unref(getLocale)("setColumn.delete")), 1)
+                          ]),
                           _: 1
                         }, 8, ["onClick"])
                       ], 2)
                     ]),
                     _: 1
-                  }, 16, ["modelValue", "item-key"])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, "未选字段"))
+                  }, 16, ["modelValue", "item-key"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$5.NoData), {
+                    key: 1,
+                    text: vue.unref(getLocale)("setColumn.nodata")
+                  }, null, 8, ["text"]))
                 ], 2)
               ], 2)
             ], 2)
           ]),
           _: 1
-        }, 8, ["class", "modelValue"])
+        }, 8, ["class", "modelValue", "title"])
       ], 2);
     };
   }