mix-public 1.1.3 → 1.1.5

package/README.md

@@ -18,7 +18,7 @@
 ### 初始化方式
   ```javascript
     // 布局使用(入口文件)
-    import mixRender from "mix-public"
+    import mixRender from "../../../../mixRender.js"
 
     const mixPublicLib = mixRender({
           mixProjectType: mixProjectType, // 项目类型: 在服务端创建的项目标识
@@ -27,11 +27,11 @@
           mixApptype: mixApptype, // app类型: web android ios
           mixDeviceInfo: mixDeviceInfo // 项目版本号: 服务端的版本标识
         });
-    import 'mix-public/mixRender.css'; // 引入web端app基础样式
+    import '../../../../mixRender.css'; // 引入web端app基础样式
     mixPublicLib // 为原生基础调用方法，可在页面使用
 
     // 单独方法使用
-    import mixRender from "mix-public"
+    import mixRender from "../../../../mixRender.js"
     const PublicLib = mixRender({
       mixJustMethod: true,
       mixApptype: apptype, // app类型: web android ios
@@ -81,4 +81,6 @@
 - v1.1.0 方法包调用方式整体调整
 - v1.1.1 添加OnloadPage生命周期/调整 goto 方法参数
 - v1.1.2 修复方法环境变量/添加 a 标签捕获自定义站内跳转
-- v1.1.3 方法包剩余调用方式整体调整
+- v1.1.3 方法包剩余调用方式整体调整
+- v1.1.4 goto 方法参数调整
+- v1.1.5 部分方法网页版完善/优化方法样式

package/main/mixappfunc.js

@@ -2,8 +2,6 @@
 //   closeToast,
 //   showConfirmDialog,
 //   showDialog,
-//   showLoadingToast,
-//   showNotify,
 // } from "vant"
 import { mixLocalShakeDownDecrypt, mixLocalShakeDownEncrypt } from "../customMethod/cryptoJS.js"
 import { Cookies } from "../customMethod/cookie.js"
@@ -13,11 +11,7 @@ import { asyncReturnMethod, syncReturnMethod, callMethod, mixJsonStringify, mixJ
 import cachPictureForWeb from "../customMethod/cachPictureForWeb.js"
 import formatColor, { togglePageGrayscale } from "../customMethod/formatColor.js";
 import { getUrlQuery } from "../customMethod/pageParams.js"
-
-function mixShowAlert(message) {
-  alert(message)
-  // showNotify({ message })
-}
+import { mixLoading, mixHideLoading, mixMsg, mixDialog, mixFloatingWindowData } from "../pageRender/componentsRender.js"
 
 const loginUrl = "user-login";
 var u = navigator.userAgent
@@ -71,8 +65,9 @@ export const mixPublicLib = (op) =>{
      * 以http开头为跳转外部网页
      * MiniApp?MiniAppId=appid&OnlineUrl=onlineurl&JumpUrl=miniapppagename
      * */
-    Goto: function (op = {}, params = {}) {
+    Goto: function (op = {}) {
       const Url = op.Url || ""
+      const Params  = op.Params || {}
       const OutSide = op.OutSide || false
       const mixPublicFn = mixPublicLib({isWeb, version})
       const Urlparams = getUrlQuery(Url)
@@ -87,8 +82,8 @@ export const mixPublicLib = (op) =>{
         mixPublicFn.JumpMiniApp({OnlineUrl:Urlparams.OnlineUrl,MiniAppId:Urlparams.MiniAppId,JumpUrl:Urlparams.JumpUrl})
       } else {
         //- 判断参数长度并将参数储存到cookies
-        if (Object.keys(Urlparams).length > 0 || Object.keys(params).length > 0) {
-          mixPublicLib({isWeb, version}).putCookieInfo("mixAPPPageParams", Object.keys(params).length > 0 ? params : Urlparams)
+        if (Object.keys(Urlparams).length > 0 || Object.keys(Params).length > 0) {
+          mixPublicLib({isWeb, version}).putCookieInfo("mixAPPPageParams", Object.keys(Params).length > 0 ? Params : Urlparams)
         }else{
           mixPublicLib({isWeb, version}).putCookieInfo("mixAPPPageParams", {})
         }
@@ -1665,7 +1660,18 @@ export const mixPublicLib = (op) =>{
         environment:this.environment,
         methodName: 'ClearAppCache',
         webMethod: ()=>{
-          console.log(`清理APP缓存`, "color: blue", "color: #4CAF50;")
+          const cookies = document.cookie.split(';');
+          const domainParts = window.location.hostname.split('.');
+          const domains = [
+              '',  // 当前域名
+              ...(domainParts.length > 1 ? [`.${domainParts.slice(-2).join('.')}`] : [])  // 二级域名
+          ];
+          cookies.forEach(cookie => {
+              const [name] = cookie.trim().split('=');
+              domains.forEach(domain => {
+                  document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${domain}`;
+              });
+          });
         },
         params:{}
       })
@@ -1851,7 +1857,7 @@ export const mixPublicLib = (op) =>{
         environment:this.environment,
         methodName: 'ShowLoading',
         webMethod: ()=>{
-          ShowLoading(Message)
+          mixLoading(Message)
         },
         params:{}
       });
@@ -1865,7 +1871,7 @@ export const mixPublicLib = (op) =>{
         environment:this.environment,
         methodName: 'HideLoading',
         webMethod: ()=>{
-          closeToast()
+          mixHideLoading()
         },
         params:{}
       });
@@ -1875,56 +1881,69 @@ export const mixPublicLib = (op) =>{
      *  显示msg弹窗
      * */
     ShowMsg: function (op = {}) {
-      const Title = op.Title || "标题"
-      const Message = op.Message || "提示内容"
-      const ButtonText = op.confirmButtonText || "知道了"
-      callMethod({
-        environment:this.environment,
-        methodName: 'ShowMsg',
-        webMethod: ()=>{
-          showDialog({
-            title: Title,
-            message: Message,
-            confirmButtonText: ButtonText,
-          }).then(() => {
-            // on close
-          })
-        },
-        params:{Title, ButtonText, Message}
-      });
+      return new Promise((resolve, reject) => {
+        window.MixShowMsgCallBack = function () {
+          resolve();
+        }
+        const Title = op.Title || "标题"
+        const Message = op.Message || "提示内容"
+        const ButtonText = op.confirmButtonText || "知道了"
+        const ConfirmAction = "MixShowMsgCallBack"
+        callMethod({
+          environment:this.environment,
+          methodName: 'ShowMsg',
+          webMethod: ()=>{
+            mixMsg({
+              title: Title,
+              message: Message,
+              confirmButtonText: ButtonText,
+            }).then(()=>{
+              MixShowMsgCallBack()
+            })
+          },
+          params:{Title, ButtonText, Message, ConfirmAction}
+        });
+        
+      })
     },
 
     /**
      *  确认弹出框
      * */
     ShowDialog: function (op = {}) {
-      const Title = op.Title || ""
-      const Message = op.Message || ""
-      const ConfirmText = op.ConfirmText || ""
-      const CancelText = op.CancelText || ""
-      const ConfirmAction = op.ConfirmAction || ""
-      const CancelAction = op.CancelAction || ""
-      callMethod({
-        environment:this.environment,
-        methodName: 'ShowDialog',
-        webMethod: ()=>{
-          showConfirmDialog({
-            title: Title,
-            message: Message,
-            confirmButtonText: ConfirmText || "确定",
-            cancelButtonText: CancelText || "取消",
-          })
-            .then(() => {
-              // on confirm
-              window[ConfirmAction]()
-            })
-            .catch(() => {
-              // on cancel
-              window[CancelAction]()
+      return new Promise((resolve, reject) => { 
+        window.MixShowDialogConfirmActionCallBack = function () {
+          resolve();
+        }
+        window.MixShowDialogCancelActionCallBack = function () {
+          reject();
+        }
+        const Title = op.Title || "标题"
+        const Message = op.Message || "确认内容"
+        const ConfirmText = op.ConfirmText || "确认按钮"
+        const CancelText = op.CancelText || "取消按钮"
+        const ConfirmAction = "MixShowDialogConfirmActionCallBack"
+        const CancelAction = "MixShowDialogCancelActionCallBack"
+        callMethod({
+          environment:this.environment,
+          methodName: 'ShowDialog',
+          webMethod: ()=>{
+            mixDialog({
+              title: Title,
+              message: Message,
+              confirmButtonText: ConfirmText || "确定",
+              cancelButtonText: CancelText || "取消",
             })
-        },
-        params:{Title, Message, ConfirmText, CancelText, ConfirmAction, CancelAction}
-      });
+              .then(() => {
+                MixShowDialogConfirmActionCallBack()
+              })
+              .catch(() => {
+               MixShowDialogCancelActionCallBack()
+              })
+          },
+          params:{Title, Message, ConfirmText, CancelText, ConfirmAction, CancelAction}
+        });
+      })
     },
 
     /**
@@ -1934,17 +1953,15 @@ export const mixPublicLib = (op) =>{
       const Url = op.Url || ""
       const Title = op.Title || ""
       const Detail = op.Detail || ""
-      const Params = op.Params || ""
+      const Params = op.Params || {}
       const Icon = op.Icon || ""
       callMethod({
         environment:this.environment,
         methodName: 'FloatingWindowData',
         webMethod: ()=>{
-          console.log(
-            `%c 添加页面浮窗=> %c 参数为：${row}`,
-            "color: blue",
-            "color: #4CAF50;",
-          )
+          mixFloatingWindowData({
+            Url, Title, Detail, Params, Icon,Fn: mixPublicLib({isWeb, version})
+          })
         },
         params:{Url, Title, Detail, Params, Icon}
       });
@@ -2112,7 +2129,7 @@ export const mixPublicLib = (op) =>{
     },
 
     /**
-     * 启动本地服务器
+     * 启动本地服务器(仅APP环境)
      * */
     StartHttpServer: function () {
       callMethod({
@@ -2126,7 +2143,7 @@ export const mixPublicLib = (op) =>{
     },
 
     /**
-     * 关闭本地服务器
+     * 关闭本地服务器(仅APP环境)
      * */
     StopHttpServer: function () {
       callMethod({
@@ -2191,7 +2208,8 @@ export const mixPublicLib = (op) =>{
         environment:this.environment,
         methodName: 'CacheSize',
         webMethod: ()=>{
-          return "1.24KB"
+          let cookies = document.cookie;
+          return (Math.floor(cookies.length / 1024 * 100) / 100) + "KB";
         },
         params: {},
       })
@@ -2205,7 +2223,7 @@ export const mixPublicLib = (op) =>{
         environment:this.environment,
         methodName: 'OnlineService',
         webMethod: ()=>{
-          console.log(`客服中心`, "color: blue", "color: #4CAF50;")
+          window.location.href = "http://oss.kexiaoshuang.com/MEIQIA/chatlink.html"
         },
         params:{}
       });
@@ -2219,19 +2237,15 @@ export const mixPublicLib = (op) =>{
         environment:this.environment,
         methodName: 'OpenAmap',
         webMethod: ()=>{
+          var url = `https://m.amap.com/search?query=${encodeURIComponent(Address)}`;
+          window.open(url);
           return new Promise((resolve, reject) => {
-            // TODO
-            console.log(`打开高德地图`, "color: blue", "color: #4CAF50;")
-            // window.location.href = Url;
-            setTimeout(() => {
-              resolve()
-            }, 4000);
           })
         },
         params:{Address}
       })
     },
-    /**
+    /**-
      * 上传视频（单个视频，相机/相册）
      * MethodName:回调方法
      * VideoDuration: 录制时长

package/mix-project/.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

package/mix-project/.prettierignore

@@ -0,0 +1,9 @@
+/dist/*
+.local
+.output.js
+/node_modules/**
+
+**/*.svg
+**/*.sh
+
+/public/*

package/mix-project/.prettierrc.mjs

@@ -0,0 +1,62 @@
+/**
+ * @type {import('prettier').Config}
+ */
+export default {
+  $schema: "https://json.schemastore.org/prettierrc",
+  tabWidth: 2, // 缩进宽度
+  printWidth: 80, // 一行代码最多几个字符
+  singleQuote: false, // 是否使用单引号
+  trailingComma: "all", // 最后一个属性时候带上逗号
+  useTabs: false, // 时候使用制表符
+  semi: false, // 在语句的末尾使用分号
+  bracketSpacing: true, // 对象文字中括号之间使用空格分割
+  jsxSingleQuote: true, // 在jsx中使用单引号
+  htmlWhitespaceSensitivity: "css", // HTML空白敏感度
+  vueIndentScriptAndStyle: false, // 是否缩进Vue文件中的script和style标签
+  // 对HTML属性进行排序
+  attributeSort: [
+    "^cols$",
+    "^v-if$",
+    "^v-else$",
+    "^v-for$",
+    "^:key$",
+    "^v-else-if$",
+    "^v-on$",
+    "^v-bind$",
+    "^ref$",
+    "^v-model",
+    "^name$",
+    "^:?type$",
+    "^:value$",
+    "^v-text$",
+    "^:?label$",
+    "^:headers$",
+    "^:items$",
+    "^:?item-text$",
+    "^:?item-value$",
+    "^:?item-disabled$",
+    "^:?placeholder$",
+    "^:?src$",
+    "^:?color$",
+    "^:?text-color$",
+    "^:?icon$",
+    "^:?small$",
+    "^:?hint$",
+    "^:?persistent-hint$",
+    "^prepend-",
+    "^@click:prepend",
+    "^append-",
+    "^@click:append",
+    "^:to$",
+    "^exact$",
+    "^:(?!(width|height|loading|disabled|data-))",
+    "^target$",
+    "^:?width$",
+    "^:?height$",
+    "^@click",
+    "^@",
+    "^:loading$",
+    "^:disabled$",
+    "^:?data-",
+  ],
+}

package/mix-project/.stylelintignore

@@ -0,0 +1,2 @@
+/dist/*
+/public/*

package/mix-project/.stylelintrc.mjs

@@ -0,0 +1,292 @@
+/** @type {import('stylelint').Config} */
+export default {
+  extends: [
+    "stylelint-config-standard",
+    "stylelint-config-recommended-vue",
+    "stylelint-config-standard-scss",
+    "stylelint-prettier/recommended",
+  ],
+  plugins: ["stylelint-order", "stylelint-scss", "stylelint-prettier"],
+  overrides: [
+    {
+      files: ["**/*.scss"],
+      customSyntax: "postcss-scss",
+    },
+    {
+      files: ["*.html", "**/*.{html,vue}"],
+      customSyntax: "postcss-html",
+    },
+  ],
+  rules: {
+    "scss/load-no-partial-leading-underscore": null,
+    "keyframes-name-pattern": null,
+    "no-descending-specificity": null,
+    "number-max-precision": null,
+    "prettier/prettier": true,
+    "scss/at-extend-no-missing-placeholder": null,
+    "no-empty-source": null,
+    "selector-class-pattern": null,
+    "selector-pseudo-class-no-unknown": null,
+    "unit-no-unknown": [true, { ignoreUnits: ["rpx"] }],
+    "order/order": ["custom-properties", "declarations"],
+    "order/properties-order": [
+      // 布局属性
+      "display",
+      "visibility",
+      "overflow",
+      "overflow-x",
+      "overflow-y",
+      "scroll-behavior",
+      "scroll-snap-align",
+      // 布局属性：浮动
+      "float",
+      "clear",
+      // 布局属性：定位
+      "position",
+      "left",
+      "right",
+      "top",
+      "bottom",
+      "z-index",
+      // 布局属性：列表
+      "list-style",
+      "list-style-type",
+      "list-style-position",
+      "list-style-image",
+      // 布局属性：表格
+      "table-layout",
+      "border-collapse",
+      "border-spacing",
+      "caption-side",
+      "empty-cells",
+      // 布局属性：弹性
+      "flex-flow",
+      "flex-direction",
+      "flex-wrap",
+      "justify-content",
+      "align-content",
+      "align-items",
+      "align-self",
+      "flex",
+      "flex-grow",
+      "flex-shrink",
+      "flex-basis",
+      "order",
+      // 布局属性：多列
+      "columns",
+      "column-width",
+      "column-count",
+      "column-gap",
+      "column-rule",
+      "column-rule-width",
+      "column-rule-style",
+      "column-rule-color",
+      "column-span",
+      "column-fill",
+      "column-break-before",
+      "column-break-after",
+      "column-break-inside",
+      // 布局属性：格栅
+      "grid-columns",
+      "grid-rows",
+      // 尺寸属性
+      "box-sizing",
+      "margin",
+      "margin-left",
+      "margin-right",
+      "margin-top",
+      "margin-bottom",
+      "padding",
+      "padding-left",
+      "padding-right",
+      "padding-top",
+      "padding-bottom",
+      "border",
+      "border-width",
+      "border-style",
+      "border-color",
+      "border-colors",
+      "border-left",
+      "border-left-width",
+      "border-left-style",
+      "border-left-color",
+      "border-left-colors",
+      "border-right",
+      "border-right-width",
+      "border-right-style",
+      "border-right-color",
+      "border-right-colors",
+      "border-top",
+      "border-top-width",
+      "border-top-style",
+      "border-top-color",
+      "border-top-colors",
+      "border-bottom",
+      "border-bottom-width",
+      "border-bottom-style",
+      "border-bottom-color",
+      "border-bottom-colors",
+      "border-radius",
+      "border-top-left-radius",
+      "border-top-right-radius",
+      "border-bottom-left-radius",
+      "border-bottom-right-radius",
+      "border-image",
+      "border-image-source",
+      "border-image-slice",
+      "border-image-width",
+      "border-image-outset",
+      "border-image-repeat",
+      "width",
+      "min-width",
+      "max-width",
+      "height",
+      "min-height",
+      "max-height",
+      // 界面属性
+      "appearance",
+      "outline",
+      "outline-width",
+      "outline-style",
+      "outline-color",
+      "outline-offset",
+      "outline-radius",
+      "outline-radius-topleft",
+      "outline-radius-topright",
+      "outline-radius-bottomleft",
+      "outline-radius-bottomright",
+      "background",
+      "background-color",
+      "background-image",
+      "background-repeat",
+      "background-repeat-x",
+      "background-repeat-y",
+      "background-position",
+      "background-position-x",
+      "background-position-y",
+      "background-size",
+      "background-origin",
+      "background-clip",
+      "background-attachment",
+      "bakground-composite",
+      "mask",
+      "mask-mode",
+      "mask-image",
+      "mask-repeat",
+      "mask-repeat-x",
+      "mask-repeat-y",
+      "mask-position",
+      "mask-position-x",
+      "mask-position-y",
+      "mask-size",
+      "mask-origin",
+      "mask-clip",
+      "mask-attachment",
+      "mask-composite",
+      "mask-box-image",
+      "mask-box-image-source",
+      "mask-box-image-width",
+      "mask-box-image-outset",
+      "mask-box-image-repeat",
+      "mask-box-image-slice",
+      "box-shadow",
+      "box-reflect",
+      "backdrop-filter",
+      "mix-blend-mode",
+      "filter",
+      "opacity",
+      "object-fit",
+      "clip",
+      "clip-path",
+      "resize",
+      "zoom",
+      "cursor",
+      "pointer-events",
+      "touch-callout",
+      "user-modify",
+      "user-focus",
+      "user-input",
+      "user-select",
+      "user-drag",
+      // 文字属性
+      "line-height",
+      "line-clamp",
+      "vertical-align",
+      "direction",
+      "unicode-bidi",
+      "writing-mode",
+      "ime-mode",
+      "text-overflow",
+      "text-decoration",
+      "text-decoration-line",
+      "text-decoration-style",
+      "text-decoration-color",
+      "text-decoration-skip",
+      "text-underline-position",
+      "text-align",
+      "text-align-last",
+      "text-justify",
+      "text-indent",
+      "text-stroke",
+      "text-stroke-width",
+      "text-stroke-color",
+      "text-shadow",
+      "text-transform",
+      "text-size-adjust",
+      "src",
+      "font",
+      "font-family",
+      "font-style",
+      "font-stretch",
+      "font-weight",
+      "font-variant",
+      "font-size",
+      "font-size-adjust",
+      "color",
+      // 内容属性
+      "tab-size",
+      "overflow-wrap",
+      "word-wrap",
+      "word-break",
+      "word-spacing",
+      "letter-spacing",
+      "white-space",
+      "caret-color",
+      "quotes",
+      "content",
+      "content-visibility",
+      "counter-reset",
+      "counter-increment",
+      "page",
+      "page-break-before",
+      "page-break-after",
+      "page-break-inside",
+      // 交互属性
+      "will-change",
+      "perspective",
+      "perspective-origin",
+      "backface-visibility",
+      "transform",
+      "transform-origin",
+      "transform-style",
+      "transition",
+      "transition-property",
+      "transition-duration",
+      "transition-timing-function",
+      "transition-delay",
+      "animation",
+      "animation-name",
+      "animation-duration",
+      "animation-timing-function",
+      "animation-delay",
+      "animation-iteration-count",
+      "animation-direction",
+      "animation-play-state",
+      "animation-fill-mode",
+      // Webkit专有属性
+      "-webkit-overflow-scrolling",
+      "-webkit-text-fill-color",
+      "-webkit-tap-highlight-color",
+    ],
+  },
+}