vue2-client 1.8.32 → 1.8.34

package/src/base-client/components/common/AMisRender/index.vue

@@ -0,0 +1,257 @@
+<template><div ref="domRef">Loading...</div></template>
+
+<script>
+// import "amis/sdk/sdk.js";
+// import "amis/sdk/sdk.css";
+// import "amis/sdk/iconfont.css";
+
+// 可以不引用, 如果你不想要任何辅助类样式的话 (比如 `m-t-xs` 这种)
+// https://aisuda.bce.baidu.com/amis/zh-CN/style/index
+// import 'amis/sdk/helper.css'
+import qs from 'qs'
+import Vue from 'vue'
+import Index from '@vue2-client/base-client/components/index.js'
+let React
+let amisLib
+let scoped
+const apps = {}
+function loadScript (src, callback) {
+  const script = document.createElement('script')
+  script.setAttribute('type', 'text/javascript')
+  script.setAttribute('src', src)
+  script.onload = () => callback()
+  script.onerror = () => callback(new Error(`Failed to load ${src}`))
+  document.body.appendChild(script)
+}
+const vueList = {}
+
+// eslint-disable-next-line no-unused-vars
+function CustomComponent (props, dom) {
+  const store = Vue.$store
+  const router = Vue.$router
+  const i18n = Vue.$i18n
+  console.log('props', props)
+  React.useEffect(function () {
+    vueList[props.$schema.name] = new Vue({
+      router,
+      store,
+      i18n,
+      render: h => h(Index[props.$schema.type], {
+        props: props.$schema
+      })
+    }).$mount(dom.current)
+  }, [])
+  const app = React.createElement('div', {
+    ref: dom
+  })
+  if (apps[props.name] !== undefined) {
+    const vue = vueList[props.$schema.name]
+    vue.$children[0].active(props.data)
+  } else {
+    apps[props.name] = app
+  }
+  return app
+}
+
+function loadStyles (styles) {
+  for (const path of styles) {
+    const style = document.createElement('link')
+    style.setAttribute('rel', 'stylesheet')
+    style.setAttribute('type', 'text/css')
+    style.setAttribute('href', path)
+    document.head.appendChild(style)
+  }
+}
+// eslint-disable-next-line no-unused-vars
+function appstyle (data) {
+  console.log('111111111111')
+}
+// 动态导入组件
+
+function loadSDK () {
+  return new Promise((resolve, reject) => {
+    if (window.amisRequire) {
+      resolve()
+      return
+    }
+    loadStyles([
+      '/amis/sdk/sdk.css',
+      '/amis/sdk/helper.css',
+      '/amis/sdk/iconfont.css',
+    ])
+    loadScript('/amis/sdk/sdk.js', (err) => {
+      if (err) {
+        reject(err)
+        return
+      }
+      resolve()
+    })
+  })
+}
+
+export default {
+  name: 'AMISRenderer',
+  components: {},
+  props: {
+    schema: {
+      type: Object,
+      default: {
+        type: 'page',
+        body: 'Hello World!',
+      },
+    },
+    locals: {
+      type: Object,
+      default: () => ({}),
+    },
+    props: {
+      type: Object,
+      default: () => ({}),
+    },
+    env: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data () {
+    const router = this.$router
+    return {
+      // 这里面的数据所有 amis 页面都可以获取到
+      // 可以用来放一下公共数据，比如用户信息等
+      // 不要放受控数据，受控数据应该通过 data 下发
+      context: {
+        siteName: 'AMIS DEMO',
+      },
+      get location () {
+        const current = router.history.current
+        return {
+          pathname: current.path,
+          hash: current.hash,
+          query: current.query,
+          search: `?${qs.stringify(current.query)}`,
+        }
+      },
+      loading: false,
+      amisInstance: null,
+      unmounted: false,
+      applist: {}
+    }
+  },
+
+  watch: {
+    locals: function () {
+      this.updateProps()
+    },
+    props: function () {
+      this.updateProps()
+    },
+    $route: function () {
+      this.updateProps()
+    },
+  },
+  async mounted () {
+    try {
+      this.loading = true
+      await loadSDK()
+    } finally {
+      this.loading = false
+    }
+    if (this.unmounted) {
+      return
+    }
+    React = window.amisRequire('react')
+    amisLib = window.amisRequire('amis')
+    scoped = window.amisRequire('amis/embed')
+    const { normalizeLink } = amisLib
+    const router = this.$router
+    // eslint-disable-next-line no-prototype-builtins
+    // console.log('this.schema.type', this.schema.type)
+
+    amisLib.Renderer({
+      test: new RegExp(`(^|\/)${this.schema.type}`)
+    })(props => CustomComponent(props, this.$el))
+
+    const instance = scoped.embed(
+      this.$el,
+      this.schema,
+      {
+        data: {
+          ...this.locals,
+        },
+        context: this.context,
+        location: this.location,
+
+        // todo 下发 location 对象
+        ...this.props,
+      },
+      {
+        // 覆盖 amis env
+        // 参考 https://aisuda.bce.baidu.com/amis/zh-CN/docs/start/getting-started#sdk
+        jumpTo: (to, action) => {
+          if (to === 'goBack') {
+            return router.go(-1)
+          }
+
+          to = normalizeLink(to, this.location)
+
+          if (action?.actionType === 'url') {
+            action.blank === false ? router.push(to) : window.open(to)
+            return
+          }
+
+          // 主要是支持 nav 中的跳转
+          if (action && to && action.target) {
+            window.open(to, action.target)
+            return
+          }
+
+          if (/^https?:\/\//.test(to)) {
+            window.location.replace(to)
+          } else {
+            router.push(to)
+          }
+        },
+
+        updateLocation: (location, replace) => {
+          if (location === 'goBack') {
+            return router.go(-1)
+          }
+
+          location = normalizeLink(location, this.location)
+          replace ? router.replace(location) : router.replace(location)
+        },
+
+        ...this.env,
+      },
+      () => {
+        this.$emit('ready', {
+          instance,
+        })
+      }
+    )
+    this.amisInstance = instance
+  },
+
+  methods: {
+    updateProps () {
+      // eslint-disable-next-line no-unused-expressions
+      this.amisInstance?.updateProps({
+        data: {
+          ...this.locals,
+        },
+        context: this.context,
+        ...this.props,
+      })
+    },
+    initConfig () {
+      console.warn('initConfig')
+    }
+  },
+
+  destroyed () {
+    this.unmounted = true
+    // eslint-disable-next-line no-unused-expressions
+    this.amisInstance?.unmount()
+  },
+}
+</script>

package/src/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox.vue

@@ -25,7 +25,7 @@
                   <a-icon type="bank" /> {{ group.title }}
                 </span>
                 <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
-                  <p class="addressName"><a-icon type="environment" /> <span v-html="highLight(address.label, address.word)">{{ address.label }}</span></p>
+                  <p class="addressName"><a-icon type="environment" /><span v-html="highLight(address.label, address.word)"></span></p>
                   <p v-if="address.address !== '[]'" class="addressRemark">
                     {{ address.address }}
                   </p>
@@ -169,7 +169,7 @@ export default {
             const addressMap = {}
             result.tips.forEach((res) => {
               if (res.location) {
-                if (!addressMap.hasOwnProperty(res.district)) {
+                if (!Object.prototype.hasOwnProperty.call(addressMap, res.district)) {
                   addressMap[res.district] = []
                 }
                 addressMap[res.district].push({

package/src/base-client/components/common/AmapMarker/AmapPointRendering.vue

@@ -19,7 +19,7 @@ export default {
     describeList: {
       type: Array,
       // eslint-disable-next-line vue/require-valid-default-prop
-      default: () => { return [ ] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
+      default: () => { return [] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
     },
     // 需要渲染的点位数据
     markers: {
@@ -30,7 +30,7 @@ export default {
     imgurl: {
       type: String,
       default: () => {
-        return "https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png"
+        return 'https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png'
       }
     },
     mapStyle: {
@@ -105,7 +105,7 @@ export default {
           extData: this.markers
         })
         marker.on('click', (e) => {
-          if(e.target.getExtData() && e.target.getExtData().lng){
+          if (e.target.getExtData() && e.target.getExtData().lng) {
             this.infoWindow.setContent(document.getElementById('amap_point_rendering_template'))
             this.infoWindow.open(this.map, [e.target.getExtData().lng, e.target.getExtData().lat])
           }

package/src/base-client/components/common/CitySelect/index.js

@@ -1,3 +1,3 @@
-import CitySelect from './CitySelect'
-
-export default CitySelect
+import CitySelect from './CitySelect'
+
+export default CitySelect

package/src/base-client/components/common/CitySelect/index.md

@@ -1,109 +1,109 @@
-# 省市区修改组件
-
-> 下拉框数据从库里查询 divisions_of_china 表
-> 省市区数据存储格式
-
-+---------+-----+------------+--------+--------+----------+
-|code     |name |provinceCode|cityCode|areaCode|parentCode|
-+---------+-----+------------+--------+--------+----------+
-|11       |北京市  |NULL        |NULL    |NULL    |NULL      |
-|1101     |市辖区  |11          |NULL    |NULL    |11        |
-|110101   |东城区  |11          |1101    |NULL    |1101      |
-|110101001|东华门街道|11          |1101    |110101  |1101     |
-|110101002|景山街道 |11          |1101    |110101  |1101      |
-+---------+-----+------------+--------+--------+----------+
-
-
-查询出来之后转成tree 作为数据 (截取了一段数据)
-
-```json
-[
-    {
-        "code": "11",
-        "name": "北京",
-        "label": "北京",
-        "value": "北京",
-        "children":
-        [
-            {
-                "code": "1101",
-                "parentcode": "11",
-                "name": "辖区",
-                "label": "辖区",
-                "value": "辖区",
-                "children":
-                [
-                  {
-                    "code": "110101",
-                    "parentcode": "1101",
-                    "name": "东城区",
-                    "label": "东城区",
-                    "value": "东城区"
-                  }
-                ]}]}]
-```
-
-可传递参数
-```js
-props = {
-    // 页面渲染内容  默认 省市区街道 四个 所以是4
-    contexts: {
-      type: Number,
-      default: 3
-    },
-    placeholder: {
-      type: String,
-      default: '请选择省市区'
-    },
-    // small lage 输入框大小
-    size: {
-      type: String,
-      default: undefined
-    },
-    // 类型 simple / undefined
-    // simple 就是用的 cascader  不穿就是用的 自己封装的
-    type: {
-      type: String,
-      default: undefined
-    },
-    // 框的样式
-    inputStyle: {
-      type: Object,
-      default: () => {
-      }
-    },
-    // 下拉框的样式
-    dropdownStyle: {
-      type: Object,
-      default: () => {
-        return {
-          width: '35rem',
-          padding: '1%'
-        }
-      }
-    },
-    // 标签的样式
-    tagStyle: {
-      type: Object,
-      default: () => {
-        return {
-          fontSize: '0.88rem',
-          width: '23%',
-          textAlign: 'left',
-          margin: '0.5%',
-          cursor: 'pointer'
-        }
-      }
-    },
-    // 用于v-model 绑定
-    value: {
-      type: String,
-      default: undefined
-    },
-    // 用于v-model 绑定 code :最后一级的code  address: 所有级拼接的地址
-    valueType: {
-      type: String,
-      default: 'address'
-    }
-  }
-```
+# 省市区修改组件
+
+> 下拉框数据从库里查询 divisions_of_china 表
+> 省市区数据存储格式
+
++---------+-----+------------+--------+--------+----------+
+|code     |name |provinceCode|cityCode|areaCode|parentCode|
++---------+-----+------------+--------+--------+----------+
+|11       |北京市  |NULL        |NULL    |NULL    |NULL      |
+|1101     |市辖区  |11          |NULL    |NULL    |11        |
+|110101   |东城区  |11          |1101    |NULL    |1101      |
+|110101001|东华门街道|11          |1101    |110101  |1101     |
+|110101002|景山街道 |11          |1101    |110101  |1101      |
++---------+-----+------------+--------+--------+----------+
+
+
+查询出来之后转成tree 作为数据 (截取了一段数据)
+
+```json
+[
+    {
+        "code": "11",
+        "name": "北京",
+        "label": "北京",
+        "value": "北京",
+        "children":
+        [
+            {
+                "code": "1101",
+                "parentcode": "11",
+                "name": "辖区",
+                "label": "辖区",
+                "value": "辖区",
+                "children":
+                [
+                  {
+                    "code": "110101",
+                    "parentcode": "1101",
+                    "name": "东城区",
+                    "label": "东城区",
+                    "value": "东城区"
+                  }
+                ]}]}]
+```
+
+可传递参数
+```js
+props = {
+    // 页面渲染内容  默认 省市区街道 四个 所以是4
+    contexts: {
+      type: Number,
+      default: 3
+    },
+    placeholder: {
+      type: String,
+      default: '请选择省市区'
+    },
+    // small lage 输入框大小
+    size: {
+      type: String,
+      default: undefined
+    },
+    // 类型 simple / undefined
+    // simple 就是用的 cascader  不穿就是用的 自己封装的
+    type: {
+      type: String,
+      default: undefined
+    },
+    // 框的样式
+    inputStyle: {
+      type: Object,
+      default: () => {
+      }
+    },
+    // 下拉框的样式
+    dropdownStyle: {
+      type: Object,
+      default: () => {
+        return {
+          width: '35rem',
+          padding: '1%'
+        }
+      }
+    },
+    // 标签的样式
+    tagStyle: {
+      type: Object,
+      default: () => {
+        return {
+          fontSize: '0.88rem',
+          width: '23%',
+          textAlign: 'left',
+          margin: '0.5%',
+          cursor: 'pointer'
+        }
+      }
+    },
+    // 用于v-model 绑定
+    value: {
+      type: String,
+      default: undefined
+    },
+    // 用于v-model 绑定 code :最后一级的code  address: 所有级拼接的地址
+    valueType: {
+      type: String,
+      default: 'address'
+    }
+  }
+```