@fangzhongya/fang-ui 0.1.35 → 0.1.36

package/dist/components/menus/index.css

@@ -2,7 +2,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;

package/dist/components/menus/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const Menus: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Menus, Menus as default };
+export { Menus };
+export default Menus;

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

@@ -15,26 +15,22 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   setup(__props, { emit: __emit }) {
     const prs = __props;
     const props = index.usePropsDefault(data.name, prs, data.dataProps);
-    index.viewProps(props, data.name);
     const attrs = index$1.useInherit(vue.useAttrs(), data.name);
     const cs = index$2.useCssName(data.name);
     const emit = __emit;
     const slots = vue.useSlots();
     const config = vue.computed(() => {
-      return Object.assign(
-        {
-          children: "children",
-          icon: "icon",
-          prop: "prop",
-          label: "label",
-          class: ""
-        },
-        props.config
-      );
+      return {
+        children: "children",
+        icon: "icon",
+        prop: "prop",
+        label: "label",
+        class: "",
+        ...props.config
+      };
     });
     function getChildrenValue(list, value, config2) {
-      for (let index2 = 0; index2 < list.length; index2++) {
-        const element = list[index2];
+      for (const element of list) {
         const p = config2.prop;
         if (p && element[p] == value) {
           return element;
@@ -44,16 +40,16 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function getChildren(list, arr, config2) {
       let arrObj = [];
       let listarr = list;
-      arr.forEach((value) => {
+      for (const value of arr) {
         let v = getChildrenValue(listarr, value, config2);
         if (v) {
-          arrObj.push(Object.assign({}, v));
+          arrObj.push({ ...v });
           const c = config2.children;
           if (c) {
             listarr = v[c];
           }
         }
-      });
+      }
       return arrObj;
     }
     function onSelect(id, arr) {

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

@@ -4,7 +4,7 @@ import { name, dataProps, dataEmits } from "./data.js";
 import { Menu } from "../../menu/index.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { useInherit } from "../../../hooks/inherit/index.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 import _sfc_main$1 from "./menu-ll2.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
@@ -13,26 +13,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const prs = __props;
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const attrs = useInherit(useAttrs(), name);
     const cs = useCssName(name);
     const emit = __emit;
     const slots = useSlots();
     const config = computed(() => {
-      return Object.assign(
-        {
-          children: "children",
-          icon: "icon",
-          prop: "prop",
-          label: "label",
-          class: ""
-        },
-        props.config
-      );
+      return {
+        children: "children",
+        icon: "icon",
+        prop: "prop",
+        label: "label",
+        class: "",
+        ...props.config
+      };
     });
     function getChildrenValue(list, value, config2) {
-      for (let index = 0; index < list.length; index++) {
-        const element = list[index];
+      for (const element of list) {
         const p = config2.prop;
         if (p && element[p] == value) {
           return element;
@@ -42,16 +38,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getChildren(list, arr, config2) {
       let arrObj = [];
       let listarr = list;
-      arr.forEach((value) => {
+      for (const value of arr) {
         let v = getChildrenValue(listarr, value, config2);
         if (v) {
-          arrObj.push(Object.assign({}, v));
+          arrObj.push({ ...v });
           const c = config2.children;
           if (c) {
             listarr = v[c];
           }
         }
-      });
+      }
       return arrObj;
     }
     function onSelect(id, arr) {

package/dist/components/menus/src/menu-ll2.cjs

@@ -7,9 +7,8 @@ const index$2 = require("../../icon/index.cjs");
 const use = require("../../common/use.cjs");
 const index$1 = require("../../../hooks/cssname/index.cjs");
 const util = require("./util.cjs");
-require("../../../utils/index.cjs");
-const index = require("../../../hooks/props-default/index.cjs");
 const util$1 = require("../../../utils/util.cjs");
+const index = require("../../../hooks/props-default/index.cjs");
 const name = "menu-li";
 const dataProps = {
   list: {
@@ -41,7 +40,6 @@ const _sfc_main = vue.defineComponent({
   props: index.getProps(dataProps),
   setup(prs, { emit, slots }) {
     const props = index.usePropsDefault(name, prs, dataProps);
-    index.viewProps(props, name);
     const cs = index$1.useCssName(name);
     const getIcon = (obj, config = {}) => {
       const i = obj[config.icon];

package/dist/components/menus/src/menu-ll2.js

@@ -5,9 +5,8 @@ import { Icon } from "../../icon/index.js";
 import { useHide } from "../../common/use.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { setLabel } from "./util.js";
-import "../../../utils/index.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
 import { getFathers } from "../../../utils/util.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 const name = "menu-li";
 const dataProps = {
   list: {
@@ -39,7 +38,6 @@ const _sfc_main = defineComponent({
   props: getProps(dataProps),
   setup(prs, { emit, slots }) {
     const props = usePropsDefault(name, prs, dataProps);
-    viewProps(props, name);
     const cs = useCssName(name);
     const getIcon = (obj, config = {}) => {
       const i = obj[config.icon];

package/dist/components/menus/src/util.cjs

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("vue");
 const use = require("../../common/use.cjs");
-require("../../../utils/util.cjs");
 const isObject = require("@fangzhongya/utils/basic/object/isObject");
 function setLabel(value, obj, props, compons, emit, slots, index) {
   let label = value ?? obj.label ?? "";
   if (label) {
     if (isObject.isObject(label)) {
-      label = Object.assign({}, obj, label);
+      label = { ...obj, ...label };
       const slot = use.useSetSlot(label, props.value, slots, index);
       if (slot) {
         return slot;

package/dist/components/menus/src/util.js

@@ -1,12 +1,11 @@
 import "vue";
 import { useSetSlot, useSetCompon, useGetDomValue } from "../../common/use.js";
-import "../../../utils/util.js";
 import { isObject } from "@fangzhongya/utils/basic/object/isObject";
 function setLabel(value, obj, props, compons, emit, slots, index) {
   let label = value ?? obj.label ?? "";
   if (label) {
     if (isObject(label)) {
-      label = Object.assign({}, obj, label);
+      label = { ...obj, ...label };
       const slot = useSetSlot(label, props.value, slots, index);
       if (slot) {
         return slot;

package/dist/components/message/index.d.ts

@@ -5,4 +5,5 @@ export * from './src/export';
 declare const Message: SFCInstallWithContext<Message> & {
     install: Plugin["install"];
 };
-export { Message, Message as default };
+export { Message };
+export default Message;

package/dist/components/message/index.scss

@@ -2,4 +2,5 @@
 
 $message: 'message';
 @include b($message) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/message-box/index.d.ts

@@ -6,4 +6,5 @@ declare const MessageBox: SFCWithInstall<IElMessageBox> & {
     install: Function;
     _context: AppContext | null;
 };
-export { MessageBox, MessageBox as default };
+export { MessageBox };
+export default MessageBox;

package/dist/components/message-box/index.scss

@@ -2,4 +2,5 @@
 
 $message-box: 'message-box';
 @include b($message-box) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/no-data/index.css

@@ -2,7 +2,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;

package/dist/components/no-data/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const NoData: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { NoData, NoData as default };
+export { NoData };
+export default NoData;

package/dist/components/no-data/src/index2.cjs

@@ -18,7 +18,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return getLocale("nodata");
       }
     });
-    index$2.viewProps(props, data.name);
     const emit = __emit;
     __expose({
       ...data.dataExpose

package/dist/components/no-data/src/index2.js

@@ -2,7 +2,7 @@ import { defineComponent, createElementBlock, openBlock, normalizeClass, unref,
 import { name, dataProps, dataExpose, dataEmits } from "./data.js";
 import { useCssName } from "../../../hooks/cssname/index.js";
 import { useLocale } from "../../../hooks/locale/index.js";
-import { usePropsDefault, viewProps, getProps } from "../../../hooks/props-default/index.js";
+import { usePropsDefault, getProps } from "../../../hooks/props-default/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: getProps(dataProps),
@@ -16,7 +16,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return getLocale("nodata");
       }
     });
-    viewProps(props, name);
     const emit = __emit;
     __expose({
       ...dataExpose

package/dist/components/option/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const Option: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Option, Option as default };
+export { Option };
+export default Option;

package/dist/components/option/index.scss

@@ -2,4 +2,5 @@
 
 $option: 'option';
 @include b($option) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/option-group/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const OptionGroup: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { OptionGroup, OptionGroup as default };
+export { OptionGroup };
+export default OptionGroup;

package/dist/components/option-group/index.scss

@@ -2,4 +2,5 @@
 
 $option-group: 'option-group';
 @include b($option-group) {
+	// 占位符，为将来扩展预留
 }

package/dist/components/page/index.css

@@ -3,7 +3,7 @@
   --on: rgb(91, 189, 246);
   --color-primary: #409eff;
   --bag-primary: #409eff;
-  --bag-primary-text: #fff;
+  --bag-primary-text: #ffffff;
   --border: #eee;
   --layout-panel-gap: 10px;
   --layout-panel-padding: 20px;
@@ -49,7 +49,7 @@
   display: grid;
 }
 
-.array {
+.double {
   width: 100%;
   display: inline-flex;
   align-items: center;
@@ -58,10 +58,10 @@
   box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
   border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
 }
-.array.is-focus {
+.double.is-focus {
   box-shadow: 0 0 0 1px var(--color-primary) inset;
 }
-.array-error {
+.double-error {
   position: absolute;
   bottom: -23px;
   color: #f00;
@@ -69,40 +69,40 @@
   border-radius: 4px;
   left: 12px;
 }
-.array-error.type-1 {
+.double-error.type-1 {
   left: calc(50% + 24px);
 }
-.array-error.type-1.is-clear {
+.double-error.type-1.is-clear {
   left: calc(50% + 11px);
 }
-.array-focus {
+.double-focus {
   position: absolute;
   z-index: -1;
   opacity: 0;
 }
-.array-value {
+.double-value {
   flex: 1;
   height: 100%;
 }
-.array-range {
+.double-range {
   padding: 0 5px;
 }
-.array-clear {
+.double-clear {
   cursor: pointer;
   align-items: center;
   display: inline-flex;
   justify-content: center;
   padding: 5px;
 }
-.array-clear svg {
+.double-clear svg {
   width: 1rem;
   height: 1rem;
 }
-.array .el-input .el-input__wrapper {
+.double .el-input .el-input__wrapper {
   border: none;
   box-shadow: none;
 }
-.array .el-input .el-input__wrapper input {
+.double .el-input .el-input__wrapper input {
   text-align: center;
 }
 
@@ -506,7 +506,7 @@
   display: none;
   align-items: center;
   justify-content: center;
-  color: #fff;
+  color: #ffffff;
 }
 .uploads-list-li-operation > span {
   font-size: 16px;
@@ -706,7 +706,6 @@
   white-space: nowrap;
 }
 .list-div .list-table .is-width .list-table-label {
-  white-space: pre-wrap;
   word-break: break-all;
   white-space: normal;
   display: block;
@@ -718,10 +717,8 @@
   white-space: pre-wrap;
 }
 .list-div .list-table .list-table-value {
-  white-space: pre-wrap;
   word-break: break-all;
   white-space: normal;
-  display: block;
   max-height: var(--list-row-max-height);
   display: -webkit-box;
   -webkit-line-clamp: var(--list-line-clamp); /* 显示的行数 */

package/dist/components/page/index.d.ts

@@ -1,4 +1,5 @@
 import { SFCWithInstall } from '../../utils/vues';
 import { DefineComponent } from 'vue';
 declare const Page: SFCWithInstall<DefineComponent<{}, {}, any>>;
-export { Page, Page as default };
+export { Page };
+export default Page;

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

@@ -23,7 +23,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const { getLocale, getLocaleAdd } = index.useLocale();
     const prs = __props;
     const props = index$1.usePropsDefault(data.name, prs, data.dataProps);
-    index$1.viewProps(props, data.name);
     const emit = __emit;
     const cs = index$2.useCssName(data.name);
     const slots = vue.useSlots();
@@ -32,7 +31,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const getListObj = () => {
       const value = {};
       const filtration = (arr, listobj) => {
-        arr.forEach((obj) => {
+        for (const obj of arr) {
           if (listobj) {
             obj.father = obj.father ?? listobj;
           }
@@ -42,14 +41,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           if (obj.children) {
             filtration(obj.children, obj);
           }
-        });
+        }
       };
       filtration(props.list);
       return value;
     };
     const getColumnList = (array, callback) => {
       const filtration = (value2, arr) => {
-        arr.forEach((item) => {
+        for (const item of arr) {
           let obj = {};
           if (typeof item === "string") {
             const v = listObj[item] || {
@@ -67,12 +66,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               filtration(children, obj.children);
               obj.children = children;
             }
-            if (obj.prop) {
-              obj = Object.assign({}, listObj[obj.prop] || {}, obj);
+            if (obj.prop && listObj[obj.prop]) {
+              obj = { ...listObj[obj.prop], ...obj };
             }
             value2.push(obj);
           }
-        });
+        }
       };
       const value = [];
       filtration(value, array);
@@ -99,7 +98,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const list2 = getListQuery();
       if ((_a = props.config.query) == null ? void 0 : _a.senior) {
         let i = 0;
-        list2.forEach((obj) => {
+        for (const obj of list2) {
           if (obj.querybasis) {
             i++;
           } else {
@@ -107,7 +106,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               return !isSenior.value;
             };
           }
-        });
+        }
         if (i == 0) {
           list2[0].hide = void 0;
         }
@@ -260,9 +259,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const label = ((_a = props.config.delete) == null ? void 0 : _a.label) || "name";
       const prop = ((_b = props.config.delete) == null ? void 0 : _b.prop) || "id";
       const name2 = ((_c = listObj[label]) == null ? void 0 : _c.label) || "内容";
-      array.forEach((obj) => {
+      for (const obj of array) {
         ts.push(name2 + "：" + (obj[label] ?? ""));
-      });
+      }
       index$3.MessageBox.confirm(ts.join("<br>"), "提示", {
         confirmButtonText: "确认",
         cancelButtonText: "取消",
@@ -376,7 +375,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const querySlots = [];
     const setSlots = () => {
       const ds = Object.values(dataSlot);
-      Object.keys(slots || {}).forEach((key) => {
+      for (const key of Object.keys(slots || {})) {
         if (!ds.includes(key)) {
           if (key.startsWith("query-")) {
             querySlots.push(key.replace(/^query-/, ""));
@@ -393,7 +392,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             tableSlots.push(key);
           }
         }
-      });
+      }
     };
     setSlots();
     const dialog = vue.reactive({
@@ -403,83 +402,61 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       value: {}
     });
     const onConfirm = () => {
-      if (formRef.value) {
-        formRef.value.validate().then((data2) => {
-          var _a, _b;
-          if (dialog.type === "add") {
-            console.log("添加", data2);
-            const ajax = (_a = props.config.add) == null ? void 0 : _a.ajax;
-            if (ajax) {
-              const param = {
-                param: props.value
-              };
-              if (typeof ajax === "object") {
-                param.onRequestBefore = ajax == null ? void 0 : ajax.onRequestBefore;
-                param.onRequestAfter = ajax == null ? void 0 : ajax.onRequestAfter;
-                param.ajax = ajax == null ? void 0 : ajax.url;
-                param.ajaxConfig = ajax == null ? void 0 : ajax.config;
-              } else {
-                param.ajax = ajax;
-              }
-              urls.comHandle(param, data2).then((res) => {
-                if (res.result) {
-                  index$4.Message.success(
-                    res.info || "添加成功"
-                  );
-                  dialog.visible = false;
-                  onRefresh();
-                } else {
-                  index$4.Message.error(res.info || "添加失败");
-                }
-              }).catch((err) => {
-                console.error("添加失败", err);
-              });
-            } else {
-              emit("add", data2, () => {
-                dialog.visible = false;
-                onRefresh();
-              });
-            }
-          } else if (dialog.type === "edit") {
-            console.log("编辑", data2);
-            const ajax = (_b = props.config.edit) == null ? void 0 : _b.ajax;
-            if (ajax) {
-              const param = {
-                param: props.value
-              };
-              if (typeof ajax === "object") {
-                param.onRequestBefore = ajax == null ? void 0 : ajax.onRequestBefore;
-                param.onRequestAfter = ajax == null ? void 0 : ajax.onRequestAfter;
-                param.ajax = ajax == null ? void 0 : ajax.url;
-                param.ajaxConfig = ajax == null ? void 0 : ajax.config;
-              } else {
-                param.ajax = ajax;
-              }
-              urls.comHandle(param, data2).then((res) => {
-                if (res.result) {
-                  index$4.Message.success(
-                    res.info || "编辑成功"
-                  );
-                  dialog.visible = false;
-                  onRefresh();
-                } else {
-                  index$4.Message.error(res.info || "编辑失败");
-                }
-              }).catch((err) => {
-                console.error("编辑失败", err);
-              });
-            } else {
-              emit("edit", data2, () => {
-                dialog.visible = false;
-                onRefresh();
-              });
-            }
-          }
-        }).catch((err) => {
-          console.error("表单验证失败", err);
-        });
+      if (!formRef.value) return;
+      formRef.value.validate().then((data2) => {
+        handleFormValidationSuccess(data2);
+      }).catch((err) => {
+        console.error("表单验证失败", err);
+      });
+    };
+    const handleFormValidationSuccess = (data2) => {
+      if (dialog.type === "add") {
+        handleOperation("add", data2, "添加");
+      } else if (dialog.type === "edit") {
+        handleOperation("edit", data2, "编辑");
+      }
+    };
+    const handleOperation = (type, data2, operationName) => {
+      console.log(operationName, data2);
+      const operationConfig = type === "add" ? props.config.add : props.config.edit;
+      const ajax = operationConfig == null ? void 0 : operationConfig.ajax;
+      if (ajax) {
+        handleAjaxOperation(ajax, data2, operationName);
+      } else {
+        handleEmitOperation(type, data2, operationName);
       }
     };
+    const handleAjaxOperation = (ajax, data2, operationName) => {
+      const param = {
+        param: props.value
+      };
+      if (typeof ajax === "object") {
+        param.onRequestBefore = ajax == null ? void 0 : ajax.onRequestBefore;
+        param.onRequestAfter = ajax == null ? void 0 : ajax.onRequestAfter;
+        param.ajax = ajax == null ? void 0 : ajax.url;
+        param.ajaxConfig = ajax == null ? void 0 : ajax.config;
+      } else {
+        param.ajax = ajax;
+      }
+      urls.comHandle(param, data2).then((res) => {
+        if (res.result) {
+          index$4.Message.success(res.info || `${operationName}成功`);
+          dialog.visible = false;
+          onRefresh();
+        } else {
+          index$4.Message.error(res.info || `${operationName}失败`);
+        }
+      }).catch((err) => {
+        console.error(`${operationName}失败`, err);
+      });
+    };
+    const handleEmitOperation = (type, data2, operationName) => {
+      const emitEvent = type === "add" ? "add" : "edit";
+      emit(emitEvent, data2, () => {
+        dialog.visible = false;
+        onRefresh();
+      });
+    };
     const getListForm = () => {
       var _a, _b;
       if (dialog.type === "edit") {