@10yun/cv-pc-ui 0.3.52 → 0.3.53

package/lib/cv-ui.js

@@ -608,7 +608,7 @@ const Dl = (() => {
 } }, methods: { _mergeAttrs(e) {
   const t = this.$cvUiParams || {}, o = e && t[e] || {}, l = t[this.componentName] || {}, a = Object.assign({}, o, l);
   return Object.assign({}, a, this.$attrs);
-} } }, Ss = { class: "cv-geo-map__wrap" }, Vs = { class: "cv-geo-map__box" }, _s = { style: { width: "100%", height: "510px" } }, Is = ["src"], Ts = { class: "cv-geo-map__info" }, Ls = { key: 0, class: "cv-geo-map__address" }, Ds = { key: 1, class: "cv-geo-map__jwd" }, Ot = S({ name: "cvGeoMap", mixins: [$l], emits: ["update:address", "update:latitude", "update:longitude", "update:name", "update:city"], props: { title: { type: [String], default: "选择经纬度地点" }, mapKey: { type: [String], default: "" }, mapType: { type: [String], default: "qq" }, address: { type: [String] }, latitude: { type: [Number, String] }, longitude: { type: [Number, String] } }, watch: { address(e) {
+} } }, Ss = { class: "cv-geo-map__wrap" }, Vs = { class: "cv-geo-map__box" }, _s = { style: { width: "100%", height: "510px" } }, Is = ["src"], Ts = { class: "cv-geo-map__info" }, Ls = { key: 0, class: "cv-geo-map__address" }, Ds = { key: 1, class: "cv-geo-map__jwd" }, Ot = S({ name: "cvGeoMap", mixins: [$l], emits: ["update:address", "update:latitude", "update:longitude", "update:name", "update:city"], props: { title: { type: [String], default: "选择经纬度地点" }, mapKey: { type: [String], default: "" }, mapSecret: { type: [String], default: "" }, mapType: { type: [String], default: "qq" }, address: { type: [String] }, name: { type: [String] }, city: { type: [String] }, latitude: { type: [Number, String] }, longitude: { type: [Number, String] } }, watch: { address(e) {
   this.localAddress = e;
 }, latitude(e) {
   this.localLatitude = e;
@@ -620,9 +620,21 @@ const Dl = (() => {
   this.localCity = e;
 } }, computed: { localMapKey() {
   return this._mergeAttrs("geo").mapKey;
+}, localMapSecret() {
+  return this._mergeAttrs("geo").mapSecret;
 }, mapSrc() {
   let e = this.localMapKey;
-  return this.mapType == "qq" ? `https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=${e}&referer=myapp` : (this.$message.info("目前只支持腾讯地图"), "");
+  if (this.mapType == "qq") {
+    if (!this.localMapKey) return "";
+    let t = "https://apis.map.qq.com/tools/locpicker";
+    return t += `?search=1&type=1&key=${e}&referer=myapp`, this.latitude && this.longitude && (t += `&coord=${this.latitude},${this.longitude}`), t;
+  }
+  if (this.mapType == "amap") {
+    if (!this.localMapKey || !this.localMapSecret) return "";
+    let t = "https://m.amap.com/picker/";
+    return t += `?zoom=15&radius=1000&total=20&key=${e}&jscode=${localMapSecret}`, this.latitude && this.longitude && (t += `&center=${this.longitude},${this.latitude}`), t;
+  }
+  return this.$message.info("目前不支持百度地图"), "";
 } }, data: () => ({ localMapShow: !1, localAddress: "", localLatitude: "", localLongitude: "", localName: "", localCity: "" }), mounted() {
   this.initData();
 }, methods: { initData() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-pc-ui",
-  "version": "0.3.52",
+  "version": "0.3.53",
   "description": "cvjs-pc-ui组件",
   "author": "10yun",
   "private": false,

package/src/mixins/attrs.js

@@ -21,6 +21,8 @@ export default {
       const globalCompoAttr = globalAttrs[this.componentName] || {};
       const lastCompAttrs = Object.assign({}, globalUploadAttrs, globalCompoAttr);
       // console.log('---lastCompAttrs---', this.componentName, lastCompAttrs, this.$props, this.$attrs);
+      console.log(globalAttrs);
+      console.log(globalCompoAttr);
       return Object.assign(
         {},
         lastCompAttrs,
@@ -29,9 +31,6 @@ export default {
         // { disabled: this.disabled || this.$attrs.disabled },
         // { readonly: this.readonly || this.$attrs.readonly }
       );
-      console.log(globalAttrs);
-      console.log(globalCompoAttr);
-      return 'NQWBZ-VG6KO-YUDWV-SCAPV-MFRYH-QJB7S';
     }
   }
 };